Added resource cleaning (mainly connection close); see QPID-824

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@634273 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 25 insertions, 9 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
index a3c7b2ea48..a5279a195b 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/InvalidDestinationTest.java
@@ -44,6 +44,7 @@ public class InvalidDestinationTest extends QpidTestCase
 

     protected void tearDown() throws Exception

     {

+        _connection.close();

         super.tearDown();

     }

 

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index 6c23beffa7..81171fa330 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
@@ -42,13 +42,15 @@ public class LargeMessageTest extends QpidTestCase
 
     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 @@ public class LargeMessageTest extends QpidTestCase
 
     protected void tearDown() throws Exception
     {
+        _connection.close();
         super.tearDown();
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
index 9e8f368985..60c84f451d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PubSubTwoConnectionTest.java
@@ -72,5 +72,7 @@ public class PubSubTwoConnectionTest extends QpidTestCase
         TextMessage tm1 = (TextMessage) consumer.receive(2000);
         assertNotNull(tm1);
         assertEquals("Hello", tm1.getText());
+        con1.close();
+        con2.close();
     }
 }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
index 83fcbd7e65..10c054a863 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/CloseTests.java
@@ -69,6 +69,6 @@ public class CloseTests extends QpidTestCase
         consumer.close();
 
         _logger.info("Closed Consumer");
-
+        connection.close();
     }
 }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
index 158759bf1e..28782229a1 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
@@ -49,6 +49,7 @@ public class AMQConnectionTest extends QpidTestCase
 
     protected void tearDown() throws Exception
     {
+        _connection.close();
         super.tearDown();
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 56394fee27..7eb74e2492 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -178,6 +178,10 @@ public class ConnectionTest extends TestCase
         {
             // PASS
         }
+        finally
+        {
+            connection.close();
+        }
     }
 
     public void testClientIdIsPopulatedAutomatically() throws Exception
@@ -185,6 +189,7 @@ public class ConnectionTest extends TestCase
         Connection connection = new AMQConnection(_broker, "guest", "guest",
                                                   null, "test");
         assertNotNull(connection.getClientID());
+        connection.close();
     }
 
     public static junit.framework.Test suite()
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
index 347c0c43da..7b3077a1c1 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
@@ -83,6 +83,7 @@ public class ObjectMessageTest extends QpidTestCase implements MessageListener
 
     protected void tearDown() throws Exception
     {
+        close();
         super.tearDown();
     }
 
@@ -108,10 +109,6 @@ public class ObjectMessageTest extends QpidTestCase implements MessageListener
             e.printStackTrace();
             fail("This Test should succeed but failed due to: " + e);
         }
-        finally
-        {
-            close();
-        }
     }
 
     public void testSetObjectPropertyForString() throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
index 94addd55dd..d9d078a01d 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
@@ -117,6 +117,8 @@ public class StreamMessageTest extends QpidTestCase
         {
             assertTrue("Expected MessageEOFException: " + e, e instanceof MessageEOFException);
         }
+        con.close();
+        con2.close();
     }
 
     public void testModifyReceivedMessageExpandsBuffer() throws Exception
@@ -152,5 +154,7 @@ public class StreamMessageTest extends QpidTestCase
         sm.writeInt(42);
         mandatoryProducer.send(sm);
         Thread.sleep(2000);
+        con.close();
+        con2.close();
     }
 }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index d765a3af18..225ce9bc8c 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
@@ -162,7 +162,10 @@ public class DurableSubscriptionTest extends QpidTestCase
         _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();
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
index 4dfd4fdfea..4f0f0dbaa9 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicPublisherTest.java
@@ -66,7 +66,7 @@ public class TopicPublisherTest extends QpidTestCase
         {
             // PASS
         }
-
+        con.close();
     }
 
     public static junit.framework.Test suite()