QPID-1522: Move common code up to CommandImpl. Rename methods to be consistent. Remove commented out code.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@732307 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 20 insertions, 20 deletions

diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
index 2c92b8d66d..833ad0478e 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommand.java
@@ -44,6 +44,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.After;
 import org.junit.Assert;
+import org.apache.qpid.Command;
 import org.apache.qpid.Connector;
 import org.apache.qpid.ConnectorFactory;
 import org.apache.qpid.ConnectionConstants;
@@ -74,7 +75,7 @@ public class TestCommand{
         parser = new CommandLineOptionParser(list);
         test = ConnectorFactory.getConnector(ConnectionConstants.BROKER_HOSTNAME,ConnectionConstants.BROKER_PORT);
         info = new JMXinfo(test.getConnector(),parser,test.getMBeanServerConnection());
-        cmd = new Command(info,"list");
+        cmd = new Commandinfo(info,"list");
 
     }
     @Test
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
index 5bdca118d5..971c088fe1 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommanddelete.java
@@ -79,9 +79,9 @@ public class TestCommanddelete {
     public void TestSetQueryString()
     {
          delete.execute();
-        Assert.assertEquals(delete.getobject(),"queue");
-        Assert.assertEquals(delete.getvhost(),"test");
-        Assert.assertEquals(delete.getname(),"ping");
+        Assert.assertEquals(delete.getObject(),"queue");
+        Assert.assertEquals(delete.getVirtualhost(),"test");
+        Assert.assertEquals(delete.getName(),"ping");
         Assert.assertEquals(delete.getnumber(),1);
 
     }
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
index f4bb403e18..5f0e8959a5 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandinfo.java
@@ -60,7 +60,7 @@ import javax.management.MBeanServerConnection;
 public class TestCommandinfo {
       JMXinfo info=null;
     String command = "info -o queue -n ping -v test";
-    Commandinfo infocommand = null;
+    CommandImpl infocommand = null;
     Connector conn = null;
     @Before
     public void startup()
@@ -77,9 +77,9 @@ public class TestCommandinfo {
     public void TestSetQueryString()
     {
         infocommand.execute();
-        Assert.assertEquals(infocommand.getobject(),"queue");
-        Assert.assertEquals(infocommand.getvirtualhost(),"test");
-        Assert.assertEquals(infocommand.getname(),"ping");
+        Assert.assertEquals(infocommand.getObject(),"queue");
+        Assert.assertEquals(infocommand.getVirtualhost(),"test");
+        Assert.assertEquals(infocommand.getName(),"ping");
     }
 
     @After
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
index c8e044d6fe..0af6f236f6 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandlist.java
@@ -81,9 +81,9 @@ public class TestCommandlist {
     public void TestSetQueryString()
     {
         list.execute();
-        Assert.assertEquals(list.getobject(),"queue");
-        Assert.assertEquals(list.getvhost(),"test");
-        Assert.assertEquals(list.getname(),"ping");
+        Assert.assertEquals(list.getObject(),"queue");
+        Assert.assertEquals(list.getVirtualhost(),"test");
+        Assert.assertEquals(list.getName(),"ping");
     }
 
     @After
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
index 278fa72365..3a5d55c8dd 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandmove.java
@@ -79,8 +79,8 @@ public class TestCommandmove {
     public void TestSetQueryString()
     {
         move.execute();
-        Assert.assertEquals(move.getobject(),"queue");
-        Assert.assertEquals(move.getvhost(),"test");
+        Assert.assertEquals(move.getObject(),"queue");
+        Assert.assertEquals(move.getVirtualhost(),"test");
         Assert.assertEquals(move.getname1(),"ping");
         Assert.assertEquals(move.getname2(),"message_queue");
         Assert.assertEquals(move.getfmid(),10);
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
index 385d197475..6867cf0d01 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandview.java
@@ -76,9 +76,9 @@ public class TestCommandview {
     public void TestSetQueryString()
     {
         view.execute();
-        Assert.assertEquals(view.getobject(),"queue");
-        Assert.assertEquals(view.getvhost(),"test");
-        Assert.assertEquals(view.getname(),"ping");
+        Assert.assertEquals(view.getObject(),"queue");
+        Assert.assertEquals(view.getVirtualhost(),"test");
+        Assert.assertEquals(view.getName(),"ping");
         Assert.assertEquals(view.getnumber(),10);
 
     }
diff --git a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
index 2b8f0e3ffd..5ea6273561 100644
--- a/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
+++ b/java/management/tools/qpid-cli/test/org/apache/qpid/commands/TestCommandviewcontent.java
@@ -79,11 +79,10 @@ public class TestCommandviewcontent {
     public void TestSetQueryString()
     {
         viewcontent.execute();
-        Assert.assertEquals(viewcontent.getobject(),"queue");
+        Assert.assertEquals(viewcontent.getObject(),"queue");
         Assert.assertEquals(viewcontent.getnumber(),10);
-        Assert.assertEquals(viewcontent.getname(),"ping");
-        Assert.assertEquals(viewcontent.getvhost(),"test");
-
+        Assert.assertEquals(viewcontent.getName(),"ping");
+        Assert.assertEquals(viewcontent.getVirtualhost(),"test");
     }
 
     @After