[jboss-cvs] JBossAS SVN: r68377 - trunk/testsuite/src/main/org/jboss/test/profileservice/test.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2007-12-18 10:16:42 -0500 (Tue, 18 Dec 2007)
New Revision: 68377

Modified:
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
enabled assertions for collections, unwrapping of collections of non-simple types still doesn't work..

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2007-12-18 12:34:09 UTC (rev 68376)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2007-12-18 15:16:42 UTC (rev 68377)
@@ -27,6 +27,7 @@
 import java.util.Set;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.io.Serializable;
 import javax.naming.InitialContext;
 
@@ -46,6 +47,7 @@
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.metatype.api.values.SimpleValue;
+import org.jboss.metatype.api.values.MetaValueFactory;
 import org.jboss.profileservice.spi.NoSuchProfileException;
 import org.jboss.profileservice.spi.ProfileKey;
 import org.jboss.profileservice.spi.ProfileService;
@@ -83,7 +85,6 @@
       suite.addTest(new ProfileServiceUnitTestCase("testListDataSourceComponents"));
       suite.addTest(new ProfileServiceUnitTestCase("testUpdateDefaultDS"));
       suite.addTest(new ProfileServiceUnitTestCase("testDefaultDSOps"));
-
       suite.addTest(new ProfileServiceUnitTestCase("testAddDataSource"));
       suite.addTest(new ProfileServiceUnitTestCase("testRemoveDataSource"));
       suite.addTest(new ProfileServiceUnitTestCase("testAddXADataSource"));
@@ -644,22 +645,14 @@
          ManagedProperty prop = dsMC.getProperty(propName);
          assertNotNull(prop);
          if(prop.getMetaType().isSimple())
-            assertEquals(propValues.get(propName), ((SimpleValue)prop.getValue()).getValue());
+            assertEquals(prop.getName(), propValues.get(propName), ((SimpleValue)prop.getValue()).getValue());
          else
          {
-            //TODO this unwrapping doesn't work!
-            log.warn(getName() + "> skipping assertion for " + prop.getName());
-/*
             Serializable expectedValue = propValues.get(propName);
-            Class valueType;
-            if(expectedValue instanceof java.util.List)
-               valueType = java.util.List.class;
-            else
-               valueType = expectedValue.getClass();
-
-            Object value = MetaValueFactory.getInstance().unwrap((MetaValue)prop.getValue(), valueType);
-            assertEquals(expectedValue, value);
-*/
+            Class valueType = expectedValue.getClass();
+            MetaValue metaValue = (MetaValue)prop.getValue();
+            Object value = MetaValueFactory.getInstance().unwrap(metaValue, valueType);
+            assertEquals(prop.getName(), expectedValue, value);
          }
          mcPropNames.remove(propName);
       }