QPID-1574 : QMan WS-DM Adapter

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

5 files changed, 27 insertions, 40 deletions

diff --git a/java/management/client/src/test/java/org/apache/qpid/management/TestConstants.java b/java/management/client/src/test/java/org/apache/qpid/management/TestConstants.java
index 5855a3e60b..56195b6f20 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/TestConstants.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/TestConstants.java
@@ -29,6 +29,9 @@ import org.apache.qpid.management.domain.handler.impl.MethodOrEventDataTransferO
 import org.apache.qpid.management.domain.model.DomainModel;
 import org.apache.qpid.management.domain.model.type.Binary;
 
+/**
+ * Collects all literal constants used in test cases.
+ */
 public interface TestConstants
 {
     UUID BROKER_ID = UUID.randomUUID();
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
index efd5990bd7..8e9c3ccd6b 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfigurationTest.java
@@ -36,8 +36,6 @@ import junit.framework.TestCase;
 
 /**
  * Test case for Configuration singleton.
- * 
- * @author Andrea Gazzarini
  */
 public class ConfigurationTest extends TestCase
 {
@@ -74,11 +72,11 @@ public class ConfigurationTest extends TestCase
     {
         try
         {
-            Configuration.getInstance().getType(Integer.MIN_VALUE);
+            Configuration.getInstance().getType(TestConstants.VALID_CODE*10001);
             fail("If an unknwon code is supplied an exception must be thrown.");
         } catch (UnknownTypeCodeException expected)
         {
-            assertEquals(Integer.MIN_VALUE,expected.getCode());
+            assertEquals(TestConstants.VALID_CODE*10001,expected.getCode());
         }        
     }
     
@@ -107,11 +105,11 @@ public class ConfigurationTest extends TestCase
     {
         try
         {
-            Configuration.getInstance().getAccessMode(Integer.MIN_VALUE);
+            Configuration.getInstance().getAccessMode(TestConstants.VALID_CODE*1528);
             fail("If an unknwon code is supplied an exception must be thrown.");
         } catch (UnknownAccessCodeException expected)
         {
-            assertEquals(Integer.MIN_VALUE,expected.getCode());
+            assertEquals(TestConstants.VALID_CODE*1528,expected.getCode());
         }        
     }    
     
@@ -178,29 +176,21 @@ public class ConfigurationTest extends TestCase
      * <br>postcondition : 2 management handlers are returned.
      */
     public void testGetManagementQueueHandlersOk() 
-    {
-        String i = "i";
-        String c = "c";
-        
-        String instrMessageHandlerClassName = InstrumentationMessageHandler.class.getName();
-        String configMessageHandlerClassName = ConfigurationMessageHandler.class.getName();
-        
-        MessageHandlerMapping instrMapping = new MessageHandlerMapping();
-        MessageHandlerMapping configMapping = new MessageHandlerMapping();
-        
-        instrMapping.setOpcode(i);
-        instrMapping.setMessageHandlerClass(instrMessageHandlerClassName);
-
-        configMapping.setOpcode(c);
-        configMapping.setMessageHandlerClass(configMessageHandlerClassName);
+    {        
+        IMessageHandler instrMessageHandler = new InstrumentationMessageHandler();
+        IMessageHandler configMessageHandler = new ConfigurationMessageHandler();
         
+        MessageHandlerMapping instrMapping = new MessageHandlerMapping('i',instrMessageHandler);
+        MessageHandlerMapping configMapping = new MessageHandlerMapping('c',configMessageHandler);
+                
         Configuration.getInstance().addManagementMessageHandlerMapping(instrMapping);
         Configuration.getInstance().addManagementMessageHandlerMapping(configMapping);
         
         Map<Character, IMessageHandler> handlerMappings = Configuration.getInstance().getManagementQueueHandlers();
         
-        assertEquals(instrMessageHandlerClassName,handlerMappings.get(instrMapping.getOpcode()).getClass().getName());
-        assertEquals(configMessageHandlerClassName,handlerMappings.get(configMapping.getOpcode()).getClass().getName());        
+        assertEquals(2,handlerMappings.size());
+        assertEquals(instrMessageHandler,handlerMappings.get(instrMapping.getOpcode()));
+        assertEquals(configMessageHandler,handlerMappings.get(configMapping.getOpcode()));        
     }
     
     /**
@@ -211,19 +201,14 @@ public class ConfigurationTest extends TestCase
      */
     public void testGetMethodReplyQueueHandlersOk() 
     {
-        String s = "s";
-        
-        String schemaMessageHandlerClassName = SchemaResponseMessageHandler.class.getName();
+        IMessageHandler schemaMessageHandler = new SchemaResponseMessageHandler();
         
-        MessageHandlerMapping schemaMapping = new MessageHandlerMapping();
+        MessageHandlerMapping schemaMapping = new MessageHandlerMapping('s',schemaMessageHandler);
         
-        schemaMapping.setOpcode(s);
-        schemaMapping.setMessageHandlerClass(schemaMessageHandlerClassName);
-
         Configuration.getInstance().addMethodReplyMessageHandlerMapping(schemaMapping);
         
         Map<Character, IMessageHandler> handlerMappings = Configuration.getInstance().getMethodReplyQueueHandlers();
         
-        assertEquals(schemaMessageHandlerClassName,handlerMappings.get(schemaMapping.getOpcode()).getClass().getName());
+        assertEquals(schemaMessageHandler,handlerMappings.get(schemaMapping.getOpcode()));
     }    
 }
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java
index 6237f21cc9..1e464bf6ae 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/ConfiguratorTest.java
@@ -25,7 +25,6 @@ import java.util.UUID;
 
 import junit.framework.TestCase;
 
-import org.apache.qpid.management.Names;
 import org.apache.qpid.management.Protocol;
 import org.apache.qpid.management.domain.handler.base.IMessageHandler;
 import org.apache.qpid.management.domain.handler.impl.ConfigurationMessageHandler;
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidClassTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidClassTest.java
index 284f3841b8..9d6e176912 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidClassTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidClassTest.java
@@ -37,7 +37,7 @@ import org.apache.qpid.management.TestConstants;
 import org.apache.qpid.management.configuration.ConfigurationException;
 import org.apache.qpid.management.configuration.Configurator;
 import org.apache.qpid.management.domain.handler.impl.MethodOrEventDataTransferObject;
-import org.apache.qpid.management.domain.model.QpidClass.QpidManagedObject;
+import org.apache.qpid.management.domain.model.QpidClass.QManManagedObject;
 
 /**
  * Test case for Qpid Class.
@@ -71,7 +71,7 @@ public class QpidClassTest extends TestCase
                 "Nobody set instance #"+TestConstants.OBJECT_ID+" into this class so why is it there?", 
         		_class._objectInstances.containsKey(TestConstants.OBJECT_ID));
 
-        QpidManagedObject instance = _class.getObjectInstance(TestConstants.OBJECT_ID, false);
+        QManManagedObject instance = _class.getObjectInstance(TestConstants.OBJECT_ID, false);
         
         assertTrue (
                 "Now the instance #"+TestConstants.OBJECT_ID+" should be there...",
@@ -90,7 +90,7 @@ public class QpidClassTest extends TestCase
     public void testAddInstrumentationAndConfigurationDataBeforeSchemaInstallation() 
     {
         _class._state = _class._schemaRequestedButNotYetInjected;
-        QpidManagedObject objectInstance = _class.getObjectInstance(TestConstants.OBJECT_ID,false);
+        QManManagedObject objectInstance = _class.getObjectInstance(TestConstants.OBJECT_ID,false);
         
         assertTrue(
                 "This object instance is a new one so how is it possible that it has already instrumentation data? ",
@@ -180,7 +180,7 @@ public class QpidClassTest extends TestCase
     		}
     		
     		 @Override
-    		void updateInstanceWithConfigurationData(QpidManagedObject instance, byte[] rawData) 
+    		void updateInstanceWithConfigurationData(QManManagedObject instance, byte[] rawData) 
     		{
     			// DO NOTHING Given raw data is not valid so it cannot be converted.
 			}    		
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidEventTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidEventTest.java
index 954a419787..4b36d9e5cc 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidEventTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidEventTest.java
@@ -36,7 +36,7 @@ import junit.framework.TestCase;
 import org.apache.qpid.management.TestConstants;

 import org.apache.qpid.management.configuration.ConfigurationException;

 import org.apache.qpid.management.configuration.Configurator;

-import org.apache.qpid.management.domain.model.QpidEvent.QpidManagedEvent;

+import org.apache.qpid.management.domain.model.QpidEvent.QManManagedEvent;

 

 /**

  * Test case for qpid class entity.

@@ -68,7 +68,7 @@ public class QpidEventTest extends TestCase
                 "A just created event should be empty. I mean there shouldn't be event instances inside.", 

         		_event.hasNoInstances());

 

-        QpidManagedEvent instance = createEventInstance();

+        QManManagedEvent instance = createEventInstance();

         

         assertFalse (

                 "Now a new instance should be there...",

@@ -136,7 +136,7 @@ public class QpidEventTest extends TestCase
     		}

     		

     		@Override

-    		void updateEventInstanceWithData(QpidManagedEvent instance) 

+    		void updateEventInstanceWithData(QManManagedEvent instance) 

     		{

     			// DO NOTHING : otherwise we should supply a valid raw data to be converted. ;-)

     		}

@@ -269,7 +269,7 @@ public class QpidEventTest extends TestCase
      * 

      * @return a new QpidManagedEvent with test data inside.

      */

-    private QpidManagedEvent createEventInstance()

+    private QManManagedEvent createEventInstance()

     {

     	return  _event.createEventInstance(

         		TestConstants.TEST_RAW_DATA,