You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2008/03/06 15:28:52 UTC
svn commit: r634273 - in
/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit:
basic/ basic/close/ client/ client/connection/ client/message/ message/
topic/
Author: arnaudsimon
Date: Thu Mar 6 06:28:50 2008
New Revision: 634273
URL: http://svn.apache.org/viewvc?rev=634273&view=rev
Log:
Added resource cleaning (mainly connection close); see QPID-824
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java Thu Mar 6 06:28:50 2008
@@ -44,6 +44,7 @@
protected void tearDown() throws Exception
{
+ _connection.close();
super.tearDown();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java Thu Mar 6 06:28:50 2008
@@ -42,13 +42,15 @@
private Destination _destination;
private AMQSession _session;
-
+ private AMQConnection _connection;
+
protected void setUp() throws Exception
{
super.setUp();
try
{
- init((AMQConnection) getConnection("guest", "guest"));
+ _connection = (AMQConnection) getConnection("guest", "guest");
+ init( _connection );
}
catch (Exception e)
{
@@ -58,6 +60,7 @@
protected void tearDown() throws Exception
{
+ _connection.close();
super.tearDown();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java Thu Mar 6 06:28:50 2008
@@ -72,5 +72,7 @@
TextMessage tm1 = (TextMessage) consumer.receive(2000);
assertNotNull(tm1);
assertEquals("Hello", tm1.getText());
+ con1.close();
+ con2.close();
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java Thu Mar 6 06:28:50 2008
@@ -69,6 +69,6 @@
consumer.close();
_logger.info("Closed Consumer");
-
+ connection.close();
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java Thu Mar 6 06:28:50 2008
@@ -49,6 +49,7 @@
protected void tearDown() throws Exception
{
+ _connection.close();
super.tearDown();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java Thu Mar 6 06:28:50 2008
@@ -178,6 +178,10 @@
{
// PASS
}
+ finally
+ {
+ connection.close();
+ }
}
public void testClientIdIsPopulatedAutomatically() throws Exception
@@ -185,6 +189,7 @@
Connection connection = new AMQConnection(_broker, "guest", "guest",
null, "test");
assertNotNull(connection.getClientID());
+ connection.close();
}
public static junit.framework.Test suite()
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java Thu Mar 6 06:28:50 2008
@@ -83,6 +83,7 @@
protected void tearDown() throws Exception
{
+ close();
super.tearDown();
}
@@ -107,10 +108,6 @@
{
e.printStackTrace();
fail("This Test should succeed but failed due to: " + e);
- }
- finally
- {
- close();
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java Thu Mar 6 06:28:50 2008
@@ -117,6 +117,8 @@
{
assertTrue("Expected MessageEOFException: " + e, e instanceof MessageEOFException);
}
+ con.close();
+ con2.close();
}
public void testModifyReceivedMessageExpandsBuffer() throws Exception
@@ -152,5 +154,7 @@
sm.writeInt(42);
mandatoryProducer.send(sm);
Thread.sleep(2000);
+ con.close();
+ con2.close();
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Thu Mar 6 06:28:50 2008
@@ -162,7 +162,10 @@
_logger.info("Receive message on consumer 3 :expecting null");
msg = consumer3.receive(100);
assertEquals(null, msg);
-
+ // we need to unsubscribe as the session is NO_ACKNOWLEDGE
+ // messages for the durable subscriber are not deleted so the test cannot
+ // be run twice in a row
+ session2.unsubscribe("MySubscription");
con.close();
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java?rev=634273&r1=634272&r2=634273&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java Thu Mar 6 06:28:50 2008
@@ -66,7 +66,7 @@
{
// PASS
}
-
+ con.close();
}
public static junit.framework.Test suite()