svn commit: r1458477 - /activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompParallelTest.scala

[ch...@apache.org]

Author: chirino
Date: Tue Mar 19 19:47:31 2013
New Revision: 1458477

URL: http://svn.apache.org/r1458477
Log:
Fix up test case to avoid dsub name conflict.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompParallelTest.scala

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompParallelTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompParallelTest.scala?rev=1458477&r1=1458476&r2=1458477&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompParallelTest.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompParallelTest.scala Tue Mar 19 19:47:31 2013
@@ -824,7 +824,8 @@ class StompParallelTest extends StompTes
   test("Topic /w Durable sub retains messages.") {
     connect("1.1")
     val dest = next_id("/topic/dsub_test_")
-    subscribe("my-sub-name", dest, persistent=true)
+    val subid = next_id("my-sub-name_")
+    subscribe(subid, dest, persistent=true)
     client.close
 
     // Close him out.. since persistent:true then
@@ -835,17 +836,18 @@ class StompParallelTest extends StompTes
     async_send(dest, 2)
     async_send(dest, 3)
 
-    subscribe("my-sub-name", dest, persistent=true)
+    subscribe(subid, dest, persistent=true)
 
-    assert_received(1, "my-sub-name")
-    assert_received(2, "my-sub-name")
-    assert_received(3, "my-sub-name")
+    assert_received(1, subid)
+    assert_received(2, subid)
+    assert_received(3, subid)
   }
 
   test("Topic /w Wildcard durable sub retains messages.") {
     connect("1.1")
     val dest = next_id("/topic/dsub_test_")
-    subscribe("my-sub-name", dest+".*", persistent=true)
+    val subid = next_id("my-sub-name_")
+    subscribe(subid, dest+".*", persistent=true)
     client.close
 
     // Close him out.. since persistent:true then
@@ -856,11 +858,11 @@ class StompParallelTest extends StompTes
     async_send(dest+".2", 2)
     async_send(dest+".3", 3)
 
-    subscribe("my-sub-name", dest, persistent=true)
+    subscribe(subid, dest, persistent=true)
 
-    assert_received(1, "my-sub-name")
-    assert_received(2, "my-sub-name")
-    assert_received(3, "my-sub-name")
+    assert_received(1, subid)
+    assert_received(2, subid)
+    assert_received(3, subid)
   }
 
   test("Queue and a selector") {