Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 93051 invoked from network); 12 Jan 2010 16:43:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Jan 2010 16:43:03 -0000 Received: (qmail 51375 invoked by uid 500); 12 Jan 2010 16:43:03 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 51323 invoked by uid 500); 12 Jan 2010 16:43:03 -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 51314 invoked by uid 99); 12 Jan 2010 16:43:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2010 16:43:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 12 Jan 2010 16:43:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D444623889BB; Tue, 12 Jan 2010 16:42:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r898411 - /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/DurableTest.cs Date: Tue, 12 Jan 2010 16:42:39 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100112164239.D444623889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Tue Jan 12 16:42:39 2010 New Revision: 898411 URL: http://svn.apache.org/viewvc?rev=898411&view=rev Log: Update Durable test to correctly use the client ID as the subscription name for Durable Consumers. Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/DurableTest.cs Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/DurableTest.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/DurableTest.cs?rev=898411&r1=898410&r2=898411&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/DurableTest.cs (original) +++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/test/csharp/DurableTest.cs Tue Jan 12 16:42:39 2010 @@ -30,7 +30,6 @@ protected static string TEST_CLIENT_ID = "TestDurableConsumerClientId"; protected static string SEND_CLIENT_ID = "TestDurableProducerClientId"; protected static string DURABLE_TOPIC = "TestDurableConsumerTopic"; - protected static string CONSUMER_ID = "TestDurableConsumerConsumerId"; protected static string DURABLE_SELECTOR = "2 > 1"; private int postfix; @@ -52,9 +51,11 @@ [Row(AcknowledgementMode.Transactional)] public void TestSendWhileClosed(AcknowledgementMode ackMode) { + string CLIENT_ID_AND_SUBSCIPTION = TEST_CLIENT_ID + ":" + new Random().Next(); + try { - using(IConnection connection = CreateConnection(TEST_CLIENT_ID + ":" + this.postfix)) + using(IConnection connection = CreateConnection(CLIENT_ID_AND_SUBSCIPTION)) { connection.Start(); @@ -66,7 +67,7 @@ producer.DeliveryMode = MsgDeliveryMode.Persistent; ISession consumeSession = connection.CreateSession(ackMode); - IMessageConsumer consumer = consumeSession.CreateDurableConsumer(topic, CONSUMER_ID, null, false); + IMessageConsumer consumer = consumeSession.CreateDurableConsumer(topic, CLIENT_ID_AND_SUBSCIPTION, null, false); Thread.Sleep(1000); consumer.Dispose(); consumer = null; @@ -82,7 +83,7 @@ Thread.Sleep(1000); - consumer = consumeSession.CreateDurableConsumer(topic, CONSUMER_ID, null, false); + consumer = consumeSession.CreateDurableConsumer(topic, CLIENT_ID_AND_SUBSCIPTION, null, false); ITextMessage msg = consumer.Receive(TimeSpan.FromMilliseconds(1000)) as ITextMessage; msg.Acknowledge(); if(AcknowledgementMode.Transactional == ackMode) @@ -106,7 +107,7 @@ // Pause to allow Stomp to unregister at the broker. Thread.Sleep(250); - UnregisterDurableConsumer(TEST_CLIENT_ID + ":" + this.postfix, CONSUMER_ID); + UnregisterDurableConsumer(CLIENT_ID_AND_SUBSCIPTION, CLIENT_ID_AND_SUBSCIPTION); } } @@ -117,16 +118,18 @@ [Row(AcknowledgementMode.Transactional)] public void TestDurableConsumerSelectorChange(AcknowledgementMode ackMode) { + string CLIENT_ID_AND_SUBSCIPTION = TEST_CLIENT_ID + ":" + new Random().Next(); + try { - using(IConnection connection = CreateConnection(TEST_CLIENT_ID + ":" + this.postfix)) + using(IConnection connection = CreateConnection(CLIENT_ID_AND_SUBSCIPTION)) { connection.Start(); using(ISession session = connection.CreateSession(ackMode)) { ITopic topic = session.GetTopic(DURABLE_TOPIC); IMessageProducer producer = session.CreateProducer(topic); - IMessageConsumer consumer = session.CreateDurableConsumer(topic, CONSUMER_ID, "color='red'", false); + IMessageConsumer consumer = session.CreateDurableConsumer(topic, CLIENT_ID_AND_SUBSCIPTION, "color='red'", false); producer.DeliveryMode = MsgDeliveryMode.Persistent; @@ -155,7 +158,7 @@ // Stomp connection at broker needs some time to cleanup. Thread.Sleep(1000); - consumer = session.CreateDurableConsumer(topic, CONSUMER_ID, "color='blue'", false); + consumer = session.CreateDurableConsumer(topic, CLIENT_ID_AND_SUBSCIPTION, "color='blue'", false); sendMessage = session.CreateTextMessage("2nd"); sendMessage.Properties["color"] = "red"; @@ -193,7 +196,7 @@ // Pause to allow Stomp to unregister at the broker. Thread.Sleep(250); - UnregisterDurableConsumer(TEST_CLIENT_ID + ":" + this.postfix, CONSUMER_ID); + UnregisterDurableConsumer(CLIENT_ID_AND_SUBSCIPTION, CLIENT_ID_AND_SUBSCIPTION); } } @@ -204,35 +207,37 @@ [Row(AcknowledgementMode.Transactional)] public void TestDurableConsumer(AcknowledgementMode ackMode) { + string CLIENT_ID_AND_SUBSCIPTION = TEST_CLIENT_ID + ":" + new Random().Next(); + try { - RegisterDurableConsumer(TEST_CLIENT_ID + ":" + this.postfix, DURABLE_TOPIC, CONSUMER_ID, DURABLE_SELECTOR, false); - RunTestDurableConsumer(ackMode); + RegisterDurableConsumer(CLIENT_ID_AND_SUBSCIPTION, DURABLE_TOPIC, CLIENT_ID_AND_SUBSCIPTION, DURABLE_SELECTOR, false); + RunTestDurableConsumer(CLIENT_ID_AND_SUBSCIPTION, ackMode); if(AcknowledgementMode.Transactional == ackMode) { - RunTestDurableConsumer(ackMode); + RunTestDurableConsumer(CLIENT_ID_AND_SUBSCIPTION, ackMode); } } finally { // Pause to allow Stomp to unregister at the broker. Thread.Sleep(250); - - UnregisterDurableConsumer(TEST_CLIENT_ID + ":" + this.postfix, CONSUMER_ID); + + UnregisterDurableConsumer(CLIENT_ID_AND_SUBSCIPTION, CLIENT_ID_AND_SUBSCIPTION); } } - protected void RunTestDurableConsumer(AcknowledgementMode ackMode) + protected void RunTestDurableConsumer(string clientId, AcknowledgementMode ackMode) { SendDurableMessage(); - using(IConnection connection = CreateConnection(TEST_CLIENT_ID + ":" + this.postfix)) + using(IConnection connection = CreateConnection(clientId)) { connection.Start(); - using(ISession session = connection.CreateSession(AcknowledgementMode.Transactional)) + using(ISession session = connection.CreateSession(ackMode)) { ITopic topic = SessionUtil.GetTopic(session, DURABLE_TOPIC); - using(IMessageConsumer consumer = session.CreateDurableConsumer(topic, CONSUMER_ID, DURABLE_SELECTOR, false)) + using(IMessageConsumer consumer = session.CreateDurableConsumer(topic, clientId, DURABLE_SELECTOR, false)) { IMessage msg = consumer.Receive(receiveTimeout); Assert.IsNotNull(msg, "Did not receive first durable message."); @@ -254,10 +259,9 @@ protected void SendDurableMessage() { - using(IConnection connection = CreateConnection(SEND_CLIENT_ID + ":" + this.postfix)) + using(IConnection connection = CreateConnection(SEND_CLIENT_ID + ":" + new Random().Next())) { - connection.Start(); - using(ISession session = connection.CreateSession(AcknowledgementMode.DupsOkAcknowledge)) + using(ISession session = connection.CreateSession(AcknowledgementMode.AutoAcknowledge)) { ITopic topic = SessionUtil.GetTopic(session, DURABLE_TOPIC); using(IMessageProducer producer = session.CreateProducer(topic))