activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1443598 - in /activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test: OpenwireParallelTest.scala OpenwireTestSupport.scala
Date Thu, 07 Feb 2013 16:41:58 GMT
Author: chirino
Date: Thu Feb  7 16:41:58 2013
New Revision: 1443598

URL: http://svn.apache.org/viewvc?rev=1443598&view=rev
Log:
Use larger receive timeout so that test cases work more reliably on slow machines.

Modified:
    activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireParallelTest.scala
    activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireTestSupport.scala

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireParallelTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireParallelTest.scala?rev=1443598&r1=1443597&r2=1443598&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireParallelTest.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireParallelTest.scala
Thu Feb  7 16:41:58 2013
@@ -196,7 +196,7 @@ class OpenwireParallelTest extends Openw
     Thread.sleep(100)
 
     // Verify exclusive consumer receives the message.
-    exclusiveConsumer.receive(100) should not be (null)
+    exclusiveConsumer.receive(receive_timeout) should not be (null)
     fallbackConsumer.receive(100) should be(null)
   }
 
@@ -219,7 +219,7 @@ class OpenwireParallelTest extends Openw
     Thread.sleep(100)
 
     // Verify exclusive consumer receives the message.
-    exclusiveConsumer.receive(100) should not be (null)
+    exclusiveConsumer.receive(receive_timeout) should not be (null)
     fallbackConsumer.receive(100) should be(null)
   }
 
@@ -244,7 +244,7 @@ class OpenwireParallelTest extends Openw
     Thread.sleep(100)
 
     // Verify exclusive consumer receives the message.
-    exclusiveConsumer1.receive(100) should not be (null)
+    exclusiveConsumer1.receive(receive_timeout) should not be (null)
     exclusiveConsumer2.receive(100) should be(null)
     fallbackConsumer.receive(100) should be(null)
 
