qpid-1284: on behalf Adnrea (latest posted patch)

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

9 files changed, 22 insertions, 165 deletions

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 c3fa0c13f3..639fe224ec 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
@@ -86,12 +86,6 @@ public class ConfiguratorTest extends TestCase
 
         configurator.startElement(null, null, Tag.BROKERS.toString(), null);
         assertSame(configurator._brokerConfigurationParser,configurator._currentParser);
-        
-        configurator.startElement(null, null, Tag.MANAGEMENT_QUEUE.toString(), null);
-        assertSame(configurator._managementQueueHandlerParser,configurator._currentParser);
-        
-        configurator.startElement(null, null, Tag.METHOD_REPLY_QUEUE.toString(), null);
-        assertSame(configurator._methodReplyQueueHandlerParser,configurator._currentParser);
     }    
     /**
      * Create a stub configurator which returns the given datafile path.
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java
index 9755c62991..4c8885dbc8 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/MappingParsersTest.java
@@ -20,16 +20,11 @@
  */
 package org.apache.qpid.management.configuration;
 
-import java.util.Map;
 import java.util.UUID;
 
 import junit.framework.TestCase;
 
 import org.apache.qpid.management.TestConstants;
-import org.apache.qpid.management.domain.handler.base.IMessageHandler;
-import org.apache.qpid.management.domain.handler.impl.ConfigurationMessageHandler;
-import org.apache.qpid.management.domain.handler.impl.InstrumentationMessageHandler;
-import org.apache.qpid.management.domain.handler.impl.SchemaResponseMessageHandler;
 import org.apache.qpid.management.domain.model.AccessMode;
 import org.apache.qpid.management.domain.model.type.Type;
 import org.apache.qpid.management.domain.model.type.Uint8;
@@ -103,73 +98,6 @@ public class MappingParsersTest extends TestCase
         assertEquals(username,result.getUsername());
         assertEquals(password,result.getPassword());
     }
-
-    /**
-     * Tests the execution of the management queue handler mapping parser.
-     * 
-     * <br>precondition: Two managenent queue handlers mapping are built by the parser;
-     * <br>postcondition: the corresponding management handlers are available on the configuration.
-     */
-    public void testManagementQueueMessageListenerParser() 
-    {
-        String instrOpcode = "i";
-        String configOpCode = "c";
-        
-        ManagementQueueMessageListenerParser parser = new ManagementQueueMessageListenerParser();
-        
-        parser.setCurrrentAttributeValue(instrOpcode);
-        parser.setCurrentAttributeName(Tag.OPCODE.toString());
-        parser.setCurrrentAttributeValue(InstrumentationMessageHandler.class.getName());
-        parser.setCurrentAttributeName(Tag.CLASS_NAME.toString());
-        parser.setCurrentAttributeName(Tag.HANDLER.toString());
-
-        parser.setCurrrentAttributeValue(configOpCode);
-        parser.setCurrentAttributeName(Tag.OPCODE.toString());
-        parser.setCurrrentAttributeValue(ConfigurationMessageHandler.class.getName());
-        parser.setCurrentAttributeName(Tag.CLASS_NAME.toString());
-        parser.setCurrentAttributeName(Tag.HANDLER.toString());
-
-        
-        Map<Character,IMessageHandler> result = Configuration.getInstance().getManagementQueueHandlers();
-        
-        assertEquals(2,result.size());
-        
-        assertEquals(InstrumentationMessageHandler.class,result.get(instrOpcode.charAt(0)).getClass());
-        assertEquals(ConfigurationMessageHandler.class,result.get(configOpCode.charAt(0)).getClass());  
-    }  
-    
-    /**
-     * Tests the execution of the method-reply queue handler mapping parser.
-     * 
-     * <br>precondition: two method-reply queue handler mappings are built by the parser;
-     * <br>postcondition: the corresponding method-reply handlers are available on the configuration.
-     */
-    public void testMethodReplyQueueMessageListenerParser() 
-    {
-        String schemaOpcode = "s";
-        String configOpCode = "c";
-        
-        MethodReplyQueueMessageListenerParser parser = new MethodReplyQueueMessageListenerParser();
-        
-        parser.setCurrrentAttributeValue(schemaOpcode);
-        parser.setCurrentAttributeName(Tag.OPCODE.toString());
-        parser.setCurrrentAttributeValue(SchemaResponseMessageHandler.class.getName());
-        parser.setCurrentAttributeName(Tag.CLASS_NAME.toString());
-        parser.setCurrentAttributeName(Tag.HANDLER.toString());
-
-        parser.setCurrrentAttributeValue(configOpCode);
-        parser.setCurrentAttributeName(Tag.OPCODE.toString());
-        parser.setCurrrentAttributeValue(ConfigurationMessageHandler.class.getName());
-        parser.setCurrentAttributeName(Tag.CLASS_NAME.toString());
-        parser.setCurrentAttributeName(Tag.HANDLER.toString());
-
-        Map<Character,IMessageHandler> result = Configuration.getInstance().getMethodReplyQueueHandlers();
-        
-        assertEquals(2,result.size());
-        
-        assertEquals(SchemaResponseMessageHandler.class,result.get(schemaOpcode.charAt(0)).getClass());
-        assertEquals(ConfigurationMessageHandler.class,result.get(configOpCode.charAt(0)).getClass());  
-    }
     
     /**
      * Tests the execution of the type mapping parser.
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java b/java/management/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java
index 6d92e3b6f8..426a1a29f1 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/configuration/StubConfigurator.java
@@ -46,6 +46,15 @@ public class StubConfigurator extends Configurator
         Configuration.getInstance().addTypeMapping(mapping);        
     }
     
+    public void addTypeMapping(String code,String clazzName,String validatorClassName)
+    {
+        TypeMapping mapping = new TypeMapping();
+        mapping.setCode(code);
+        mapping.setType(clazzName);
+        mapping.setValidatorClassName(validatorClassName);
+        Configuration.getInstance().addTypeMapping(mapping);        
+    }
+    
     public void addAccessModeMapping(String code, String value)
     {
         AccessModeMapping mapping = new AccessModeMapping();
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java
index 6be4484f5c..d6b51b64fc 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/handler/base/ContentIndicationMessageHandlerTest.java
@@ -20,14 +20,9 @@
  */
 package org.apache.qpid.management.domain.handler.base;
 
