svn commit: r1403060 - in /camel/branches/camel-2.9.x/components: camel-jms/src/test/java/org/apache/camel/component/jms/ camel-jpa/src/test/java/org/apache/camel/component/jpa/

[cmueller]

Author: cmueller
Date: Sun Oct 28 18:17:55 2012
New Revision: 1403060

URL: http://svn.apache.org/viewvc?rev=1403060&view=rev
Log:
changed two tests which fails randomly on our CI server

Modified:
    
camel/branches/camel-2.9.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
    
camel/branches/camel-2.9.x/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaConsumerIdleMessageTest.java

Modified: 
camel/branches/camel-2.9.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java?rev=1403060&r1=1403059&r2=1403060&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
 Sun Oct 28 18:17:55 2012
@@ -37,7 +37,7 @@ public class JmsRequestReplyProcessRepli
     @Test
     public void testRequestReplyWithConcurrent() throws Exception {
         MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMessageCount(5);
+        mock.expectedBodiesReceivedInAnyOrder("Bye A", "Bye B", "Bye C", "Bye 
D", "Bye E");
 
         log.info("Sending messages ...");
         template.sendBody("seda:start", "A");
@@ -64,6 +64,10 @@ public class JmsRequestReplyProcessRepli
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
+                from("activemq:queue:foo")
+                    .log("request - ${body}")
+                    .transform(body().prepend("Bye "));
+
                 from("seda:start")
                     .setExchangePattern(ExchangePattern.InOut)
                     .to("activemq:queue:foo")
@@ -73,14 +77,7 @@ public class JmsRequestReplyProcessRepli
                     .delay(2000)
                     .log("done    - ${body}")
                     .to("mock:result");
-
-                from("activemq:queue:foo")
-                    .log("request - ${body}")
-                    .transform(body().prepend("Bye "))
-                    .to("mock:bye");
             }
         };
     }
-}
-
-
+}
\ No newline at end of file

Modified: 
camel/branches/camel-2.9.x/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaConsumerIdleMessageTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaConsumerIdleMessageTest.java?rev=1403060&r1=1403059&r2=1403060&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaConsumerIdleMessageTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaConsumerIdleMessageTest.java
 Sun Oct 28 18:17:55 2012
@@ -29,9 +29,10 @@ public class JpaConsumerIdleMessageTest 
     
     @Test
     public void testConsumeIdleMessages() throws Exception {
-        Thread.sleep(130);
+        Thread.sleep(290);
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(2);
+
         assertMockEndpointsSatisfied();
         assertTrue(mock.getExchanges().get(0).getIn().getBody() == null);
         assertTrue(mock.getExchanges().get(1).getIn().getBody() == null);
@@ -41,7 +42,7 @@ public class JpaConsumerIdleMessageTest 
         return new RouteBuilder() {
             public void configure() throws Exception {
                 
from("jpa://org.apache.camel.examples.MultiSteps?consumer.nativeQuery=select * 
from MultiSteps where step = 1"
-                        + "&delay=50&sendEmptyMessageWhenIdle=true")
+                        + "&delay=100&sendEmptyMessageWhenIdle=true")
                     .to("mock:result");
             }
         };