1 files changed, 17 insertions, 11 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
index 63423cbaa7..131f316330 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
@@ -20,16 +20,11 @@
  */
 package org.apache.qpid.server;
 
-import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
-import static org.apache.qpid.server.configuration.ServerConfiguration.DEFAULT_PORT;
-import static org.apache.qpid.server.configuration.ServerConfiguration.DEFAULT_JMXPORT;
-
-import java.util.Collections;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-
 import org.apache.qpid.test.utils.QpidTestCase;
 
 
@@ -126,15 +121,26 @@ public class BrokerOptionsTest extends QpidTestCase
         assertEquals(testLogConfigFile, _options.getLogConfigFile());
     }
 
-    public void testDefaultJmxPort()
+    public void testDefaultJmxPortRegistryServer()
+    {
+        assertNull(_options.getJmxPortRegistryServer());
+    }
+
+    public void testJmxPortRegistryServer()
+    {
+        _options.setJmxPortRegistryServer(TEST_PORT1);
+        assertEquals(Integer.valueOf(TEST_PORT1), _options.getJmxPortRegistryServer());
+    }
+
+    public void testDefaultJmxPortConnectorServer()
     {
-        assertNull(_options.getJmxPort());
+        assertNull(_options.getJmxPortConnectorServer());
     }
 
-    public void testJmxPort()
+    public void testJmxPortConnectorServer()
     {
-        _options.setJmxPort(TEST_PORT1);
-        assertEquals(Integer.valueOf(TEST_PORT1), _options.getJmxPort());
+        _options.setJmxPortConnectorServer(TEST_PORT1);
+        assertEquals(Integer.valueOf(TEST_PORT1), _options.getJmxPortConnectorServer());
     }
 
     public void testQpidHomeExposesSysProperty()