-import java.nio.ByteBuffer;
+import junit.framework.TestCase;
 
-import org.apache.qpid.management.TestConstants;
 import org.apache.qpid.management.domain.model.type.Binary;
-import org.apache.qpid.transport.codec.ManagementDecoder;
-import org.apache.qpid.transport.codec.ManagementEncoder;
-
-import junit.framework.TestCase;
 
 /**
  * Test case for Content indication message handler (base class).
@@ -37,62 +32,6 @@ import junit.framework.TestCase;
 public class ContentIndicationMessageHandlerTest extends TestCase
 {      
     /**
-     * Tests the execution of the process method when the message is processed correctly.
-     */
-    public void testProcessOk() {
-        final String expectedPackageName = "org.apache.qpid.broker";
-        final String expectedClassName ="connection";
-        final long expectedMessageTimestamp = System.currentTimeMillis();
-        final long expectedCreationTime = expectedMessageTimestamp - 1000;
-        final long expectedDeletionTime = 0;   
-        final Binary expectedClassHash = new Binary(new byte[]{9,9,9,9,8,8,8,8,7,7,7,7,6,6,6,6});
-        final Binary expectedObjectId = new Binary(new byte[]{1,2,3,4,5,6,7,8,9,0,11,12,13,14,15,16});
-        final Binary expectedBody = new Binary(new byte[]{1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4});
-        
-        ContentIndicationMessageHandler mockHandler = new ContentIndicationMessageHandler()
-        {
-            @Override
-            protected void updateDomainModel (String packageName, String className, Binary classHash, Binary objectId,
-                    long timeStampOfCurrentSample, long timeObjectWasCreated, long timeObjectWasDeleted, byte[] contentData)
-            {
-                assertEquals(expectedPackageName,packageName);
-                assertEquals(expectedClassName,className);
-                assertEquals(expectedClassHash,classHash);
-                assertEquals(expectedMessageTimestamp,timeStampOfCurrentSample);
-                assertEquals(expectedCreationTime,timeObjectWasCreated);
-                assertEquals(expectedDeletionTime,timeObjectWasDeleted);
-                assertEquals(expectedObjectId,objectId);                
-                assertEquals(expectedBody,new Binary(contentData));
-            }
-            
-            @Override
-            void removeObjectInstance (String packageName, String className, Binary classHash, Binary objectId)
-            {
-                fail("The object shouldn't be deleted because deletion time was set to 0!");
-            }
-        };
-        mockHandler.setDomainModel(TestConstants.DOMAIN_MODEL);
-        
-        ByteBuffer buffer = ByteBuffer.allocate(1000);
-        ManagementEncoder encoder = new ManagementEncoder(buffer);
-        
-        encoder.writeStr8(expectedPackageName);
-        encoder.writeStr8(expectedClassName);
-        expectedClassHash.encode(encoder);
-        encoder.writeDatetime(expectedMessageTimestamp);
-        encoder.writeDatetime(expectedCreationTime);
-        encoder.writeDatetime(expectedDeletionTime);
-        expectedObjectId.encode(encoder);
-        expectedBody.encode(encoder);
-        
-        buffer.flip();
-        ManagementDecoder decoder = new ManagementDecoder();
-        decoder.init(buffer);
-        
-        mockHandler.process(decoder, 1);
-    }
-    
-    /**
      * Tests the behaviour of the objectHasBeenRemoved method().
      */
     public void testObjectHasBeenRemoved() 
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java
index 185302c182..578fa36bc7 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/DomainModelTest.java
@@ -36,7 +36,6 @@ public class DomainModelTest extends BaseDomainModelTestCase
     @Override
     protected void setUp () throws Exception
     {
-        super.setUp();
         _model = new DomainModel(UUID.randomUUID());
     }
     
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java
index 6032721d1b..53320e5c28 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java
@@ -25,7 +25,6 @@ import static org.apache.qpid.management.domain.model.QpidFeatureBuilder.Attribu
 import static org.apache.qpid.management.domain.model.QpidFeatureBuilder.Attribute.type;
 import static org.apache.qpid.management.domain.model.QpidFeatureBuilder.Attribute.unit;
 
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -36,7 +35,6 @@ import javax.management.MBeanOperationInfo;
 import org.apache.qpid.management.Names;
 import org.apache.qpid.management.domain.handler.impl.MethodOrEventDataTransferObject;
 import org.apache.qpid.management.domain.model.QpidFeatureBuilder.Attribute;
