Merge bug21987 into default

Author: tonyg

build.xml

@@ -327,9 +327,9 @@
   	</fail>
   </target>
 
-  <target name="test-suite-run" depends="test, test-ssl, test-persister-restart, test-functional, test-main-silent"/>
+  <target name="test-suite-run" depends="test-client, test-ssl, test-server, test-functional, test-main-silent"/>
 
-  <target name="test" depends="test-build">
+  <target name="test-client" depends="test-build">
     <junit printSummary="withOutAndErr"
         haltOnFailure="${haltOnFailureJunit}"
         failureproperty="test.failure"
@@ -338,7 +338,7 @@
 
       <formatter type="plain"/>
       <formatter type="xml"/>
-      <test todir="${build.out}" name="com.rabbitmq.client.test.AllTest"/>
+      <test todir="${build.out}" name="com.rabbitmq.client.test.ClientTests"/>
     </junit>
   </target>
 
@@ -375,7 +375,7 @@
     </junit>
   </target>
 
-  <target name="test-persister-restart" depends="test-build">
+  <target name="test-server" depends="test-build">
     <junit printSummary="withOutAndErr"
         haltOnFailure="${haltOnFailureJunit}"
         failureproperty="test.failure"
@@ -384,7 +384,7 @@
       <formatter type="plain"/>
       <formatter type="xml"/>
       <test todir="${build.out}"
-        name="com.rabbitmq.client.test.functional.PersisterRestartTests"/>
+        name="com.rabbitmq.client.test.server.ServerTests"/>
     </junit>
   </target>
 

test/src/com/rabbitmq/client/test/functional/BrokerTestCase.java renamed to test/src/com/rabbitmq/client/test/BrokerTestCase.java

@@ -29,7 +29,7 @@
 //   Contributor(s): ______________________________________.
 //
 
-package com.rabbitmq.client.test.functional;
+package com.rabbitmq.client.test;
 
 import java.io.IOException;
 
@@ -39,6 +39,8 @@
 import com.rabbitmq.client.Command;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
+import com.rabbitmq.client.GetResponse;
+import com.rabbitmq.client.MessageProperties;
 import com.rabbitmq.client.ShutdownSignalException;
 
 import com.rabbitmq.client.AMQP;
@@ -137,4 +139,64 @@ public void checkShutdownSignal(int expectedCode, IOException ioe) {
             assertEquals(expectedCode, closeMethod.getReplyCode());
         }
     }
+
+  protected void assertDelivered(String q, int count) throws IOException {
+    assertDelivered(q, count, false);
+  }
+
+  protected void assertDelivered(String q, int count, boolean redelivered) throws IOException {
+    GetResponse r;
+    for (int i = 0; i < count; i++) {
+      r = basicGet(q);
+      assertNotNull(r);
+      assertEquals(r.getEnvelope().isRedeliver(), redelivered);
+    }
+    assertNull(basicGet(q));
+  }
+
+  protected GetResponse basicGet(String q) throws IOException {
+    return channel.basicGet(q, true);
+  }
+
+  protected void basicPublishPersistent(String q) throws IOException {
+    channel.basicPublish("", q, MessageProperties.PERSISTENT_TEXT_PLAIN, "persistent message".getBytes());
+  }
+
+  protected void basicPublishPersistent(String x, String routingKey) throws IOException {
+    channel.basicPublish(x, routingKey, MessageProperties.PERSISTENT_TEXT_PLAIN, "persistent message".getBytes());
+  }
+
+  protected void basicPublishVolatile(String q) throws IOException {
+    channel.basicPublish("", q, MessageProperties.TEXT_PLAIN, "not persistent message".getBytes());
+  }
+
+  protected void basicPublishVolatile(String x, String routingKey) throws IOException {
+    channel.basicPublish(x, routingKey, MessageProperties.TEXT_PLAIN, "not persistent message".getBytes());
+  }
+
+  protected void declareAndBindDurableQueue(String q, String x, String r) throws IOException {
+    declareDurableQueue(q);
+    channel.queueBind(q, x, r);
+  }
+
+  protected void declareDurableDirectExchange(String x) throws IOException {
+    channel.exchangeDeclare(x, "direct", true);
+  }
+
+  protected void declareDurableQueue(String q) throws IOException {
+    channel.queueDeclare(q, true);
+  }
+
+  protected void declareDurableTopicExchange(String x) throws IOException {
+    channel.exchangeDeclare(x, "topic", true);
+  }
+
+  protected void deleteExchange(String x) throws IOException {
+    channel.exchangeDelete(x);
+  }
+
+  protected void deleteQueue(String q) throws IOException {
+    channel.queueDelete(q);
+  }
+
 }

test/src/com/rabbitmq/client/test/functional/Bug20004Test.java renamed to test/src/com/rabbitmq/client/test/Bug20004Test.java

@@ -28,8 +28,9 @@
 //
 //   Contributor(s): ______________________________________.
 //
-package com.rabbitmq.client.test.functional;
+package com.rabbitmq.client.test;
 
+import com.rabbitmq.client.test.functional.*;
 import java.io.IOException;
 
 /**

test/src/com/rabbitmq/client/test/AllTest.java renamed to test/src/com/rabbitmq/client/test/ClientTests.java

@@ -34,16 +34,17 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-public class AllTest extends TestCase {
+public class ClientTests extends TestCase {
     public static TestSuite suite() {
-        TestSuite suite = new TestSuite("all");
+        TestSuite suite = new TestSuite("client");
         suite.addTest(TableTest.suite());
         suite.addTest(BlockingCellTest.suite());
         suite.addTest(TruncatedInputStreamTest.suite());
         suite.addTest(AMQConnectionTest.suite());
         suite.addTest(ValueOrExceptionTest.suite());
         suite.addTest(BrokenFramesTest.suite());
         suite.addTest(ClonePropertiesTest.suite());
+        suite.addTestSuite(Bug20004Test.class);
         return suite;
     }
 }

test/src/com/rabbitmq/client/test/functional/AlternateExchange.java

@@ -31,6 +31,7 @@
 
 package com.rabbitmq.client.test.functional;
 
+import com.rabbitmq.client.test.BrokerTestCase;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.ReturnListener;
 import com.rabbitmq.client.GetResponse;