Abstract rabbitmqctl invocations.

Author: Simon MacMullen

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

@@ -60,10 +60,10 @@ private void checkHeaders(Map<String, Object> pubHeaders) {
     }
 
     private void enable() throws IOException {
-        Host.executeCommand("cd ../rabbitmq-server; ./scripts/rabbitmqctl set_env '{trace_exchange, <<\"/\">>}' '<<\"trace\">>'");
+        Host.rabbitmqctl("set_env '{trace_exchange, <<\"/\">>}' '<<\"trace\">>'");
     }
 
     private void disable() throws IOException {
-        Host.executeCommand("cd ../rabbitmq-server; ./scripts/rabbitmqctl unset_env '{trace_exchange, <<\"/\">>}'");
+        Host.rabbitmqctl("unset_env '{trace_exchange, <<\"/\">>}'");
     }
 }

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

@@ -65,28 +65,21 @@ protected void tearDown()
     protected void addRestrictedAccount()
         throws IOException
     {
-        runCtl("add_user test test");
-        runCtl("add_user testadmin test");
-        runCtl("add_vhost /test");
-        runCtl("set_permissions -p /test test configure write read");
-        runCtl("set_permissions -p /test testadmin \".*\" \".*\" \".*\"");
+        Host.rabbitmqctl("add_user test test");
+        Host.rabbitmqctl("add_user testadmin test");
+        Host.rabbitmqctl("add_vhost /test");
+        Host.rabbitmqctl("set_permissions -p /test test configure write read");
+        Host.rabbitmqctl("set_permissions -p /test testadmin \".*\" \".*\" \".*\"");
     }
 
     protected void deleteRestrictedAccount()
         throws IOException
     {
-        runCtl("clear_permissions -p /test testadmin");
-        runCtl("clear_permissions -p /test test");
-        runCtl("delete_vhost /test");
-        runCtl("delete_user testadmin");
-        runCtl("delete_user test");
-    }
-
-    protected void runCtl(String command)
-        throws IOException
-    {
-        Host.executeCommand("../rabbitmq-server/scripts/rabbitmqctl " +
-                            command);
+        Host.rabbitmqctl("clear_permissions -p /test testadmin");
+        Host.rabbitmqctl("clear_permissions -p /test test");
+        Host.rabbitmqctl("delete_vhost /test");
+        Host.rabbitmqctl("delete_user testadmin");
+        Host.rabbitmqctl("delete_user test");
     }
 
     protected void createResources()
@@ -241,7 +234,7 @@ public void testAltExchConfiguration()
     public void testNoAccess()
         throws IOException, InterruptedException
     {
-        runCtl("set_permissions -p /test test \"\" \"\" \"\"");
+        Host.rabbitmqctl("set_permissions -p /test test \"\" \"\" \"\"");
         Thread.sleep(2000);
 
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {

test/src/com/rabbitmq/tools/Host.java

@@ -68,4 +68,8 @@ public static void executeCommand(String command)
                                   "\nstderr:\n" + stderr + "\n");
         }
     }
+
+    public static void rabbitmqctl(String command) throws IOException {
+        executeCommand("../rabbitmq-server/scripts/rabbitmqctl " + command);
+    }
 }