merge bug25163

Author: Tim Watson

build.xml

@@ -308,7 +308,7 @@
   	</fail>
   </target>
 
-  <target name="test-suite-run" depends="test-client, test-ssl, test-server, test-functional, test-main-silent"/>
+  <target name="test-suite-run" depends="test-client, test-ssl, test-server, test-functional, test-functional-and-server-with-ha, test-main-silent"/>
 
   <target name="test-client" depends="test-build" description="Run the client test suites.">
     <junit printSummary="withOutAndErr"
@@ -369,6 +369,19 @@
     </junit>
   </target>
 
+  <!-- TODO: merge test-server, test-functional and this into one, once umbrellas have been merged -->
+  <target name="test-functional-and-server-with-ha" depends="detect-umbrella, test-build" if="UMBRELLA_AVAILABLE">
+    <junit printSummary="withOutAndErr"
+        haltOnFailure="${haltOnFailureJunit}"
+        failureproperty="test.failure"
+        fork="yes">
+      <classpath refid="test.classpath"/>
+      <formatter type="plain"/>
+      <formatter type="xml"/>
+      <test todir="${build.out}" name="com.rabbitmq.client.test.server.HATests"/>
+    </junit>
+  </target>
+
   <target name="test-single" depends="test-build">
     <junit printSummary="withOutAndErr"
         haltOnFailure="${haltOnFailureJunit}"

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

@@ -26,6 +26,11 @@
 public class FunctionalTests extends TestCase {
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("functional");
+        add(suite);
+        return suite;
+    }
+
+    public static void add(TestSuite suite) {
         suite.addTestSuite(ConnectionOpen.class);
         suite.addTestSuite(Heartbeat.class);
         suite.addTestSuite(Tables.class);
@@ -64,6 +69,5 @@ public static TestSuite suite() {
         suite.addTestSuite(InternalExchange.class);
         suite.addTestSuite(CcRoutes.class);
         suite.addTestSuite(WorkPoolTests.class);
-        return suite;
     }
 }

test/src/com/rabbitmq/client/test/server/HATests.java

@@ -0,0 +1,58 @@
+//  The contents of this file are subject to the Mozilla Public License
+//  Version 1.1 (the "License"); you may not use this file except in
+//  compliance with the License. You may obtain a copy of the License
+//  at http://www.mozilla.org/MPL/
+//
+//  Software distributed under the License is distributed on an "AS IS"
+//  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+//  the License for the specific language governing rights and
+//  limitations under the License.
+//
+//  The Original Code is RabbitMQ.
+//
+//  The Initial Developer of the Original Code is VMware, Inc.
+//  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+//
+
+package com.rabbitmq.client.test.server;
+
+import com.rabbitmq.client.test.functional.FunctionalTests;
+import com.rabbitmq.tools.Host;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class HATests extends TestSuite {
+    public static boolean HA_TESTS_RUNNING = false;
+
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite("server-tests");
+        suite.addTestSuite(SetUp.class);
+        FunctionalTests.add(suite);
+        ServerTests.add(suite);
+        suite.addTestSuite(TearDown.class);
+        return suite;
+    }
+
+    // This is of course an abuse of the TestCase concept - but I don't want to
+    // run this command on every test case. And there's no hook for "before /
+    // after this test suite".
+    public static class SetUp extends TestCase {
+        @Override
+        protected void setUp() throws Exception {
+            Host.executeCommand("cd ../rabbitmq-test; make enable-ha");
+            HA_TESTS_RUNNING = true;
+        }
+
+        public void testNothing() {}
+    }
+
+    public static class TearDown extends TestCase {
+        @Override
+        protected void tearDown() throws Exception {
+            Host.executeCommand("cd ../rabbitmq-test; make disable-ha");
+            HA_TESTS_RUNNING = false;
+        }
+
+        public void testNothing() {}
+    }
+}

test/src/com/rabbitmq/client/test/server/MessageRecovery.java

@@ -34,7 +34,10 @@ public void testMessageRecovery()
         waitForConfirms();
 
         restart();
-        assertDelivered(Q, 1);
+
+        // When testing in HA mode the message will be collected from a promoted
+        // slave and wil have its redelivered flag set.
+        assertDelivered(Q, 1, HATests.HA_TESTS_RUNNING);
         channel.queueDelete(Q);
     }
 

test/src/com/rabbitmq/client/test/server/ServerTests.java

@@ -23,6 +23,11 @@
 public class ServerTests extends TestCase {
     public static TestSuite suite() {
         TestSuite suite = new TestSuite("server-tests");
+        add(suite);
+        return suite;
+    }
+
+    public static void add(TestSuite suite) {
         suite.addTestSuite(Permissions.class);
         suite.addTestSuite(DurableBindingLifecycle.class);
         suite.addTestSuite(EffectVisibilityCrossNodeTest.class);
@@ -32,6 +37,5 @@ public static TestSuite suite() {
         suite.addTestSuite(MessageRecovery.class);
         suite.addTestSuite(Firehose.class);
         suite.addTestSuite(PersistenceGuarantees.class);
-        return suite;
     }
 }