[jboss-cvs] JBossAS SVN: r64860 - in projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers: managed/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 24 13:59:17 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-08-24 13:59:17 -0400 (Fri, 24 Aug 2007)
New Revision: 64860
Modified:
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/ConnMetaData.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/LocalDataSourceMetaData.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java
projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
Log:
Update the test to validate the ManagedComponents
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/ConnMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/ConnMetaData.java 2007-08-24 17:58:36 UTC (rev 64859)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/ConnMetaData.java 2007-08-24 17:59:17 UTC (rev 64860)
@@ -25,6 +25,7 @@
import java.util.Properties;
import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementObjectID;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.managed.plugins.WritethroughManagedPropertyImpl;
@@ -59,6 +60,7 @@
}
@ManagementProperty(name="jndi-name", propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementObjectID(type="DataSource")
public String getJndiName()
{
return jndiName;
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/LocalDataSourceMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/LocalDataSourceMetaData.java 2007-08-24 17:58:36 UTC (rev 64859)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/LocalDataSourceMetaData.java 2007-08-24 17:59:17 UTC (rev 64860)
@@ -21,11 +21,15 @@
*/
package org.jboss.test.deployers.deployer.support;
+import org.jboss.managed.api.annotation.ManagementComponent;
+import org.jboss.managed.api.annotation.ManagementObject;
+
/**
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at ManagementObject(componentType=@ManagementComponent(type="DataSource", subtype="LocalTx"))
public class LocalDataSourceMetaData extends ConnMetaData
{
-
+ private static final long serialVersionUID = 1;
}
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java 2007-08-24 17:58:36 UTC (rev 64859)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java 2007-08-24 17:59:17 UTC (rev 64860)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.deployers.deployer.support;
+import org.jboss.managed.api.annotation.ManagementComponent;
+import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.managed.plugins.WritethroughManagedPropertyImpl;
@@ -29,6 +31,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at ManagementObject(componentType=@ManagementComponent(type="DataSource", subtype="XA"))
public class XADataSourceMetaData extends ConnMetaData
{
private static final long serialVersionUID = 1;
Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java 2007-08-24 17:58:36 UTC (rev 64859)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java 2007-08-24 17:59:17 UTC (rev 64860)
@@ -36,6 +36,8 @@
import org.jboss.deployers.plugins.attachments.AttachmentsImpl;
import org.jboss.deployers.spi.attachments.MutableAttachments;
import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
+import org.jboss.managed.api.ComponentType;
+import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedProperty;
@@ -151,34 +153,38 @@
assertNotNull("deployment1 ManagedDeployment", mo1);
ManagedProperty deploymentsProp = mo1.getProperty("deployments");
assertNotNull("deployments prop", deploymentsProp);
+ // Get the deployments MCs
+ Map<String, ManagedComponent> mcs1 = mo1.getComponents();
+ assertEquals("deployment1 has 2 ManagedComponent", 2, mcs1.size());
+
// Get the deployments property MOs
- Object deploymentsValue = deploymentsProp.getValue();
- assertTrue("deploymentsValue instanceof ArrayValue", deploymentsValue instanceof ArrayValue);
- ArrayValue deploymentsArray = (ArrayValue) deploymentsValue;
- ManagedObject localDataMO = null;
- ManagedObject xaDataMO = null;
- for(int n = 0; n < deploymentsArray.getLength(); n ++)
+ ManagedComponent localDataMO = null;
+ ManagedComponent xaDataMO = null;
+ for(ManagedComponent mc : mcs1.values())
{
- GenericValue gv = (GenericValue) deploymentsArray.getValue(n);
- ManagedObject propMO = (ManagedObject) gv.getValue();
- if (propMO.getAttachmentName().equals(LocalDataSourceMetaData.class.getName()))
- localDataMO = propMO;
- else if (propMO.getAttachmentName().equals(XADataSourceMetaData.class.getName()))
- xaDataMO = propMO;
+ if (mc.getAttachmentName().equals(LocalDataSourceMetaData.class.getName()))
+ localDataMO = mc;
+ else if (mc.getAttachmentName().equals(XADataSourceMetaData.class.getName()))
+ xaDataMO = mc;
}
// Get the LocalDataSourceMetaData/SecMetaData/domain ManagedProperty
assertNotNull("LocalDataSourceMetaData MO", localDataMO);
+ assertEquals("LocalDataSourceMetaData comp type", new ComponentType("DataSource", "LocalTx"), localDataMO.getType());
log.debug("LocalDataSourceMetaData MO.props: "+localDataMO.getProperties());
+ assertNotNull("LocalDataSourceMetaData MO.props", localDataMO.getProperties());
ManagedProperty localSecDomainProp = localDataMO.getProperty("security-domain");
assertNotNull("localSecDomainProp", localSecDomainProp);
GenericValue localSecDomainPropGV = (GenericValue) localSecDomainProp.getValue();
ManagedObject localSecDomainPropMO = (ManagedObject) localSecDomainPropGV.getValue();
ManagedProperty localSecDomainRefProp = localSecDomainPropMO.getProperty("domain-name");
assertNotNull("localSecDomainRefProp", localSecDomainRefProp);
+
// Get the XADataSourceMetaData/SecMetaData/domain ManagedProperty
log.debug("XADataSourceMetaData MO: "+xaDataMO);
+ assertNotNull("XADataSourceMetaData", xaDataMO);
+ assertEquals("XADataSourceMetaData comp type", new ComponentType("DataSource", "XA"), xaDataMO.getType());
assertNotNull("XADataSourceMetaData MO.props", xaDataMO.getProperties());
- ManagedProperty xaSecDomainProp = localDataMO.getProperty("security-domain");
+ ManagedProperty xaSecDomainProp = xaDataMO.getProperty("security-domain");
assertNotNull("xaSecDomainProp", xaSecDomainProp);
GenericValue xaSecDomainPropGV = (GenericValue) xaSecDomainProp.getValue();
ManagedObject xaSecDomainPropMO = (ManagedObject) xaSecDomainPropGV.getValue();
@@ -190,18 +196,20 @@
log.info("unresolvedRefs: "+unresolvedRefs);
assertEquals("Should be 0 ManagementObjectRef", 0, unresolvedRefs.size());
- Map<String, ManagedObject> sd1MDs = main.getManagedObjects("sec-domain1");
- Map<String, ManagedObject> sd2MDs = main.getManagedObjects("sec-domain2");
+ ManagedDeployment secMD1 = ps.getManagedDeployment("sec-domain1");
+ ManagedDeployment secMD2 = ps.getManagedDeployment("sec-domain2");
// Validate that the sec-domain1 ManagedObject is the target of the localSecDomainRefProp
- ManagedObject sd1MO = sd1MDs.get("org.jboss.test.deployers.deployer.support.SecurityDeployment");
- assertNotNull("org.jboss.test.deployers.deployer.support.SecurityDeployment MO1", sd1MO);
+ log.info("sec-domain1 ManagedObjectNames: "+ secMD1.getManagedObjectNames());
+ ManagedObject sd1MO = secMD1.getManagedObject("java:/jaas/domain1");
+
+ assertNotNull("java:/jaas/domain1 MO", sd1MO);
ManagedObject localSecDomainPropTarget = localSecDomainRefProp.getTargetManagedObject();
assertEquals(sd1MO, localSecDomainPropTarget);
// Validate that the sec-domain2 ManagedObject is the target of the xaSecDomainRefProp
- ManagedObject sd2MO = sd2MDs.get("org.jboss.test.deployers.deployer.support.SecurityDeployment");
- assertNotNull("org.jboss.test.deployers.deployer.support.SecurityDeployment MO2", sd2MO);
+ ManagedObject sd2MO = secMD2.getManagedObject("java:/jaas/domain2");
+ assertNotNull("java:/jaas/domain2 MO", sd2MO);
ManagedObject xaSecDomainPropTarget = xaSecDomainRefProp.getTargetManagedObject();
assertEquals(sd2MO, xaSecDomainPropTarget);
}
More information about the jboss-cvs-commits
mailing list