[jboss-cvs] JBossAS SVN: r71914 - projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test.

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

Author: scott.stark at jboss.org
Date: 2008-04-10 08:49:07 -0400 (Thu, 10 Apr 2008)
New Revision: 71914

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
Log:
Move testComponentBeanFactory to the metadata testcase

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java	2008-04-10 12:42:13 UTC (rev 71913)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageMDTestCase.java	2008-04-10 12:49:07 UTC (rev 71914)
@@ -42,11 +42,14 @@
 import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
 import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.test.kernel.deployment.support.container.BaseContext;
 import org.jboss.test.kernel.deployment.support.container.Bean1Type;
 import org.jboss.test.kernel.deployment.support.container.BeanContainer;
 import org.jboss.test.kernel.deployment.support.container.BeanContextFactory;
 import org.jboss.test.kernel.deployment.support.container.InstanceInterceptor;
 import org.jboss.test.kernel.deployment.support.container.plugin.GenericComponentFactory;
+import org.jboss.test.kernel.deployment.support.container.spi.ComponentFactory;
+import org.jboss.test.kernel.deployment.support.container.spi.ComponentInstance;
 import org.jboss.test.kernel.deployment.support.container.spi.ComponentVisitor;
 
 /**
@@ -67,6 +70,27 @@
       super(name);
    }
 
+   public void testComponentBeanFactory()
+      throws Throwable
+   {
+      bootstrap();
+      ComponentFactory<BaseContext<Bean1Type, BeanContainer<Bean1Type>>> factory =
+         (ComponentFactory<BaseContext<Bean1Type, BeanContainer<Bean1Type>>>) getBean("ComponentBeanFactory");
+      getLog().info("ComponentBeanFactory bean: "+factory);
+   
+      ComponentInstance<BaseContext<Bean1Type, BeanContainer<Bean1Type>>> contextInstance =
+         factory.createComponents("ComponentBeanFactory");
+      List<String> beanNames = contextInstance.getComponentNames();
+      getLog().info("createComponents(ComponentBeanFactory): "+beanNames);
+      long compID = contextInstance.getComponentID();
+      BaseContext<Bean1Type, BeanContainer<Bean1Type>> context = contextInstance.getContext();
+      String contextName = contextInstance.getContextName();
+   
+      Object interceptor = getBean("ComponentBeanFactory at Interceptor:0#1");
+      assertNotNull(interceptor);
+      shutdown();
+   }
+
    /*
    <beanfactory name="Bean1TypeFactory" class="org.jboss.test.kernel.deployment.support.container.Bean1Type"/>
    <bean name="Bean1TypePool" class="org.jboss.test.kernel.deployment.support.container.BeanPool">

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java	2008-04-10 12:42:13 UTC (rev 71913)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/BeanContainerUsageTestCase.java	2008-04-10 12:49:07 UTC (rev 71914)
@@ -114,27 +114,6 @@
       deployer.shutdown();
    }
 
-   public void testComponentBeanFactory()
-      throws Throwable
-   {
-      bootstrap();
-      ComponentFactory<BaseContext<Bean1Type, BeanContainer<Bean1Type>>> factory =
-         (ComponentFactory<BaseContext<Bean1Type, BeanContainer<Bean1Type>>>) getBean("ComponentBeanFactory");
-      getLog().info("ComponentBeanFactory bean: "+factory);
-
-      ComponentInstance<BaseContext<Bean1Type, BeanContainer<Bean1Type>>> contextInstance =
-         factory.createComponents("ComponentBeanFactory");
-      List<String> beanNames = contextInstance.getComponentNames();
-      getLog().info("createComponents(ComponentBeanFactory): "+beanNames);
-      long compID = contextInstance.getComponentID();
-      BaseContext<Bean1Type, BeanContainer<Bean1Type>> context = contextInstance.getContext();
-      String contextName = contextInstance.getContextName();
-
-      Object interceptor = getBean("ComponentBeanFactory at Interceptor:0#1");
-      assertNotNull(interceptor);
-      deployer.shutdown();
-   }
-
    /**
     * There is no xml version of ?
     * @return
@@ -143,14 +122,6 @@
    {
       return null;
    }
-   /**
-    * There is no xml based version of testComponentBeanFactory
-    * @return
-    */
-   protected KernelDeployment getComponentBeanFactory()
-   {
-      return null;
-   }
 
    /**
     * Either deploy a test specific xml descriptor, or obtain a test
@@ -190,6 +161,10 @@
       deployer.validate();
       return kernel;
    }
+   protected void shutdown()
+   {
+      deployer.shutdown();
+   }
    protected Object getBean(final Object name)
    {
       KernelControllerContext context = getControllerContext(name, ControllerState.INSTALLED);