* use VMBrokerSetup test helper class where appropriate

* change notifyAll() to notify() in MultipleConnectionTest.java


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

3 files changed, 12 insertions, 14 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
index 7ec5d056e1..f25d2887ae 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
@@ -53,7 +53,6 @@ public class MapMessageTest extends TestCase implements MessageListener
         super.setUp();
         try
         {
-            TransportConnection.createVMBroker(1);
             init(new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "/test_path"));
         }
         catch (Exception e)
@@ -136,7 +135,7 @@ public class MapMessageTest extends TestCase implements MessageListener
 //            try
 //            {
 //                m.setInt("testint", 3);
-//                Assert.fail("Message should not be writeable");
+//                fail("Message should not be writeable");
 //            }
 //            catch (MessageNotWriteableException mnwe)
 //            {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index a2569a4701..53e08acbab 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
@@ -36,7 +36,8 @@ import junit.framework.TestCase;
  */
 public class MultipleConnectionTest extends TestCase
 {
-    public static String _connectionString = "vm://:1";
+    public static final String _defaultBroker = "vm://:1";
+    public static String _connectionString = _defaultBroker;
 
     private static class Receiver
     {
@@ -111,7 +112,7 @@ public class MultipleConnectionTest extends TestCase
         public synchronized void onMessage(Message message)
         {
             _count++;
-            notifyAll();
+            notify();
         }
 
         synchronized boolean waitUntil(int expected, long maxWait) throws InterruptedException
@@ -154,7 +155,6 @@ public class MultipleConnectionTest extends TestCase
             {
                 throw new RuntimeException("Expected: " + expected + " got " + counters[i]);
             }
-            ;
         }
     }
 
@@ -165,7 +165,7 @@ public class MultipleConnectionTest extends TestCase
 
     public static void main(String[] argv) throws Exception
     {
-        String broker = argv.length > 0 ? argv[0] : "vm://:1";
+        String broker = argv.length > 0 ? argv[0] : _defaultBroker;
 
         int connections = 7;
         int sessions = 2;
@@ -182,14 +182,6 @@ public class MultipleConnectionTest extends TestCase
 
         AMQTopic topic = new AMQTopic("amq.topic");
 
-        /*
-        Receiver[] receivers = new Receiver[connections];
-        for(int i = 0; i < receivers.length; i++)
-        {
-            receivers[i] = new Receiver(broker, topic, sessions);
-        }
-        */
-
         Receiver[] receivers = new Receiver[]{
                 new Receiver(broker, topic, 2),
                 new Receiver(broker, topic, 14)
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
index e73479eba0..302551b05c 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ReceiveTest.java
@@ -99,10 +99,17 @@ public class ReceiveTest extends TestCase
         test._connectionString = argv.length == 0 ? VM_BROKER : argv[0];
         test.setUp();
         test.test();
+        test.tearDown();
     }
 
     public static junit.framework.Test suite()
     {
+        // TODO: note that this test doesn't use the VMBrokerSetup
+        // test helper class to create and tear down its
+        // VMBroker. This is because the main() above seems to
+        // indicate that it's also used outside of the surefire test
+        // framework. If it isn't, then this test should also be
+        // changed to use VMBrokerSetup here.
         return new junit.framework.TestSuite(ReceiveTest.class);
     }
 }