synchronized with trunk except for ruby dir

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

3 files changed, 222 insertions, 1 deletions

diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
new file mode 100644
index 0000000000..b4f6aea57b
--- /dev/null
+++ b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApiVersionTest.java
@@ -0,0 +1,177 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.management.ui;
+
+import junit.framework.TestCase;
+
+public class ApiVersionTest extends TestCase
+{
+
+    public void testGetMajor()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+        assertEquals(1, ver.getMajor());
+    }
+
+    public void testGetMinor()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+        assertEquals(3, ver.getMinor());
+    }
+
+    public void testGreaterThanOrEqualTo()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+        
+        //equal
+        assertTrue(ver.greaterThanOrEqualTo(1, 3));
+        //same major, higher minor
+        assertFalse(ver.greaterThanOrEqualTo(1, 4));
+        //same major, lower minor
+        assertTrue(ver.greaterThanOrEqualTo(1, 2));
+        
+        //higher major, lower minor
+        assertFalse(ver.greaterThanOrEqualTo(2, 0));
+        //higher major, same minor
+        assertFalse(ver.greaterThanOrEqualTo(2, 3));
+        //higher major, higher minor
+        assertFalse(ver.greaterThanOrEqualTo(2, 4));
+        
+        //lower major, higher minor
+        assertTrue(ver.greaterThanOrEqualTo(0, 9));
+        //lower major, lower minor
+        assertTrue(ver.greaterThanOrEqualTo(0, 2));
+        //lower major, same minor
+        assertTrue(ver.greaterThanOrEqualTo(0, 3));
+    }
+
+    public void testLessThanOrEqualTo()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+        
+        //equal
+        assertTrue(ver.lessThanOrEqualTo(1, 3));
+        //same major, higher minor
+        assertTrue(ver.lessThanOrEqualTo(1, 4));
+        //same major, lower minor
+        assertFalse(ver.lessThanOrEqualTo(1, 2));
+        
+        //higher major, lower minor
+        assertTrue(ver.lessThanOrEqualTo(2, 0));
+        //higher major, same minor
+        assertTrue(ver.lessThanOrEqualTo(2, 3));
+        //higher major, higher minor
+        assertTrue(ver.lessThanOrEqualTo(2, 4));
+        
+        //lower major, higher minor
+        assertFalse(ver.lessThanOrEqualTo(0, 9));
+        //lower major, lower minor
+        assertFalse(ver.lessThanOrEqualTo(0, 2));
+        //lower major, same minor
+        assertFalse(ver.lessThanOrEqualTo(0, 3));
+    }
+
+    public void testGreaterThan()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+        
+        //equal
+        assertFalse(ver.greaterThan(1, 3));
+        //same major, higher minor
+        assertFalse(ver.greaterThan(1, 4));
+        //same major, lower minor
+        assertTrue(ver.greaterThan(1, 2));
+        
+        //higher major, lower minor
+        assertFalse(ver.greaterThan(2, 0));
+        //higher major, same minor
+        assertFalse(ver.greaterThan(2, 3));
+        //higher major, higher minor
+        assertFalse(ver.greaterThan(2, 4));
+        
+        //lower major, higher minor
+        assertTrue(ver.greaterThan(0, 9));
+        //lower major, lower minor
+        assertTrue(ver.greaterThan(0, 2));
+        //lower major, same minor
+        assertTrue(ver.greaterThan(0, 3));
+    }
+
+    public void testLessThan()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+        
+        //equal
+        assertFalse(ver.lessThan(1, 3));
+        //same major, higher minor
+        assertTrue(ver.lessThan(1, 4));
+        //same major, lower minor
+        assertFalse(ver.lessThan(1, 2));
+        
+        //higher major, lower minor
+        assertTrue(ver.lessThan(2, 0));
+        //higher major, same minor
+        assertTrue(ver.lessThan(2, 3));
+        //higher major, higher minor
+        assertTrue(ver.lessThan(2, 4));
+        
+        //lower major, higher minor
+        assertFalse(ver.lessThan(0, 9));
+        //lower major, lower minor
+        assertFalse(ver.lessThan(0, 2));
+        //lower major, same minor
+        assertFalse(ver.lessThan(0, 3));
+    }
+
+    public void testEqualsIntInt()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+        
+        //equal
+        assertTrue(ver.equals(1, 3));
+        //same major, higher minor
+        assertFalse(ver.equals(1, 4));
+        //same major, lower minor
+        assertFalse(ver.equals(1, 2));
+        
+        //higher major, lower minor
+        assertFalse(ver.equals(2, 0));
+        //higher major, same minor
+        assertFalse(ver.equals(2, 3));
+        //higher major, higher minor
+        assertFalse(ver.equals(2, 4));
+        
+        //lower major, higher minor
+        assertFalse(ver.equals(0, 9));
+        //lower major, lower minor
+        assertFalse(ver.equals(0, 2));
+        //lower major, same minor
+        assertFalse(ver.equals(0, 3));
+    }
+
+    public void testToString()
+    {
+        ApiVersion ver = new ApiVersion(1,3);
+
+        assertEquals("major=1,minor=3", ver.toString());
+    }
+
+}
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
new file mode 100644
index 0000000000..1a56ab69b6
--- /dev/null
+++ b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ApplicationRegistryTest.java
@@ -0,0 +1,43 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.management.ui;
+
+import org.apache.qpid.management.common.mbeans.ServerInformation;
+
+import junit.framework.TestCase;
+
+public class ApplicationRegistryTest extends TestCase
+{
+    public void testSupportedManagementApiVersion()
+    {
+        //ensure that the console supported API version is kept in sync with the broker
+        
+        assertEquals("The management console does not support the same major version of management API as the broker. " +
+                    "Make any required changes and update the supported value.",
+        	     ServerInformation.QPID_JMX_API_MAJOR_VERSION,
+                     ApplicationRegistry.SUPPORTED_QPID_JMX_API_MAJOR_VERSION);
+        
+        assertEquals("The management console does not support the same minor version of management API as the broker. " +
+                    "Make any required changes and update the supported value.",
+                    ServerInformation.QPID_JMX_API_MINOR_VERSION,
+                    ApplicationRegistry.SUPPORTED_QPID_JMX_API_MINOR_VERSION);
+    }
+}
diff --git a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
index 11ab6af064..5469bfad5f 100644
--- a/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
+++ b/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
@@ -58,7 +58,8 @@ public class ManagementConsoleTest extends TestCase
     @Override
     protected void tearDown() throws Exception
     {
-        ApplicationRegistry.removeAll();
+        // Correctly Close the AR that we created above
+        ApplicationRegistry.remove();
     }
 
     /**