[jboss-cvs] JBossAS SVN: r107875 - in trunk/weld-int/deployer/src/test: resources/org/jboss/test/deployers/test and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Aug 28 07:42:43 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-08-28 07:42:42 -0400 (Sat, 28 Aug 2010)
New Revision: 107875
Modified:
trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml
Log:
[JBAS-8364] Fix BootDeployerTestCase.
Modified: trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
===================================================================
--- trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-08-27 23:27:23 UTC (rev 107874)
+++ trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-08-28 11:42:42 UTC (rev 107875)
@@ -71,88 +71,87 @@
protected void testBootstrap(VirtualFile ear) throws Exception
{
- // FIXME test is broken
// should already be on the deployer
-// Context bmContext = assertInstanceOf(
-// CheckableJndiBinderDeployer.ROOT.lookup(CheckableJndiBinderDeployer.BEAN_MANAGER_JNDI_SUBCONTEXT),
-// Context.class,
-// false
-// );
-//
-// Object bootstrap;
-// String duSimpleName = null;
-// Deployment deployment = createVFSDeployment(ear);
-// DeployerClient mainDeployer = getDeployerClient();
-// mainDeployer.addDeployment(deployment);
-// mainDeployer.process();
-// ControllerContext wbContext = null;
-// try
-// {
-// DeploymentUnit earDU = getMainDeployerStructure().getDeploymentUnit(deployment.getName());
-// String bootName = DeployersUtils.getBootstrapBeanName(earDU);
-// bootstrap = getBean(bootName, null);
-// assertInstanceOf(bootstrap, "org.jboss.test.deployers.support.CheckableBootstrap", earDU.getClassLoader());
-// // waiting on ejb
-// assertTrue(invoke(bootstrap, "Create"));
-// assertFalse(invoke(bootstrap, "Boot")); // not yet booted
-// assertFalse(invoke(bootstrap, "Shutdown"));
-// // install ejb
-// KernelControllerContext ejb = deploy(new AbstractBeanMetaData("EjbContainer#1", Object.class.getName()));
-// try
-// {
-// assertTrue(ejb.getState().equals(ControllerState.INSTALLED));
-// /// check boot
-// assertTrue(invoke(bootstrap, "Create"));
-// assertTrue(invoke(bootstrap, "Boot"));
-// assertFalse(invoke(bootstrap, "Shutdown"));
-//
-// // test jndi binding
-// duSimpleName = earDU.getSimpleName();
-// Context context = assertInstanceOf(bmContext.lookup(duSimpleName), Context.class, false);
-// assertSame(bootstrap, context.lookup("bootstrap"));
-//
-// Class<?> wbClass = earDU.getClassLoader().loadClass("org.jboss.test.deployers.support.CheckableBootstrap");
-// wbContext = controller.getContextByClass(wbClass);
-// assertNotNull(wbContext);
-// assertSame(bootstrap, wbContext.getTarget());
-// }
-// finally
-// {
-// undeploy(ejb);
-// }
-// }
-// finally
-// {
-// mainDeployer.removeDeployment(deployment);
-// mainDeployer.process();
-//
-// // clear binding
-// assertNull(bmContext.lookup(duSimpleName));
-//
-// // clear context 2 class mapping
-// if (wbContext != null)
-// assertNull(wbContext.getTarget());
-//
-// Field registryField = AbstractController.class.getDeclaredField("registry");
-// registryField.setAccessible(true);
-// Object registry = registryField.get(controller);
-// Field mapField = AbstractContextRegistry.class.getDeclaredField("contextsByClass");
-// mapField.setAccessible(true);
-// @SuppressWarnings({"unchecked"})
-// Map<Class<?>, ?> map = (Map) mapField.get(registry);
-// for (Class<?> clazz : map.keySet())
-// {
-// String className = clazz.getName();
-// // should be the only one -- no other service/bean should use it -- except if we leak
-// if ("org.jboss.test.deployers.support.CheckableBootstrap".equals(className))
-// {
-//
-// Object value = map.get(clazz);
-// fail("" + value);
-// }
-// }
-// }
-// assertTrue(invoke(bootstrap, "Shutdown"));
+ Context bmContext = assertInstanceOf(
+ CheckableJndiBinderDeployer.ROOT.lookup(CheckableJndiBinderDeployer.BEAN_MANAGER_JNDI_SUBCONTEXT),
+ Context.class,
+ false
+ );
+
+ Object bootstrap;
+ String duSimpleName = null;
+ Deployment deployment = createVFSDeployment(ear);
+ DeployerClient mainDeployer = getDeployerClient();
+ mainDeployer.addDeployment(deployment);
+ mainDeployer.process();
+ ControllerContext wbContext = null;
+ try
+ {
+ DeploymentUnit earDU = getMainDeployerStructure().getDeploymentUnit(deployment.getName());
+ String bootName = DeployersUtils.getBootstrapBeanName(earDU);
+ bootstrap = getBean(bootName, null);
+ assertInstanceOf(bootstrap, "org.jboss.test.deployers.support.CheckableBootstrap", earDU.getClassLoader());
+ // waiting on ejb
+ assertTrue(invoke(bootstrap, "Create"));
+ assertFalse(invoke(bootstrap, "Boot")); // not yet booted
+ assertFalse(invoke(bootstrap, "Shutdown"));
+ // install ejb
+ KernelControllerContext ejb = deploy(new AbstractBeanMetaData("EjbContainer#1", Object.class.getName()));
+ try
+ {
+ assertTrue(ejb.getState().equals(ControllerState.INSTALLED));
+ /// check boot
+ assertTrue(invoke(bootstrap, "Create"));
+ assertTrue(invoke(bootstrap, "Boot"));
+ assertFalse(invoke(bootstrap, "Shutdown"));
+
+ // test jndi binding
+ duSimpleName = earDU.getSimpleName();
+ Context context = assertInstanceOf(bmContext.lookup(duSimpleName), Context.class, false);
+ assertSame(bootstrap, context.lookup("bootstrap"));
+
+ Class<?> wbClass = earDU.getClassLoader().loadClass("org.jboss.test.deployers.support.CheckableBootstrap");
+ wbContext = controller.getContextByClass(wbClass);
+ assertNotNull(wbContext);
+ assertSame(bootstrap, wbContext.getTarget());
+ }
+ finally
+ {
+ undeploy(ejb);
+ }
+ }
+ finally
+ {
+ mainDeployer.removeDeployment(deployment);
+ mainDeployer.process();
+
+ // clear binding
+ assertNull(bmContext.lookup(duSimpleName));
+
+ // clear context 2 class mapping
+ if (wbContext != null)
+ assertNull(wbContext.getTarget());
+
+ Field registryField = AbstractController.class.getDeclaredField("registry");
+ registryField.setAccessible(true);
+ Object registry = registryField.get(controller);
+ Field mapField = AbstractContextRegistry.class.getDeclaredField("contextsByClass");
+ mapField.setAccessible(true);
+ @SuppressWarnings({"unchecked"})
+ Map<Class<?>, ?> map = (Map) mapField.get(registry);
+ for (Class<?> clazz : map.keySet())
+ {
+ String className = clazz.getName();
+ // should be the only one -- no other service/bean should use it -- except if we leak
+ if ("org.jboss.test.deployers.support.CheckableBootstrap".equals(className))
+ {
+
+ Object value = map.get(clazz);
+ fail("" + value);
+ }
+ }
+ }
+ assertTrue(invoke(bootstrap, "Shutdown"));
}
public void testEar() throws Exception
Modified: trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml
===================================================================
--- trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml 2010-08-27 23:27:23 UTC (rev 107874)
+++ trunk/weld-int/deployer/src/test/resources/org/jboss/test/deployers/test/BootDeployerTestCase.xml 2010-08-28 11:42:42 UTC (rev 107875)
@@ -19,6 +19,7 @@
<bean name="EjbServicesDeployer" class="org.jboss.weld.integration.deployer.env.EjbServicesDeployer">
<property name="ejbServicesClassName">org.jboss.test.deployers.support.MockEjbServices</property>
+ <property name="ejbInjectionServicesClassName">org.jboss.test.deployers.support.MockEjbInjectionServices</property>
</bean>
<bean name="DeploymentDeployer" class="org.jboss.weld.integration.deployer.env.FlatDeploymentDeployer"/>
More information about the jboss-cvs-commits
mailing list