Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java?rev=709374&r1=709373&r2=709374&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidMethodBuilderTest.java Fri Oct 31 03:04:12 2008 @@ -56,19 +56,19 @@ Map<String,Object> arg1 = new HashMap<String,Object>(); arg1.put(name.name(), "arg1"); - arg1.put(type.name(),_type); + arg1.put(type.name(),1); arg1.put(dir.name(),Direction.I.name()); arg1.put(unit.name(), "bytes"); Map<String,Object> arg2 = new HashMap<String,Object>(); arg2.put(name.name(), "arg2"); - arg2.put(type.name(),_type); + arg2.put(type.name(),1); arg2.put(dir.name(),Direction.O.name()); arg2.put(unit.name(), "bytes"); Map<String,Object> arg3 = new HashMap<String,Object>(); arg3.put(name.name(), "arg3"); - arg3.put(type.name(),_type); + arg3.put(type.name(),1); arg3.put(dir.name(),Direction.IO.name()); arg3.put(unit.name(), "bytes"); @@ -144,4 +144,4 @@ assertEquals(method.getDescription(),info.getDescription()); assertEquals(method.getName(),info.getName()); } -} \ No newline at end of file +}
Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java?rev=709374&r1=709373&r2=709374&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidNumberPropertyTest.java Fri Oct 31 03:04:12 2008 @@ -22,8 +22,8 @@ import junit.framework.TestCase; -import org.apache.qpid.management.configuration.StubConfigurator; -import org.apache.qpid.management.domain.model.type.Uint64; +import org.apache.qpid.management.configuration.Configurator; +import org.apache.qpid.management.domain.model.type.Uint8; public class QpidNumberPropertyTest extends TestCase { @@ -33,12 +33,12 @@ @Override protected void setUp () throws Exception { - StubConfigurator configurator = new StubConfigurator(); - configurator.addTypeMapping("1", Uint64.class.getName(),QpidProperty.NumberValidator.class.getName()); + Configurator configurator = new Configurator(); + configurator.configure(); _property = new QpidProperty(); _property.setName("average"); _property.setAccessMode(AccessMode.RW); - _property.setType(new Uint64()); + _property.setType(new Uint8()); } /** @@ -168,4 +168,4 @@ assertEquals(_property.getName(),expected.getFeatureName()); } } -} \ No newline at end of file +} Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java?rev=709374&r1=709373&r2=709374&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidPropertyBuilderTest.java Fri Oct 31 03:04:12 2008 @@ -52,14 +52,12 @@ super.setUp(); _access = 1; - configurator.addAccessModeMapping(_access.toString(), AccessMode.RW.name()); - _featureDefinition.put(access.name(), _access); _featureDefinition.put(unit.name(),UNIT); _featureDefinition.put(min.name(), MIN); _featureDefinition.put(max.name(),MAX); - _featureDefinition.put(type.name(), _type); + _featureDefinition.put(type.name(), 1); _featureDefinition.put(optional.name(),0); _featureDefinition.put(index.name(), 0); @@ -255,17 +253,17 @@ MBeanAttributeInfo info = (MBeanAttributeInfo) _builder.getManagementFeature(); assertEquals(NAME,property.getName()); - assertEquals(AccessMode.RW,property.getAccessMode()); + assertEquals(AccessMode.RC,property.getAccessMode()); assertEquals(UNIT,property.getUnit()); assertEquals(MIN.intValue(),property.getMinValue()); assertEquals(MAX.intValue(),property.getMaxValue()); assertEquals(Integer.MIN_VALUE,property.getMaxLength()); assertEquals(DESCRIPTION,property.getDescription()); - assertEquals(Integer.class,property.getJavaType()); + assertEquals(Short.class,property.getJavaType()); assertFalse(property.isOptional()); assertEquals(property.getDescription(),info.getDescription()); assertEquals(property.getName(),info.getName()); assertEquals(property.getJavaType().getName(),info.getType()); } -} \ No newline at end of file +} Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java?rev=709374&r1=709373&r2=709374&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStatisticBuilderTest.java Fri Oct 31 03:04:12 2008 @@ -42,7 +42,7 @@ { super.setUp(); _featureDefinition.put(unit.name(),UNIT); - _featureDefinition.put(type.name(), _type); + _featureDefinition.put(type.name(), 1); _builder = QpidFeatureBuilder.createStatisticBuilder(_featureDefinition); } @@ -150,10 +150,10 @@ assertEquals(NAME,statistic.getName()); assertEquals(UNIT,statistic.getUnit()); assertEquals(DESCRIPTION,statistic.getDescription()); - assertEquals(Integer.class,statistic.getJavaType()); + assertEquals(Short.class,statistic.getJavaType()); assertEquals(statistic.getDescription(),info.getDescription()); assertEquals(statistic.getName(),info.getName()); assertEquals(statistic.getJavaType().getName(),info.getType()); } -} \ No newline at end of file +} Modified: incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java?rev=709374&r1=709373&r2=709374&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java (original) +++ incubator/qpid/trunk/qpid/java/management/client/src/test/java/org/apache/qpid/management/domain/model/QpidStringPropertyTest.java Fri Oct 31 03:04:12 2008 @@ -22,7 +22,7 @@ import junit.framework.TestCase; -import org.apache.qpid.management.configuration.StubConfigurator; +import org.apache.qpid.management.configuration.Configurator; import org.apache.qpid.management.domain.model.type.Str16; public class QpidStringPropertyTest extends TestCase @@ -33,8 +33,8 @@ @Override protected void setUp () throws Exception { - StubConfigurator configurator = new StubConfigurator(); - configurator.addTypeMapping("1", Str16.class.getName(),QpidProperty.StringValidator.class.getName()); + Configurator configurator = new Configurator(); + configurator.configure(); _property = new QpidProperty(); _property.setName("name"); _property.setAccessMode(AccessMode.RW);
