Refactored interop tests into general distributed test framework. Moved framework under systests from integrationtests.

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

1 files changed, 6 insertions, 7 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 542adf4708..ebbffd8a71 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -24,7 +24,6 @@ package org.apache.qpid.server.exchange;
 import junit.framework.TestCase;

 import org.apache.log4j.Logger;

 import org.apache.qpid.server.registry.ApplicationRegistry;

-import org.apache.qpid.server.util.TestApplicationRegistry;

 import org.apache.qpid.server.util.NullApplicationRegistry;

 import org.apache.qpid.client.*;

 import org.apache.qpid.client.transport.TransportConnection;

@@ -127,8 +126,8 @@ public class ReturnUnroutableMandatoryMessageTest extends TestCase implements Ex
         con.start();

         TextMessage tm = (TextMessage) consumer.receive(1000L);

 

-        assertTrue("No message routed to receiver", tm != null);

-        assertTrue("Wrong message routed to receiver: " + tm.getText(), "msg3".equals(tm.getText()));

+        assertTrue("No message routed to receivers", tm != null);

+        assertTrue("Wrong message routed to receivers: " + tm.getText(), "msg3".equals(tm.getText()));

 

         try

         {

@@ -194,8 +193,8 @@ public class ReturnUnroutableMandatoryMessageTest extends TestCase implements Ex
         con.start();

         TextMessage tm = (TextMessage) consumer.receive(1000L);

 

-        assertTrue("No message routed to receiver", tm != null);

-        assertTrue("Wrong message routed to receiver: " + tm.getText(), "msg1".equals(tm.getText()));

+        assertTrue("No message routed to receivers", tm != null);

+        assertTrue("Wrong message routed to receivers: " + tm.getText(), "msg1".equals(tm.getText()));

 

         try

         {

@@ -260,8 +259,8 @@ public class ReturnUnroutableMandatoryMessageTest extends TestCase implements Ex
         con.start();

         TextMessage tm = (TextMessage) consumer.receive(1000L);

 

-        assertTrue("No message routed to receiver", tm != null);

-        assertTrue("Wrong message routed to receiver: " + tm.getText(), "msg1".equals(tm.getText()));

+        assertTrue("No message routed to receivers", tm != null);

+        assertTrue("Wrong message routed to receivers: " + tm.getText(), "msg1".equals(tm.getText()));

 

         try

         {