[jboss-cvs] JBossAS SVN: r104518 - in projects/kernel/trunk/kernel/src/test: resources/xml-test/org/jboss/test/kernel/dependency/test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-05-06 10:32:21 -0400 (Thu, 06 May 2010)
New Revision: 104518

Removed:
   projects/kernel/trunk/kernel/src/test/resources/xml-test/org/jboss/test/kernel/dependency/test/testConstructorClassLoaderReinstall4.xml
Modified:
   projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.java
Log:
[JBKERNEL-114] Rework test to understand classpools better

Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.java	2010-05-06 14:18:19 UTC (rev 104517)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/dependency/test/ConstructorClassLoaderTestCase.java	2010-05-06 14:32:21 UTC (rev 104518)
@@ -38,6 +38,7 @@
 import org.jboss.beans.metadata.spi.PropertyMetaData;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
+import org.jboss.test.kernel.dependency.support.ClassPoolFactoryImpl;
 
 /**
  * Non-kernel ClassLoader dependency test case.
@@ -225,7 +226,6 @@
    {
       constructorClassLoaderReinstall();
 
-      assertInstall(4, "ClassPoolFactory");
       assertInstall(3, "URL");
       ControllerContext clCtx = assertInstall(0, "VFSClassLoader");
       ControllerContext bean1Ctx = assertInstall(1, "VFSBean1");
@@ -322,9 +322,27 @@
       metaData2.setConstructor(cmd);
       cmd.setParameters(constructor2);
       
-      AbstractBeanMetaData metaData4 = new AbstractBeanMetaData("ClassPoolFactory", 
-            "org.jboss.test.kernel.dependency.support.ClassPoolFactoryImpl");
+      setBeanMetaDatas(new BeanMetaData[] { metaData0, metaData1, metaData2, metaData3});
+   }
+   
+   @Override
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      try
+      {
+         getUtil().getKernel().getController().install(new AbstractBeanMetaData("ClassPoolFactory", ClassPoolFactoryImpl.class.getName()));
+      }
+      catch(Throwable t)
+      {
+         throw new RuntimeException(t);
+      }
+   }
 
-      setBeanMetaDatas(new BeanMetaData[] { metaData0, metaData1, metaData2, metaData3, metaData4});
+   @Override
+   protected void tearDown() throws Exception
+   {
+      getUtil().getKernel().getController().uninstall("ClassPoolFactory");
+      super.tearDown();
    }
 }
\ No newline at end of file

Deleted: projects/kernel/trunk/kernel/src/test/resources/xml-test/org/jboss/test/kernel/dependency/test/testConstructorClassLoaderReinstall4.xml
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/xml-test/org/jboss/test/kernel/dependency/test/testConstructorClassLoaderReinstall4.xml	2010-05-06 14:18:19 UTC (rev 104517)
+++ projects/kernel/trunk/kernel/src/test/resources/xml-test/org/jboss/test/kernel/dependency/test/testConstructorClassLoaderReinstall4.xml	2010-05-06 14:32:21 UTC (rev 104518)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
-            xmlns="urn:jboss:bean-deployer">
-   <bean name="ClassPoolFactory" class="org.jboss.test.kernel.dependency.support.ClassPoolFactoryImpl"/>
-</deployment>