Refactor

Author: Emile Joubert

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

@@ -21,6 +21,7 @@
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.test.BrokerTestCase;
+import com.rabbitmq.tools.Host;
 
 import java.io.IOException;
 
@@ -121,4 +122,12 @@ public void closeConnection() throws IOException {
         }
         super.closeConnection();
     }
+
+    protected void stopSecondary() throws IOException {
+        Host.executeCommand("cd ../rabbitmq-test; make stop-secondary-app");
+    }
+
+    protected void startSecondary() throws IOException {
+        Host.executeCommand("cd ../rabbitmq-test; make start-secondary-app");
+    }
 }

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

@@ -21,7 +21,6 @@
 
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.MessageProperties;
-import com.rabbitmq.tools.Host;
 
 public class DurableOnTransient extends ClusteredTestBase
 {
@@ -62,14 +61,6 @@ public void testBindDurableToTransient()
         assertNotNull(basicGet());
     }
 
-    private void stopSecondary() throws IOException {
-        Host.executeCommand("cd ../rabbitmq-test; make stop-secondary-app");
-    }
-
-    private void startSecondary() throws IOException {
-        Host.executeCommand("cd ../rabbitmq-test; make start-secondary-app");
-    }
-
     public void testSemiDurableBindingRemoval() throws IOException {
         if (clusteredConnection != null) {
             declareTransientTopicExchange("x");

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

@@ -34,12 +34,12 @@ public class AbsentQueue extends ClusteredTestBase {
     @Override protected void setUp() throws IOException {
         super.setUp();
         if (clusteredConnection != null)
-            Host.executeCommand("cd ../rabbitmq-test; make stop-secondary-app");
+            stopSecondary();
     }
 
     @Override protected void tearDown() throws IOException {
         if (clusteredConnection != null)
-            Host.executeCommand("cd ../rabbitmq-test; make start-secondary-app");
+            startSecondary();
         super.tearDown();
     }