1 files changed, 25 insertions, 31 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
index b1c8b5682f..49a608190d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
@@ -23,7 +23,6 @@ package org.apache.qpid.test.client.message;
 import java.util.concurrent.CountDownLatch;
 
 import javax.jms.DeliveryMode;
-import javax.jms.Destination;
 import javax.jms.InvalidSelectorException;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -31,7 +30,6 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
-import javax.jms.TextMessage;
 
 import junit.framework.Assert;
 
@@ -52,6 +50,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
     private AMQConnection _connection;
     private AMQDestination _destination;
     private int count;
+    public String _connectionString = "vm://:1";
     private static final String INVALID_SELECTOR = "Cost LIKE 5";
     CountDownLatch _responseLatch = new CountDownLatch(1);
 
@@ -281,36 +280,31 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
         Assert.assertNotNull("Msg5 should not be null", msg5);
     }
 
-    public void testSelectorWithJMSDeliveryMode() throws Exception
+    public static void main(String[] argv) throws Exception
     {
-        Session session = _connection.createSession(false, Session.SESSION_TRANSACTED);
+        SelectorTest test = new SelectorTest();
+        test._connectionString = (argv.length == 0) ? "localhost:3000" : argv[0];
 
-        Destination dest1 = session.createTopic("test1");
-        Destination dest2 = session.createTopic("test2");
-
-        MessageProducer prod1 = session.createProducer(dest1);
-        MessageProducer prod2 = session.createProducer(dest2);
-        MessageConsumer consumer1 = session.createConsumer(dest1,"JMSDeliveryMode = 'PERSISTENT'");
-        MessageConsumer consumer2 = session.createConsumer(dest2,"JMSDeliveryMode = 'NON_PERSISTENT'");
-
-        Message msg1 = session.createTextMessage("Persistent");
-        prod1.send(msg1);
-        prod2.send(msg1);
-
-        prod1.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-        prod2.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
-        Message msg2 = session.createTextMessage("Non_Persistent");
-        prod1.send(msg2);
-        prod2.send(msg2);
-
-        TextMessage m1 = (TextMessage)consumer1.receive(1000);
-        assertEquals("Consumer1 should receive the persistent message","Persistent",m1.getText());
-        assertNull("Consumer1 should not receiver another message",consumer1.receive(1000));
-
-        TextMessage m2 = (TextMessage)consumer2.receive(1000);
-        assertEquals("Consumer2 should receive the non persistent message","Non_Persistent",m2.getText());
-        assertNull("Consumer2 should not receiver another message",consumer2.receive(1000));
+        try
+        {
+            while (true)
+            {
+                if (test._connectionString.contains("vm://:1"))
+                {
+                    test.setUp();
+                }
+                test.testUsingOnMessage();
+
+                if (test._connectionString.contains("vm://:1"))
+                {
+                    test.tearDown();
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            System.err.println(e.getMessage());
+            e.printStackTrace();
+        }
     }
-
 }