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/06/06 09:51:42 UTC
svn commit: r782203 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/management/
components/camel-mail/src/test/java/org/apache/camel/component/mail/
Author: davsclaus
Date: Sat Jun 6 07:51:42 2009
New Revision: 782203
URL: http://svn.apache.org/viewvc?rev=782203&view=rev
Log:
Fixed unit test occationally failed on TC.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=782203&r1=782202&r2=782203&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java Sat Jun 6 07:51:42 2009
@@ -149,6 +149,10 @@
@Override
protected void tearDown() throws Exception {
+ if (!canRunOnThisPlatform()) {
+ return;
+ }
+
releaseMBeanServers();
mbsc = null;
super.tearDown();
@@ -166,6 +170,10 @@
@Override
protected void setUp() throws Exception {
+ if (!canRunOnThisPlatform()) {
+ return;
+ }
+
releaseMBeanServers();
super.setUp();
Thread.sleep(sleepForConnection);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java?rev=782203&r1=782202&r2=782203&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java Sat Jun 6 07:51:42 2009
@@ -22,6 +22,8 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.Processor;
+import org.apache.camel.Exchange;
/**
* A unit test to verify mbean registration of multi-instances of a processor
@@ -34,7 +36,12 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("direct:start").to("mock:end").to("mock:end");
+ from("direct:start").process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ // simulate a little processing time
+ Thread.sleep(10);
+ }
+ }).to("mock:end").to("mock:end");
}
};
}
@@ -58,7 +65,7 @@
assertEquals("Could not find 1 context: " + s, 1, s.size());
s = mbsc.queryNames(new ObjectName(domainName + ":type=processors,*"), null);
- assertEquals("Could not find 2 processor: " + s, 2, s.size());
+ assertEquals("Could not find 3 processor: " + s, 3, s.size());
s = mbsc.queryNames(new ObjectName(domainName + ":type=routes,*"), null);
assertEquals("Could not find 1 route: " + s, 1, s.size());
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java?rev=782203&r1=782202&r2=782203&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentTest.java Sat Jun 6 07:51:42 2009
@@ -56,7 +56,7 @@
// END SNIPPET: e1
// need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(1000);
+ Thread.sleep(2000);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -74,7 +74,6 @@
DataHandler handler = out.getIn().getAttachment("logo.jpeg");
assertNotNull("The logo should be there", handler);
- // TODO: content type does not work with geronomi mail jar (its a buggy jar, use SUN mail jar instead)
assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
producer.stop();
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java?rev=782203&r1=782202&r2=782203&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailHtmlAttachmentTest.java Sat Jun 6 07:51:42 2009
@@ -56,7 +56,7 @@
// END SNIPPET: e1
// need some time for the mail to arrive on the inbox (consumed and sent to the mock)
- Thread.sleep(1500);
+ Thread.sleep(2000);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -78,7 +78,6 @@
assertTrue("logo should be more than 1000 bytes", bytes.length > 1000);
// content type should match
- // TODO: content type does not work with geronomi mail jar (its a buggy jar, use SUN mail jar instead)
assertEquals("image/jpeg; name=logo.jpeg", handler.getContentType());
// save logo for visual inspection