Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CA22EFF15 for ; Tue, 19 Mar 2013 19:47:54 +0000 (UTC) Received: (qmail 33187 invoked by uid 500); 19 Mar 2013 19:47:54 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 33135 invoked by uid 500); 19 Mar 2013 19:47:54 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 33123 invoked by uid 99); 19 Mar 2013 19:47:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Mar 2013 19:47:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Mar 2013 19:47:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 70C0023888E4; Tue, 19 Mar 2013 19:47:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1458477 - /activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/test/StompParallelTest.scala Date: Tue, 19 Mar 2013 19:47:31 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130319194731.70C0023888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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") {