craigmcc 2003/01/27 11:22:45
Modified: modeler/src/java/org/apache/commons/modeler
ConstructorInfo.java
modeler/src/test/org/apache/commons/modeler
RegistryTestCase.java
Log:
Ensure that custom descriptor contents are propogated to each
ModelMBeanConstructorInfo instance that is created.
Revision Changes Path
1.4 +5 -4
jakarta-commons/modeler/src/java/org/apache/commons/modeler/ConstructorInfo.java
Index: ConstructorInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/java/org/apache/commons/modeler/ConstructorInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConstructorInfo.java 23 Jan 2003 19:42:04 -0000 1.3
+++ ConstructorInfo.java 27 Jan 2003 19:22:45 -0000 1.4
@@ -182,6 +182,7 @@
descriptor.removeField("class");
if (getDisplayName() != null)
descriptor.setField("displayName", getDisplayName());
+ addFields(descriptor);
info.setDescriptor(descriptor);
return (info);
1.3 +42 -5
jakarta-commons/modeler/src/test/org/apache/commons/modeler/RegistryTestCase.java
Index: RegistryTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/modeler/src/test/org/apache/commons/modeler/RegistryTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegistryTestCase.java 23 Jan 2003 19:42:08 -0000 1.2
+++ RegistryTestCase.java 27 Jan 2003 19:22:45 -0000 1.3
@@ -68,6 +68,8 @@
import java.util.List;
import java.util.Map;
import javax.management.Descriptor;
+import javax.management.MBeanConstructorInfo;
+import javax.management.modelmbean.ModelMBeanConstructorInfo;
import javax.management.modelmbean.ModelMBeanInfo;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -152,6 +154,41 @@
/**
+ * Test ModelMBeanConstructorInfo information.
+ */
+ public void testModelMBeanConstructorInfo() throws Exception {
+
+ // Retrieve a ManagedBean
+ ManagedBean http = registry.findManagedBean("HttpConnector");
+ assertNotNull("Found HttpConnector managed bean");
+
+ // Create the associated ModelMBeanInfo
+ ModelMBeanInfo info = http.createMBeanInfo();
+ assertNotNull("Found HttpConnector ModelMBeanInfo", info);
+
+ // Retrieve the relevant MBeanConstructorInfo array
+ MBeanConstructorInfo mcinfo[] = info.getConstructors();
+ assertNotNull("Found HttpConnector MBeanConstructorInfo array", mcinfo);
+ assertEquals("Found HttpConnector MBeanConstructorInfo entry",
+ 1, mcinfo.length);
+
+ // Cast first entry to ModelMBeanConstructorInfo
+ ModelMBeanConstructorInfo mmcinfo =
+ (ModelMBeanConstructorInfo) mcinfo[0];
+
+ // Get the Descriptor
+ Descriptor desc = mmcinfo.getDescriptor();
+ assertNotNull("Found HttpConnector constructor descriptor", desc);
+
+ // Check the configured fields
+ checkDescriptor(desc, "role", "constructor");
+ checkDescriptor(desc, "field1", "HttpConnector.constructor/field1");
+ checkDescriptor(desc, "field2", "HttpConnector.constructor/field2");
+
+ }
+
+
+ /**
* Test descriptor entries.
*/
public void testDescriptorEntries() {
@@ -242,7 +279,7 @@
*/
public void testModelMBeanInfo() throws Exception {
- // Retrive a ManageBean
+ // Retrive a ManagedBean
ManagedBean http = registry.findManagedBean("HttpConnector");
assertNotNull("Found HttpConnector managed bean");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
