Repository: camel Updated Branches: refs/heads/master f29a2a05d -> 1c1f5504b
Fixed tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1c1f5504 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c1f5504 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c1f5504 Branch: refs/heads/master Commit: 1c1f5504bd28b241e43bf80c72a5e5d12d1d086d Parents: f29a2a0 Author: Claus Ibsen <[email protected]> Authored: Mon Mar 2 14:06:53 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Mon Mar 2 14:06:53 2015 +0100 ---------------------------------------------------------------------- .../camel/component/mail/MailSortTermTest.java | 15 +-- .../component/mail/MailSortTermThreeTest.java | 109 +++++++++++++++++++ .../component/mail/MailSortTermTwoTest.java | 109 +++++++++++++++++++ 3 files changed, 222 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1c1f5504/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java index 70154e4..8131220 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.jvnet.mock_javamail.Mailbox; /** - * This is a test that checks integration of the sort term in camel. The actual sorting logic is tested in the + * This is a test that checks integration of the sort term in Camel. The actual sorting logic is tested in the * SortUtilTest. */ public class MailSortTermTest extends CamelTestSupport { @@ -62,13 +62,7 @@ public class MailSortTermTest extends CamelTestSupport { MockEndpoint mockAsc = getMockEndpoint("mock:resultAscending"); mockAsc.expectedBodiesReceived("Earlier date", "Later date"); - // This one has search term set - MockEndpoint mockDesc = getMockEndpoint("mock:resultDescending"); - mockDesc.expectedBodiesReceived("Even later date", "Later date", "Earlier date"); - - // This one has search term set - MockEndpoint mockDescImap = getMockEndpoint("mock:resultDescendingImap"); - mockDescImap.expectedBodiesReceived("Even later date", "Later date", "Earlier date"); + context.startAllRoutes(); assertMockEndpointsSatisfied(); } @@ -105,12 +99,11 @@ public class MailSortTermTest extends CamelTestSupport { } protected RouteBuilder createRouteBuilder() throws Exception { - // Two tests also in conjunction with search since mail consumer does sort and search together return new RouteBuilder() { public void configure() throws Exception { + context.setAutoStartup(false); + from("pop3://bill@localhost?password=secret&searchTerm=#searchTerm&sortTerm=#sortAscendingDate").to("mock:resultAscending"); - from("pop3://bill@localhost?password=secret&sortTerm=#sortDescendingDate").to("mock:resultDescending"); - from("imap://bill@localhost?password=secret&sortTerm=#sortDescendingDate").to("mock:resultDescendingImap"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/1c1f5504/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java new file mode 100644 index 0000000..70c1ec9 --- /dev/null +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermThreeTest.java @@ -0,0 +1,109 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.mail; + +import java.util.Date; +import javax.mail.Folder; +import javax.mail.Message; +import javax.mail.Store; +import javax.mail.internet.MimeMessage; + +import com.sun.mail.imap.SortTerm; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; +import org.jvnet.mock_javamail.Mailbox; + +/** + * This is a test that checks integration of the sort term in Camel. The actual sorting logic is tested in the + * SortUtilTest. + */ +public class MailSortTermThreeTest extends CamelTestSupport { + + @Override + public void setUp() throws Exception { + prepareMailbox(); + super.setUp(); + } + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + jndi.bind("sortAscendingDate", new SortTerm[]{SortTerm.DATE}); + jndi.bind("sortDescendingDate", new SortTerm[]{SortTerm.REVERSE, SortTerm.DATE}); + jndi.bind("searchTerm", new SearchTermBuilder().subject("Camel").build()); + return jndi; + } + + @Test + public void testSortTerm() throws Exception { + Mailbox mailbox = Mailbox.get("bill@localhost"); + assertEquals(3, mailbox.size()); + + // This one has search term set + MockEndpoint mockDescImap = getMockEndpoint("mock:resultDescendingImap"); + mockDescImap.expectedBodiesReceived("Even later date", "Later date", "Earlier date"); + + context.startAllRoutes(); + + assertMockEndpointsSatisfied(); + } + + private void prepareMailbox() throws Exception { + // connect to mailbox + Mailbox.clearAll(); + JavaMailSender sender = new DefaultJavaMailSender(); + Store store = sender.getSession().getStore("pop3"); + store.connect("localhost", 25, "bill", "secret"); + Folder folder = store.getFolder("INBOX"); + folder.open(Folder.READ_WRITE); + folder.expunge(); + + // inserts 3 messages, one with earlier, one with later sent date and one with invalid subject (not returned in search) + Message[] messages = new Message[3]; + messages[0] = new MimeMessage(sender.getSession()); + messages[0].setText("Earlier date"); + messages[0].setSentDate(new Date(10000)); + messages[0].setSubject("Camel"); + + messages[1] = new MimeMessage(sender.getSession()); + messages[1].setText("Later date"); + messages[1].setSentDate(new Date(20000)); + messages[1].setSubject("Camel"); + + messages[2] = new MimeMessage(sender.getSession()); + messages[2].setText("Even later date"); + messages[2].setSentDate(new Date(30000)); + messages[2].setSubject("Invalid"); + + folder.appendMessages(messages); + folder.close(true); + } + + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() throws Exception { + context.setAutoStartup(false); + + from("imap://bill@localhost?password=secret&sortTerm=#sortDescendingDate").to("mock:resultDescendingImap"); + } + }; + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/1c1f5504/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java new file mode 100644 index 0000000..c43eba9 --- /dev/null +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailSortTermTwoTest.java @@ -0,0 +1,109 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.mail; + +import java.util.Date; +import javax.mail.Folder; +import javax.mail.Message; +import javax.mail.Store; +import javax.mail.internet.MimeMessage; + +import com.sun.mail.imap.SortTerm; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; +import org.jvnet.mock_javamail.Mailbox; + +/** + * This is a test that checks integration of the sort term in Camel. The actual sorting logic is tested in the + * SortUtilTest. + */ +public class MailSortTermTwoTest extends CamelTestSupport { + + @Override + public void setUp() throws Exception { + prepareMailbox(); + super.setUp(); + } + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry jndi = super.createRegistry(); + jndi.bind("sortAscendingDate", new SortTerm[]{SortTerm.DATE}); + jndi.bind("sortDescendingDate", new SortTerm[]{SortTerm.REVERSE, SortTerm.DATE}); + jndi.bind("searchTerm", new SearchTermBuilder().subject("Camel").build()); + return jndi; + } + + @Test + public void testSortTerm() throws Exception { + Mailbox mailbox = Mailbox.get("bill@localhost"); + assertEquals(3, mailbox.size()); + + // This one has search term set + MockEndpoint mockDesc = getMockEndpoint("mock:resultDescending"); + mockDesc.expectedBodiesReceived("Even later date", "Later date", "Earlier date"); + + context.startAllRoutes(); + + assertMockEndpointsSatisfied(); + } + + private void prepareMailbox() throws Exception { + // connect to mailbox + Mailbox.clearAll(); + JavaMailSender sender = new DefaultJavaMailSender(); + Store store = sender.getSession().getStore("pop3"); + store.connect("localhost", 25, "bill", "secret"); + Folder folder = store.getFolder("INBOX"); + folder.open(Folder.READ_WRITE); + folder.expunge(); + + // inserts 3 messages, one with earlier, one with later sent date and one with invalid subject (not returned in search) + Message[] messages = new Message[3]; + messages[0] = new MimeMessage(sender.getSession()); + messages[0].setText("Earlier date"); + messages[0].setSentDate(new Date(10000)); + messages[0].setSubject("Camel"); + + messages[1] = new MimeMessage(sender.getSession()); + messages[1].setText("Later date"); + messages[1].setSentDate(new Date(20000)); + messages[1].setSubject("Camel"); + + messages[2] = new MimeMessage(sender.getSession()); + messages[2].setText("Even later date"); + messages[2].setSentDate(new Date(30000)); + messages[2].setSubject("Invalid"); + + folder.appendMessages(messages); + folder.close(true); + } + + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + public void configure() throws Exception { + context.setAutoStartup(false); + + from("pop3://bill@localhost?password=secret&sortTerm=#sortDescendingDate").to("mock:resultDescending"); + } + }; + } + +}
