QPID-5504 : Refactoring to allow for nodes other than queues to be subscribed from, and nodes other than exchanges to be sent to (merged from separate branch)

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

4 files changed, 12 insertions, 13 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
index 9f532ec5f7..db6da6f739 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ConsumerLoggingTest.java
@@ -46,7 +46,7 @@ import java.util.List;
  * SUB-1002 : Close
  * SUB-1003 : State : <state>
  */
-public class SubscriptionLoggingTest extends AbstractTestLogging
+public class ConsumerLoggingTest extends AbstractTestLogging
 {
     static final String SUB_PREFIX = "SUB-";
 
@@ -177,7 +177,8 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
 
         List<String> results = findMatches(SUB_PREFIX);
 
-        assertEquals("Result set larger than expected.", 2, results.size());
+        final int expected = isBroker010() ? 5 : 2;
+        assertEquals("Result set larger than expected.", expected, results.size());
 
         String log = getLogMessage(results, 0);
 
@@ -185,14 +186,10 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
 
         String message = getMessageString(fromMessage(log));
         assertTrue("Browser not on log message:" + message, message.contains("Browser"));
-        if(!isBroker010())
-        {
-            assertTrue("AutoClose not on log message:" + message, message.contains("AutoClose"));
-        }
 
         // Beacause it is an auto close and we have no messages on the queue we
         // will get a close message
-        log = getLogMessage(results, 1);
+        log = getLogMessage(results, expected-1);
         validateMessageID("SUB-1002", log);
 
     }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
index 05c8e362a1..d558e07ed7 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java
@@ -67,16 +67,15 @@ public class ConnectionRestTest extends QpidRestTestCase
             producer.send(_session.createTextMessage("Test-" + i));
         }
         _session.commit();
-
         Message m = consumer.receive(1000l);
-        assertNotNull("Message was not received", m);
+        assertNotNull("First message was not received", m);
         _session.commit();
 
         // receive the rest of messages for rollback
         for (int i = 0; i < MESSAGE_NUMBER - 1; i++)
         {
             m = consumer.receive(1000l);
-            assertNotNull("Message was not received", m);
+            assertNotNull("Subsequent messages were not received", m);
         }
         _session.rollback();
 
@@ -84,7 +83,7 @@ public class ConnectionRestTest extends QpidRestTestCase
         for (int i = 0; i < MESSAGE_NUMBER - 1; i++)
         {
             m = consumer.receive(1000l);
-            assertNotNull("Message was not received", m);
+            assertNotNull("Message was not received after rollback", m);
         }
     }
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
index 54c3225cec..b6f81da690 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
@@ -32,6 +32,7 @@ import javax.jms.MessageListener;
 import javax.jms.Queue;
 import javax.jms.Session;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -169,7 +170,8 @@ public class RollbackOrderTest extends QpidBrokerTestCase
         //Start the session now so we
         _connection.start();
 
-        count.await();
+        count.await(10l, TimeUnit.SECONDS);
+        assertEquals("Not all message received.  Count should be 0.", 0, count.getCount());
 
         for (Exception e : exceptions)
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
index 40db17f799..6356b17e6f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
@@ -26,6 +26,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.RejectBehaviour;
 import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -86,7 +87,7 @@ public class MaxDeliveryCountTest extends QpidBrokerTestCase
         // dead-lettered or requeued.
         if (!isBroker010())
         {
-            setTestClientSystemProperty(ClientProperties.REJECT_BEHAVIOUR_PROP_NAME, "server");
+            setTestClientSystemProperty(ClientProperties.REJECT_BEHAVIOUR_PROP_NAME, RejectBehaviour.SERVER.toString());
         }
         super.setUp();