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 2012/04/28 11:06:25 UTC

svn commit: r1331718 - in /camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms: JmsRequestReplySharedReplyToTest.java tx/JmsToJmsTransactedSecurityTest.java

Author: davsclaus
Date: Sat Apr 28 09:06:24 2012
New Revision: 1331718

URL: http://svn.apache.org/viewvc?rev=1331718&view=rev
Log:
Prepare for AMQ 5.6 upgrade

Modified:
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JmsToJmsTransactedSecurityTest.java

Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java?rev=1331718&r1=1331717&r2=1331718&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java Sat Apr 28 09:06:24 2012
@@ -45,7 +45,7 @@ public class JmsRequestReplySharedReplyT
         assertEquals("Hello E", template.requestBody("activemq:queue:foo?replyTo=bar&replyToType=Shared", "E"));
 
         long delta = watch.stop();
-        assertTrue("Should be slower than about 3 seconds, was: " + delta, delta > 3200);
+        assertTrue("Should be slower than about 2 seconds, was: " + delta, delta > 2000);
     }
 
     protected CamelContext createCamelContext() throws Exception {

Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JmsToJmsTransactedSecurityTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JmsToJmsTransactedSecurityTest.java?rev=1331718&r1=1331717&r2=1331718&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JmsToJmsTransactedSecurityTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JmsToJmsTransactedSecurityTest.java Sat Apr 28 09:06:24 2012
@@ -52,10 +52,6 @@ public class JmsToJmsTransactedSecurityT
         template.sendBody("activemq:queue:foo", "Hello World");
 
         mock.assertIsSatisfied(3000);
-
-        // should be in DLQ
-        String reply = consumer.receiveBody("activemq:queue:ActiveMQ.DLQ", 5000, String.class);
-        assertEquals("Hello World", reply);
     }
 
     @Test