You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2008/08/18 18:27:58 UTC
svn commit: r686811 - in
/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit:
client/AMQSessionTest.java topic/DurableSubscriptionTest.java
topic/TopicSessionTest.java
Author: rhs
Date: Mon Aug 18 09:27:57 2008
New Revision: 686811
URL: http://svn.apache.org/viewvc?rev=686811&view=rev
Log:
QPID-1252: modified tests to unsubscribe the durable subscriptions they create
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?rev=686811&r1=686810&r2=686811&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQSessionTest.java Mon Aug 18 09:27:57 2008
@@ -79,6 +79,8 @@
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
Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=686811&r1=686810&r2=686811&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Mon Aug 18 09:27:57 2008
@@ -188,6 +188,8 @@
consumer1.close();
consumer3.close();
+ session3.unsubscribe("MySubscription");
+
con.close();
}
@@ -266,6 +268,8 @@
consumer1.close();
consumer3.close();
+ session3.unsubscribe("MySubscription");
+
con0.close();
con1.close();
con3.close();
@@ -305,6 +309,7 @@
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 @@
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()
Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java?rev=686811&r1=686810&r2=686811&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java Mon Aug 18 09:27:57 2008
@@ -134,6 +134,7 @@
m = (TextMessage) sub2.receive(2000);
assertNotNull(m);
assertEquals("goodbye", m.getText());
+ session1.unsubscribe("subscription0");
con.close();
}
@@ -163,6 +164,7 @@
tm = (TextMessage) sub.receive(2000);
assertNotNull(tm);
assertEquals("Hello2", tm.getText());
+ session2.unsubscribe("subscription0");
con1.close();
con2.close();
}