[jboss-cvs] JBossAS SVN: r64986 - 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]

Author: scott.stark at jboss.org
Date: 2007-08-31 01:55:08 -0400 (Fri, 31 Aug 2007)
New Revision: 64986

Modified:
   projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java
   projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
Log:
Update the tests for the metadata changes

Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java	2007-08-31 05:34:56 UTC (rev 64985)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/DSMetaData.java	2007-08-31 05:55:08 UTC (rev 64986)
@@ -23,10 +23,8 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
-import org.jboss.managed.api.annotation.ManagementComponent;
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ManagementProperties;
 import org.jboss.managed.api.annotation.ManagementProperty;

Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java	2007-08-31 05:34:56 UTC (rev 64985)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java	2007-08-31 05:55:08 UTC (rev 64986)
@@ -40,6 +40,7 @@
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.SimpleMetaType;
 import org.jboss.metatype.api.values.ArrayValue;
+import org.jboss.metatype.api.values.GenericValue;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.test.deployers.AbstractDeployerTest;
 import org.jboss.test.deployers.deployer.support.AllowedDsTypes;
@@ -166,10 +167,11 @@
 
       assertEquals(1, value.getLength());
       // Validate the ConnMetaData ManagedObject
-      ManagedObject localConnMO = ManagedObject.class.cast(value.getValue(0));
+      GenericValue localConnMOGV = GenericValue.class.cast(value.getValue(0));
+      ManagedObject localConnMO = ManagedObject.class.cast(localConnMOGV.getValue());
       assertEquals(ConnMetaData.class.getName(), localConnMO.getName());
       propsMap = localConnMO.getProperties();
-      assertEquals(8, propsMap.size());
+      assertEquals(10, propsMap.size());
       log.info("ConnMetaData properties: "+propsMap);
       ManagedProperty dsType = propsMap.get("datasource-type");
       assertNotNull(dsType);
@@ -219,7 +221,8 @@
       ManagedObject xaConnMO = null;
       for(Object md : value)
       {
-         ManagedObject tmpMO = ManagedObject.class.cast(md);
+         GenericValue tmpGV = GenericValue.class.cast(md);
+         ManagedObject tmpMO = ManagedObject.class.cast(tmpGV.getValue());
          if (tmpMO.getName().equals(LocalDataSourceMetaData.class.getName()))
             localConnMO = tmpMO;
          if (tmpMO.getName().equals(XADataSourceMetaData.class.getName()))
@@ -230,7 +233,7 @@
 
       // Validate the LocalDataSourceMetaData ManagedObject
       propsMap = localConnMO.getProperties();
-      assertEquals(8, propsMap.size());
+      assertEquals(10, propsMap.size());
       log.info("LocalDataSourceMetaData properties: "+propsMap);
       ManagedProperty dsType = propsMap.get("datasource-type");
       assertNotNull(dsType);
@@ -239,7 +242,7 @@
 
       // Validate the XADataSourceMetaData ManagedObject
       propsMap = xaConnMO.getProperties();
-      assertEquals(10, propsMap.size());
+      assertEquals(12, propsMap.size());
       log.info("XADataSourceMetaData properties: "+propsMap);
       ManagedProperty xaDataSourceClass = propsMap.get("xaDataSourceClass");
       assertNotNull(xaDataSourceClass);
@@ -281,6 +284,7 @@
       assertEquals("maxSize", 100, xaDS.getMaxSize());
    }
 
+   
    protected DeployerClient getMainDeployer()
    {
       return createMainDeployer(deployer);