You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/12/09 09:45:52 UTC
svn commit: r888734 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/management/
components/camel-atom/src/test/java/org/apache/camel/component/atom/
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/
components/camel-...
Author: davsclaus
Date: Wed Dec 9 08:45:51 2009
New Revision: 888734
URL: http://svn.apache.org/viewvc?rev=888734&view=rev
Log:
Fixed unit tests reported by TC.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java Wed Dec 9 08:45:51 2009
@@ -47,14 +47,14 @@
template.asyncSendBody("direct:start", "Hello World");
- Thread.sleep(500);
+ Thread.sleep(1000);
Integer inFlight = (Integer) mbeanServer.getAttribute(on, "InflightExchanges");
assertEquals(1, inFlight.longValue());
assertMockEndpointsSatisfied();
- Thread.sleep(500);
+ Thread.sleep(1000);
Long completed = (Long) mbeanServer.getAttribute(on, "ExchangesCompleted");
assertEquals(1, completed.longValue());
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java Wed Dec 9 08:45:51 2009
@@ -30,7 +30,7 @@
public void testLowDelay() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(7);
- mock.setResultWaitTime(1000L);
+ mock.setResultWaitTime(3000L);
mock.assertIsSatisfied();
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java Wed Dec 9 08:45:51 2009
@@ -62,8 +62,14 @@
try {
assertEquals(200, httpclient.executeMethod(get));
- assertEquals("<Customers><Customer><id>123</id><name>John</name></Customer><Customer><id>113</id><name>Dan</name></Customer></Customers>",
- get.getResponseBodyAsString());
+ // order returned can differ on OS so match for both orders
+ String s = get.getResponseBodyAsString();
+ boolean m1 = "<Customers><Customer><id>123</id><name>John</name></Customer><Customer><id>113</id><name>Dan</name></Customer></Customers>".equals(s);
+ boolean m2 = "<Customers><Customer><id>113</id><name>Dan</name></Customer><Customer><id>123</id><name>John</name></Customer></Customers>".equals(s);
+
+ if (!m1 && !m2) {
+ fail("Not expected body returned: " + s);
+ }
} finally {
get.releaseConnection();
}
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java Wed Dec 9 08:45:51 2009
@@ -26,12 +26,19 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
/**
* @version $Revision$
*/
public class MailConvertersTest extends CamelTestSupport {
+ @Override
+ public void setUp() throws Exception {
+ Mailbox.clearAll();
+ super.setUp();
+ }
+
@Test
public void testMailMessageToString() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMessageTest.java Wed Dec 9 08:45:51 2009
@@ -32,6 +32,7 @@
import org.apache.camel.util.ObjectHelper;
import org.junit.Before;
import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
/**
* @version $Revision$
@@ -84,6 +85,7 @@
@Before
public void setUp() throws Exception {
super.setUp();
+ Mailbox.clearAll();
endpoint = resolveMandatoryEndpoint("pop3://someone@myhost:30/subject");
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java Wed Dec 9 08:45:51 2009
@@ -58,8 +58,8 @@
assertMailbox("willem");
// START SNIPPET: e2
- // here we have preconfigued the to recievs to claus and willem. Notice we use comma to seperate
- // the two recipeients. Camel also support using colon as seperator char
+ // here we have pre configured the to receivers to claus and willem. Notice we use comma to separate
+ // the two recipients. Camel also support using colon as separator char
template.sendBody("smtp://localhost?To=claus@localhost,willem@localhost&CC=james@localhost", "Hello World");
// END SNIPPET: e2
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerUnsupportedCharsetTest.java Wed Dec 9 08:45:51 2009
@@ -25,6 +25,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
import org.springframework.mail.MailPreparationException;
/**
@@ -40,6 +41,8 @@
@Test
@SuppressWarnings("unchecked")
public void testSencUnsupportedCharset() throws Exception {
+ Mailbox.clearAll();
+
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
@@ -68,6 +71,8 @@
@Test
@SuppressWarnings("unchecked")
public void testSencUnsupportedCharsetDisabledOption() throws Exception {
+ Mailbox.clearAll();
+
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java Wed Dec 9 08:45:51 2009
@@ -40,6 +40,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
/**
* @version $Revision$
@@ -49,6 +50,8 @@
@Test
public void testSendAndReceiveMails() throws Exception {
+ Mailbox.clearAll();
+
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeTest.java Wed Dec 9 08:45:51 2009
@@ -18,7 +18,6 @@
import java.io.ByteArrayOutputStream;
import java.util.Map;
-
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
import javax.mail.internet.MimeMultipart;
@@ -29,6 +28,8 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
+
import static org.apache.camel.component.mail.MailConstants.MAIL_ALTERNATIVE_BODY;
public class MimeMultipartAlternativeTest extends CamelTestSupport {
@@ -36,6 +37,8 @@
private String htmlBody = "<html><body><h1>Hello</h1>World<img src=\"cid:0001\"></body></html>";
private void sendMultipartEmail(boolean useInlineattachments) throws Exception {
+ Mailbox.clearAll();
+
// create an exchange with a normal body and attachment to be produced as email
MailEndpoint endpoint = context.getEndpoint("smtp://ryan@mymailserver.com?password=secret", MailEndpoint.class);
endpoint.getConfiguration().setUseInlineAttachments(useInlineattachments);
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java?rev=888734&r1=888733&r2=888734&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMultipartAlternativeWithLongerFilenameTest.java Wed Dec 9 08:45:51 2009
@@ -28,6 +28,8 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import org.jvnet.mock_javamail.Mailbox;
+
import static org.apache.camel.component.mail.MailConstants.MAIL_ALTERNATIVE_BODY;
public class MimeMultipartAlternativeWithLongerFilenameTest extends CamelTestSupport {
@@ -35,6 +37,8 @@
private String htmlBody = "<html><body><h1>Hello</h1>World<img src=\"cid:myCoolLogo.jpeg\"></body></html>";
private void sendMultipartEmail(boolean useInlineattachments) throws Exception {
+ Mailbox.clearAll();
+
// create an exchange with a normal body and attachment to be produced as email
MailEndpoint endpoint = context.getEndpoint("smtp://ryan@mymailserver.com?password=secret", MailEndpoint.class);
endpoint.getConfiguration().setUseInlineAttachments(useInlineattachments);