QPID-1914: Create the queue properly

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

6 files changed, 1 insertions, 15 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
index 9a497d6da2..82b867f655 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
@@ -62,6 +62,7 @@ public class QueueBrowserAutoAckTest extends FailoverBaseCase
         setupSession();
 
         _queue = _clientSession.createQueue(getName());
+        _clientSession.createConsumer(_queue).close();
         
         //Ensure there are no messages on the queue to start with.
         checkQueueDepth(0);
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
index d346aa514c..f30b8043ad 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
@@ -29,9 +29,6 @@ public class QueueBrowserClientAckTest extends QueueBrowserAutoAckTest
     protected void setupSession() throws Exception
     {
          _clientSession = _clientConnection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-
-        //Ensure _queue is created
-        _clientSession.createConsumer(_queue).close();
     }
 
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
index 37174258dd..b19809b8f2 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
@@ -27,8 +27,5 @@ public class QueueBrowserDupsOkTest extends QueueBrowserAutoAckTest
     protected void setupSession() throws Exception
     {
           _clientSession = _clientConnection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
-
-        //Ensure _queue is created
-        _clientSession.createConsumer(_queue).close();
     }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
index 0ef788dae3..c97343464c 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
@@ -29,8 +29,5 @@ public class QueueBrowserNoAckTest extends QueueBrowserAutoAckTest
     protected void setupSession() throws Exception
     {
          _clientSession = _clientConnection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
-
-        //Ensure _queue is created
-        _clientSession.createConsumer(_queue).close();
     }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
index 787c12dadb..bb1c0d3698 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
@@ -28,8 +28,5 @@ public class QueueBrowserPreAckTest extends QueueBrowserAutoAckTest
     protected void setupSession() throws Exception
     {
         _clientSession = _clientConnection.createSession(false, AMQSession.PRE_ACKNOWLEDGE);
-
-        //Ensure _queue is created
-        _clientSession.createConsumer(_queue).close();
     }
 }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
index 6e3d6fd890..d79788f017 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
@@ -27,8 +27,5 @@ public class QueueBrowserTransactedTest extends QueueBrowserAutoAckTest
     protected void setupSession() throws Exception
     {
         _clientSession = _clientConnection.createSession(true, Session.SESSION_TRANSACTED);
-
-        //Ensure _queue is created
-        _clientSession.createConsumer(_queue).close();
     }
 }