combined test cases and eliminated race condition

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

1 files changed, 8 insertions, 12 deletions

diff --git a/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java b/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
index 55d53ebaae..0c5c69c1f1 100644
--- a/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpidity/transport/ConnectionTest.java
@@ -90,9 +90,15 @@ public class ConnectionTest extends TestCase
         return conn;
     }
 
-    public void testWriteToClosed() throws Exception
+    public void testClosedNotificationAndWriteToClosed() throws Exception
     {
-        Connection conn = connect(null);
+        Condition closed = new Condition();
+        Connection conn = connect(closed);
+        if (!closed.get(3000))
+        {
+            fail("never got notified of connection close");
+        }
+
         Channel ch = conn.getChannel(0);
         Session ssn = new Session();
         ssn.attach(ch);
@@ -108,14 +114,4 @@ public class ConnectionTest extends TestCase
         }
     }
 
-    public void testClosedNotification() throws Exception
-    {
-        Condition closed = new Condition();
-        Connection conn = connect(closed);
-        if (!closed.get(3000))
-        {
-            fail("never got notified of connection close");
-        }
-    }
-
 }