[jboss-cvs] JBossAS SVN: r111579 - in projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs: classloading/test and 1 other directory.

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

Author: alesj
Date: 2011-06-10 10:14:15 -0400 (Fri, 10 Jun 2011)
New Revision: 111579

Modified:
   projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
   projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/ClassLoadingDomainMetaDataUnitTestCase.java
Log:
Fix tests.


Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java	2011-06-10 14:13:30 UTC (rev 111578)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManagedObjectClassLoadingParserUnitTestCase.java	2011-06-10 14:14:15 UTC (rev 111579)
@@ -25,10 +25,12 @@
 import java.util.List;
 import java.util.Set;
 
+import junit.framework.Test;
 import org.jboss.classloader.spi.ShutdownPolicy;
 import org.jboss.classloading.spi.metadata.CapabilitiesMetaData;
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
 import org.jboss.classloading.spi.metadata.ExportAll;
+import org.jboss.classloading.spi.metadata.FilterMetaData;
 import org.jboss.classloading.spi.metadata.ParentPolicyMetaData;
 import org.jboss.classloading.spi.metadata.RequirementsMetaData;
 import org.jboss.classloading.spi.version.Version;
@@ -42,8 +44,6 @@
 import org.jboss.metatype.api.values.MetaValueFactory;
 import org.jboss.test.deployers.BootstrapDeployersTest;
 
-import junit.framework.Test;
-
 /**
  * ManagedObjectClassLoadingParserUnitTestCase.
  *
@@ -96,7 +96,7 @@
          assertNotNull(mo);
          getLog().debug("ManagedObject: " + mo + " properties=" + mo.getProperties());
 
-         List<String> expectedProperties = Arrays.asList("name", "version", "domain", "parentDomain", "topLevelClassLoader", "exportAll", "shutdown", "included", "excluded", "excludedExport", "importAll", "parentFirst", "cache", "blackList", "capabilities", "requirements", "parentPolicy");
+         List<String> expectedProperties = Arrays.asList("name", "version", "domain", "parentDomain", "topLevelClassLoader", "exportAll", "shutdown", "included", "includedMetaData", "excluded", "excludedMetaData", "excludedExport", "excludedExportMetaData", "importAll", "parentFirst", "cache", "blackList", "capabilities", "requirements", "parentPolicy");
          Set<String> actualProperties = mo.getPropertyNames();
          for (String expected : expectedProperties)
          {
@@ -117,8 +117,11 @@
          assertManagedProperty(mo, "exportAll", ExportAll.class, null);
          assertManagedProperty(mo, "shutdown", ShutdownPolicy.class, null);
          assertManagedProperty(mo, "included", String.class, null);
+         assertManagedProperty(mo, "includedMetaData", FilterMetaData.class, null);
          assertManagedProperty(mo, "excluded", String.class, null);
+         assertManagedProperty(mo, "excludedMetaData", FilterMetaData.class, null);
          assertManagedProperty(mo, "excludedExport", String.class, null);
+         assertManagedProperty(mo, "excludedExportMetaData", FilterMetaData.class, null);
          assertManagedProperty(mo, "importAll", boolean.class, false);
          assertManagedProperty(mo, "parentFirst", boolean.class, true);
          assertManagedProperty(mo, "capabilities", CapabilitiesMetaData.class, new CapabilitiesMetaData());

Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/ClassLoadingDomainMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/ClassLoadingDomainMetaDataUnitTestCase.java	2011-06-10 14:13:30 UTC (rev 111578)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/ClassLoadingDomainMetaDataUnitTestCase.java	2011-06-10 14:14:15 UTC (rev 111579)
@@ -21,6 +21,7 @@
 */
 package org.jboss.test.deployers.vfs.classloading.test;
 
+import junit.framework.Test;
 import org.jboss.classloader.spi.ClassLoaderSystem;
 import org.jboss.classloader.spi.base.BaseClassLoader;
 import org.jboss.classloader.spi.jdk.JDKChecker;
@@ -31,8 +32,6 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.test.deployers.BootstrapDeployersTest;
 
-import junit.framework.Test;
-
 /**
  * ClassLoadingDomain metadata test case.
  *
@@ -62,13 +61,11 @@
          FilterMetaData bf = ppmd.getBeforeFilter();
          assertNotNull(bf);
          Object value = bf.getValue();
-         assertInstanceOf(value, String[].class);
-         assertEquals(new String[]{"org.jboss.acme", "com.redhat.acme"}, (String[]) value);
+         assertEquals("org.jboss.acme,com.redhat.acme", value);
          FilterMetaData af = ppmd.getAfterFilter();
          assertNotNull(af);
          value = af.getValue();
-         assertInstanceOf(value, String[].class);
-         assertEquals(new String[]{"org.jboss.foobar", "com.redhat.foobar"}, (String[]) value);
+         assertEquals("org.jboss.foobar,com.redhat.foobar", value);
       }
       finally
       {