QPID-188

Unit tests added

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

2 files changed, 91 insertions, 12 deletions

diff --git a/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java b/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
new file mode 100644
index 0000000000..12a13d9aee
--- /dev/null
+++ b/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
@@ -0,0 +1,78 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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.server;
+
+import junit.framework.TestCase;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.management.ManagedBroker;
+import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
+
+public class AMQBrokerManagerMBeanTest extends TestCase
+{
+    private QueueRegistry _queueRegistry;
+    private ExchangeRegistry _exchangeRegistry;
+
+    public void testExchangeOperations() throws Exception
+    {
+        assertTrue(_exchangeRegistry.getExchange("testExchange1") == null);
+        assertTrue(_exchangeRegistry.getExchange("testExchange2") == null);
+        assertTrue(_exchangeRegistry.getExchange("testExchange3") == null);
+
+        ManagedBroker mbean = new AMQBrokerManagerMBean();
+        mbean.createNewExchange("testExchange1","direct",false, false);
+        mbean.createNewExchange("testExchange2","topic",false, false);
+        mbean.createNewExchange("testExchange3","headers",false, false);
+
+        assertTrue(_exchangeRegistry.getExchange("testExchange1") != null);
+        assertTrue(_exchangeRegistry.getExchange("testExchange2") != null);
+        assertTrue(_exchangeRegistry.getExchange("testExchange3") != null);
+
+        mbean.unregisterExchange("testExchange1");
+        mbean.unregisterExchange("testExchange2");
+        mbean.unregisterExchange("testExchange3");
+
+        assertTrue(_exchangeRegistry.getExchange("testExchange1") == null);
+        assertTrue(_exchangeRegistry.getExchange("testExchange2") == null);
+        assertTrue(_exchangeRegistry.getExchange("testExchange3") == null);
+    }
+
+    public void testQueueOperations() throws Exception
+    {
+        String queueName = "testQueue";
+        ManagedBroker mbean = new AMQBrokerManagerMBean();
+
+        assertTrue(_queueRegistry.getQueue(queueName) == null);
+                
+        mbean.createNewQueue(queueName, false, "test", true);
+        assertTrue(_queueRegistry.getQueue(queueName) != null);
+
+        mbean.deleteQueue(queueName);
+        assertTrue(_queueRegistry.getQueue(queueName) == null);
+    }
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        IApplicationRegistry appRegistry = ApplicationRegistry.getInstance();
+        _queueRegistry    = appRegistry.getQueueRegistry();
+        _exchangeRegistry = appRegistry.getExchangeRegistry();
+    }
+}
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
index 40cb4ab234..bb88d2e8d0 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
@@ -21,6 +21,11 @@ import junit.framework.TestCase;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.QueueRegistry;
 import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.management.ManagedObject;
+
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.TabularData;
+import java.util.ArrayList;
 
 /**
  * Unit test class for testing different Exchange MBean operations
@@ -34,7 +39,7 @@ public class ExchangeMBeanTest  extends TestCase
      * Test for direct exchange mbean
      * @throws Exception
      */
-	 /*
+
     public void testDirectExchangeMBean() throws Exception
     {
         DestNameExchange exchange = new DestNameExchange();
@@ -47,7 +52,7 @@ public class ExchangeMBeanTest  extends TestCase
 
         TabularData data = mbean.bindings();
         ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values());
-        assertTrue(list.length() == 2);
+        assertTrue(list.size() == 2);
 
         // test general exchange properties
         assertEquals(mbean.getName(), "amq.direct");
@@ -56,12 +61,12 @@ public class ExchangeMBeanTest  extends TestCase
         assertTrue(!mbean.isDurable());
         assertTrue(mbean.isAutoDelete());
     }
-*/
+
     /**
      * Test for "topic" exchange mbean
      * @throws Exception
      */
-	 /*
+
     public void testTopicExchangeMBean() throws Exception
     {
         DestWildExchange exchange = new DestWildExchange();
@@ -74,7 +79,7 @@ public class ExchangeMBeanTest  extends TestCase
 
         TabularData data = mbean.bindings();
         ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values());
-        assertTrue(list.length() == 2);
+        assertTrue(list.size() == 2);
 
         // test general exchange properties
         assertEquals(mbean.getName(), "amq.topic");
@@ -83,12 +88,12 @@ public class ExchangeMBeanTest  extends TestCase
         assertTrue(!mbean.isDurable());
         assertTrue(mbean.isAutoDelete());
     }
-*/
+
     /**
      * Test for "Headers" exchange mbean
      * @throws Exception
      */
-	 /*
+
     public void testHeadersExchangeMBean() throws Exception
     {
         HeadersExchange exchange = new HeadersExchange();
@@ -101,7 +106,7 @@ public class ExchangeMBeanTest  extends TestCase
 
         TabularData data = mbean.bindings();
         ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values());
-        assertTrue(list.length() == 2);
+        assertTrue(list.size() == 2);
 
         // test general exchange properties
         assertEquals(mbean.getName(), "amq.headers");
@@ -110,10 +115,6 @@ public class ExchangeMBeanTest  extends TestCase
         assertTrue(!mbean.isDurable());
         assertTrue(mbean.isAutoDelete());
     }
-*/
-public void testTest() throws Exception
-{
-}
 
     @Override
     protected void setUp() throws Exception