@@ -255,7 +255,7 @@ class OpenwireParallelTest extends Openw
     producer.send(senderSession.createTextMessage("Failover To Another Exclusive Consumer
Created First - 2"))
     producer.send(senderSession.createTextMessage("Failover To Another Exclusive Consumer
Created First - 3"))
 
-    exclusiveConsumer2.receive(100) should not be (null)
+    exclusiveConsumer2.receive(receive_timeout) should not be (null)
     fallbackConsumer.receive(100) should be(null)
   }
 
@@ -280,7 +280,7 @@ class OpenwireParallelTest extends Openw
     Thread.sleep(100)
 
     // Verify exclusive consumer receives the message.
-    exclusiveConsumer1.receive(100) should not be (null)
+    exclusiveConsumer1.receive(receive_timeout) should not be (null)
     exclusiveConsumer2.receive(100) should be(null)
     fallbackConsumer.receive(100) should be(null)
 
@@ -291,7 +291,7 @@ class OpenwireParallelTest extends Openw
     producer.send(senderSession.createTextMessage("Failover To Another Exclusive Consumer
Created After - 2"))
     producer.send(senderSession.createTextMessage("Failover To Another Exclusive Consumer
Created After - 3"))
 
-    exclusiveConsumer2.receive(100) should not be (null)
+    exclusiveConsumer2.receive(receive_timeout) should not be (null)
     fallbackConsumer.receive(100) should be(null)
   }
 
@@ -312,10 +312,8 @@ class OpenwireParallelTest extends Openw
 
     producer.send(senderSession.createTextMessage("Failover To NonExclusive Consumer - 1"))
 
-    Thread.sleep(100)
-
     // Verify exclusive consumer receives the message.
-    exclusiveConsumer.receive(100) should not be (null)
+    exclusiveConsumer.receive(receive_timeout) should not be (null)
     fallbackConsumer.receive(100) should be(null)
 
     // Close the exclusive consumer to verify the non-exclusive consumer
@@ -323,7 +321,7 @@ class OpenwireParallelTest extends Openw
     exclusiveConsumer.close()
 
     producer.send(senderSession.createTextMessage("Failover To NonExclusive Consumer - 2"))
-    fallbackConsumer.receive(100) should not be (null)
+    fallbackConsumer.receive(receive_timeout) should not be (null)
     fallbackConsumer.close()
   }
 
@@ -341,10 +339,8 @@ class OpenwireParallelTest extends Openw
 
     producer.send(senderSession.createTextMessage("Fallback To Exclusive Consumer - 1"))
 
-    Thread.sleep(100)
-
     // Verify exclusive consumer receives the message.
-    exclusiveConsumer.receive(200) should not be (null)
+    exclusiveConsumer.receive(receive_timeout) should not be (null)
     fallbackConsumer.receive(200) should be(null)
 
     Thread.sleep(100)
@@ -354,7 +350,7 @@ class OpenwireParallelTest extends Openw
     exclusiveConsumer.close()
 
     producer.send(senderSession.createTextMessage("Fallback To Exclusive Consumer - 2"))
-    fallbackConsumer.receive(100) should not be (null)
+    fallbackConsumer.receive(receive_timeout) should not be (null)
 
     // Create exclusive consumer to determine if it will start receiving
     // the messages.
@@ -363,7 +359,7 @@ class OpenwireParallelTest extends Openw
     producer.send(senderSession.createTextMessage("Fallback To Exclusive Consumer - 3"))
 
     // Verify exclusive consumer receives the message.
-    exclusiveConsumer.receive(100) should not be (null)
+    exclusiveConsumer.receive(receive_timeout) should not be (null)
     fallbackConsumer.receive(100) should be(null)
   }
 
@@ -509,7 +505,7 @@ class OpenwireParallelTest extends Openw
 
     // Consume the message...
     var consumer = session.createConsumer(queue)
-    var msg = consumer.receive(1000)
+    var msg = consumer.receive(receive_timeout)
     msg should not be (null)
 
     Thread.sleep(1000)
@@ -572,7 +568,7 @@ class OpenwireParallelTest extends Openw
     producer.send(outbound(1));
     producer.send(outbound(2));
 
-    consumer.receive(200) should be(outbound(0))
+    consumer.receive(receive_timeout) should be(outbound(0))
 
     consumer.close();
 
@@ -599,9 +595,9 @@ class OpenwireParallelTest extends Openw
     // Re-open the consumer.
     consumer = session.createConsumer(dest);
     // Receive the second.
-    consumer.receive(200) should be(outbound(1))
+    consumer.receive(receive_timeout) should be(outbound(1))
     // Receive the third.
-    consumer.receive(200) should be(outbound(2))
+    consumer.receive(receive_timeout) should be(outbound(2))
     consumer.close()
   }
 
@@ -631,7 +627,7 @@ class OpenwireParallelTest extends Openw
     enumeration.nextElement() should be(outbound(0))
 
     // Receive the first message.
-    consumer.receive(100) should be(outbound(0))
+    consumer.receive(receive_timeout) should be(outbound(0))
   }
 
   //  test("Queue Browser With 2 Consumers") {
@@ -716,9 +712,9 @@ class OpenwireParallelTest extends Openw
     val consumer = session.createConsumer(destination)
 
     // Receive the first message.
-    consumer.receive(1000) should equal(outbound(0))
-    consumer.receive(1000) should equal(outbound(1))
-    consumer.receive(1000) should equal(outbound(2))
+    consumer.receive(receive_timeout) should equal(outbound(0))
+    consumer.receive(receive_timeout) should equal(outbound(1))
+    consumer.receive(receive_timeout) should equal(outbound(2))
   }
 
   test("Unsubscribe invalid durable sub") {

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireTestSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireTestSupport.scala?rev=1443598&r1=1443597&r2=1443598&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireTestSupport.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/test/scala/org/apache/activemq/apollo/openwire/test/OpenwireTestSupport.scala
Thu Feb  7 16:41:58 2013
@@ -35,6 +35,8 @@ class OpenwireTestSupport extends Broker
   var default_connection: Connection = _
   var connections = List[Connection]()
 
+  val receive_timeout = 10*1000
+
   override protected def afterEach() {
     super.afterEach()
     for ( connection <- connections ) {



Mime
View raw message