-import org.apache.qpid.transport.codec.ManagementEncoder;
 
 /**
  * Test case for Qpid Statistic builder.
@@ -146,21 +144,4 @@ public class QpidMethodBuilderTest extends BaseQpidFeatureBuilderTestCase
         assertEquals(method.getDescription(),info.getDescription());
         assertEquals(method.getName(),info.getName());
     }
-    
-    public void testEncodeParameters() throws ValidationException, UnableToBuildFeatureException {
-        _builder.build();
-        
-        Object [] parameters = new Object[]{new Integer(1), new Integer(2),new Integer(3)};
-        
-        ManagementEncoder encoder = new ManagementEncoder(ByteBuffer.allocate(1)){
-            @Override
-            public void writeUint16 (int s)
-            {
-               assertTrue(s == 1 || s == 2);
-            }
-        };
-        
-        QpidMethod method = (QpidMethod) _builder.getQpidFeature();
-        method.encodeParameters(parameters, encoder);
-    }
 }
\ No newline at end of file
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java
index 2611923f71..55a9403bc8 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java
@@ -20,9 +20,12 @@
  */
 package org.apache.qpid.management.domain.model;
 
+import junit.framework.TestCase;
+
+import org.apache.qpid.management.configuration.StubConfigurator;
 import org.apache.qpid.management.domain.model.type.Uint64;
 
-public class QpidNumberPropertyTest extends BaseDomainModelTestCase
+public class QpidNumberPropertyTest extends TestCase
 {
     private QpidProperty _property;
     private Long _value = 55432L;
@@ -30,7 +33,8 @@ public class QpidNumberPropertyTest extends BaseDomainModelTestCase
     @Override
     protected void setUp () throws Exception
     {
-        super.setUp();
+        StubConfigurator configurator = new StubConfigurator();
+        configurator.addTypeMapping("1", Uint64.class.getName(),QpidProperty.NumberValidator.class.getName());
         _property = new QpidProperty();
         _property.setName("average");
         _property.setAccessMode(AccessMode.RW);
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java
index 530b526bec..b7eb9055ba 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPackageTest.java
@@ -34,7 +34,6 @@ public class QpidPackageTest extends BaseDomainModelTestCase
     @Override
     protected void setUp () throws Exception
     {
-        super.setUp();
         _qpidPackage = new QpidPackage(TestConstants.QPID_PACKAGE_NAME, TestConstants.DOMAIN_MODEL);
     }
     
diff --git a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java
index 263e4209a6..534a019503 100644
--- a/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java
+++ b/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java
@@ -20,9 +20,12 @@
  */
 package org.apache.qpid.management.domain.model;
 
+import junit.framework.TestCase;
+
+import org.apache.qpid.management.configuration.StubConfigurator;
 import org.apache.qpid.management.domain.model.type.Str16;
 
-public class QpidStringPropertyTest extends BaseDomainModelTestCase
+public class QpidStringPropertyTest extends TestCase
 {
     private QpidProperty _property;
     private final String _5LettersString = "12345";
@@ -30,7 +33,8 @@ public class QpidStringPropertyTest extends BaseDomainModelTestCase
     @Override
     protected void setUp () throws Exception
     {
-        super.setUp();
+        StubConfigurator configurator = new StubConfigurator();
+        configurator.addTypeMapping("1", Str16.class.getName(),QpidProperty.StringValidator.class.getName());
         _property = new QpidProperty();
         _property.setName("name");
         _property.setAccessMode(AccessMode.RW);