From e3b5f0555c3e6ab3f875e8fa97153076bdef309e Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Mon, 18 Aug 2008 16:27:57 +0000 Subject: QPID-1252: modified tests to unsubscribe the durable subscriptions they create git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@686811 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java | 2 ++ .../org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java | 7 +++++++ .../java/org/apache/qpid/test/unit/topic/TopicSessionTest.java | 2 ++ 3 files changed, 11 insertions(+) diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java index 417b9b75f0..7c0147b786 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java @@ -79,6 +79,8 @@ public class AMQSessionTest extends QpidTestCase subscriber = _session.createDurableSubscriber(_topic, "mysubname2", "abc", false); assertEquals("Topic names should match from durable TopicSubscriber with selector", _topic.getTopicName(), subscriber.getTopic().getTopicName()); + _session.unsubscribe("mysubname"); + _session.unsubscribe("mysubname2"); } public void testCreateQueueReceiver() throws JMSException diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java index 2d3a98977f..fe7b97a47d 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java @@ -188,6 +188,8 @@ public class DurableSubscriptionTest extends QpidTestCase consumer1.close(); consumer3.close(); + session3.unsubscribe("MySubscription"); + con.close(); } @@ -266,6 +268,8 @@ public class DurableSubscriptionTest extends QpidTestCase consumer1.close(); consumer3.close(); + session3.unsubscribe("MySubscription"); + con0.close(); con1.close(); con3.close(); @@ -305,6 +309,7 @@ public class DurableSubscriptionTest extends QpidTestCase assertNotNull ("Message should have been received", msg); assertEquals ("testDurableWithInvalidSelector2", ((TextMessage) msg).getText()); assertNull("Should not receive subsequent message", liveSubscriber.receive(200)); + session.unsubscribe("testDurableWithInvalidSelectorSub"); } /*** @@ -339,6 +344,8 @@ public class DurableSubscriptionTest extends QpidTestCase assertNotNull ("Message should have been received", msg); assertEquals ("testDurableWithInvalidSelector2", ((TextMessage) msg).getText()); assertNull("Should not receive subsequent message", liveSubscriber.receive(200)); + + session.unsubscribe("testDurableWithInvalidDestinationsub"); } public static junit.framework.Test suite() diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java index 7a20b1058b..9f4c9e53aa 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java +++ b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java @@ -134,6 +134,7 @@ public class TopicSessionTest extends QpidTestCase m = (TextMessage) sub2.receive(2000); assertNotNull(m); assertEquals("goodbye", m.getText()); + session1.unsubscribe("subscription0"); con.close(); } @@ -163,6 +164,7 @@ public class TopicSessionTest extends QpidTestCase tm = (TextMessage) sub.receive(2000); assertNotNull(tm); assertEquals("Hello2", tm.getText()); + session2.unsubscribe("subscription0"); con1.close(); con2.close(); } -- cgit v1.2.1