Changed to use QpidTestCase

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

6 files changed, 21 insertions, 55 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
index 9237555734..a385c196b2 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
@@ -28,6 +28,7 @@ import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.message.JMSObjectMessage;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,7 +44,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public class ObjectMessageTest extends TestCase implements MessageListener
+public class ObjectMessageTest extends QpidTestCase implements MessageListener
 {
     private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class);
 
@@ -58,10 +59,9 @@ public class ObjectMessageTest extends TestCase implements MessageListener
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
         try
         {
-            init(new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test"));
+            init( (AMQConnection) getConnection("guest", "guest"));
         }
         catch (Exception e)
         {
@@ -72,7 +72,6 @@ public class ObjectMessageTest extends TestCase implements MessageListener
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
     private void init(AMQConnection connection) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index dce9667ff2..737daeb350 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -30,6 +30,7 @@ import org.apache.qpid.client.message.AMQMessage;
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,7 +48,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public class PropertyValueTest extends TestCase implements MessageListener
+public class PropertyValueTest extends QpidTestCase implements MessageListener
 {
     private static final Logger _logger = LoggerFactory.getLogger(PropertyValueTest.class);
 
@@ -63,13 +64,11 @@ public class PropertyValueTest extends TestCase implements MessageListener
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killVMBroker(1);
     }
 
     private void init(AMQConnection connection) throws Exception
@@ -109,7 +108,7 @@ public class PropertyValueTest extends TestCase implements MessageListener
                 _logger.error("Run Number:" + run++);
                 try
                 {
-                    init(new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test"));
+                    init( (AMQConnection) getConnection("guest", "guest"));
                 }
                 catch (Exception e)
                 {
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 3aefc098aa..9e8f368985 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
@@ -33,16 +33,16 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
 
 /**
  * @author Apache Software Foundation
  */
-public class PubSubTwoConnectionTest extends TestCase
+public class PubSubTwoConnectionTest extends QpidTestCase
 {
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
     }
 
     protected void tearDown() throws Exception
@@ -57,14 +57,14 @@ public class PubSubTwoConnectionTest extends TestCase
     public void testTwoConnections() throws Exception
     {
 
-        AMQConnection con1 = new AMQConnection("vm://:1", "guest", "guest", "Client1", "test");
+        AMQConnection con1 = (AMQConnection) getConnection("guest", "guest");
 
         Topic topic = new AMQTopic(con1, "MyTopic");
 
         Session session1 = con1.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         MessageProducer producer = session1.createProducer(topic);
 
-        Connection con2 = new AMQConnection("vm://:1", "guest", "guest", "Client2", "test");
+        Connection con2 = (AMQConnection) getConnection("guest", "guest") ;
         Session session2 = con2.createSession(false, AMQSession.NO_ACKNOWLEDGE);
         MessageConsumer consumer = session2.createConsumer(topic);
         con2.start();        
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 668233f356..5711d12b9e 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
@@ -21,6 +21,7 @@
 package org.apache.qpid.test.unit.basic;
 
 import javax.jms.MessageConsumer;
+import javax.jms.Message;
 
 import junit.framework.TestCase;
 
@@ -30,46 +31,23 @@ import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.testutil.QpidTestCase;
 
-public class ReceiveTest extends TestCase
+public class ReceiveTest extends QpidTestCase
 {
     private AMQConnection _connection;
     private AMQDestination _destination;
     private AMQSession _session;
     private MessageConsumer _consumer;
 
-    private static final String VM_BROKER = "vm://:1";
-    public String _connectionString = VM_BROKER;
-
     protected void setUp() throws Exception
     {
         super.setUp();
-        if (_connectionString.equals(VM_BROKER))
-        {
-            createVMBroker();
-            String broker = _connectionString;
-            init(new AMQConnection(broker, "guest", "guest", "ReceiveTestClient", "test"));
-        }
-    }
-
-    public void createVMBroker()
-    {
-        try
-        {
-            TransportConnection.createVMBroker(1);
-        }
-        catch (AMQVMBrokerCreationException e)
-        {
-            fail("Unable to create broker: " + e);
-        }
+       init((AMQConnection) getConnection("guest", "guest"));
     }
 
-    protected void tearDown() throws Exception
+   protected void tearDown() throws Exception
     {
-        if (_connectionString.equals(VM_BROKER))
-        {
-            TransportConnection.killVMBroker(1);
-        }
         super.tearDown();
     }
 
@@ -89,18 +67,11 @@ public class ReceiveTest extends TestCase
 
     public void test() throws Exception
     {
-        _consumer.receive(5000);
+        Message m = _consumer.receive(5000);
+        assertNull("should not have received a message", m);
         _connection.close();
     }
 
-    public static void main(String[] argv) throws Exception
-    {
-        ReceiveTest test = new ReceiveTest();
-        test._connectionString = argv.length == 0 ? VM_BROKER : argv[0];
-        test.setUp();
-        test.test();
-        test.tearDown();
-    }
 
     public static junit.framework.Test suite()
     {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
index 40c712c1c9..ed4f6041df 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SelectorTest.java
@@ -28,6 +28,7 @@ import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.BasicMessageProducer;
 import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +38,7 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 
-public class SelectorTest extends TestCase implements MessageListener
+public class SelectorTest extends QpidTestCase  implements MessageListener
 {
     private static final Logger _logger = LoggerFactory.getLogger(SelectorTest.class);
 
@@ -50,14 +51,12 @@ public class SelectorTest extends TestCase implements MessageListener
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
-        init(new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test"));
+         init((AMQConnection) getConnection("guest", "guest"));
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        TransportConnection.killAllVMBrokers();
     }
 
     private void init(AMQConnection connection) throws Exception
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index 5247f45d21..ba9963db41 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
@@ -27,7 +27,6 @@ import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.testutil.VMBrokerSetup;
 import org.apache.qpid.testutil.QpidTestCase;
 
 import org.slf4j.Logger;
@@ -95,7 +94,6 @@ public class TextMessageTest extends QpidTestCase implements MessageListener
         }
         catch (Throwable  e)
         {
-// TODO
             e.printStackTrace();
         }
         connection.start();
@@ -120,7 +118,7 @@ public class TextMessageTest extends QpidTestCase implements MessageListener
             String text = "Message " + i;
             messages.add(text);
             Message m = _session.createTextMessage(text);
-            m.setStringProperty("String", "hello");
+            //m.setStringProperty("String", "hello");
 
             _logger.info("Sending Msg:" + m);
             producer.send(m);