[jboss-cvs] JBossAS SVN: r102125 - projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 9 06:48:00 EST 2010
Author: kabir.khan at jboss.com
Date: 2010-03-09 06:47:59 -0500 (Tue, 09 Mar 2010)
New Revision: 102125
Modified:
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
Log:
Reintroduce tests
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-03-09 11:35:26 UTC (rev 102124)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-03-09 11:47:59 UTC (rev 102125)
@@ -61,173 +61,173 @@
return suite(McIntegrationTestCase.class);
}
-// public void testMcDeployment() throws Exception
-// {
-// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(top, "/weld/mcandweld/ear/mconly", "META-INF");
-// createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
-//
-// Deployment deployment = createVFSDeployment(top);
-// DeployerClient mainDeployer = getDeployerClient();
-// mainDeployer.addDeployment(deployment);
-// mainDeployer.process();
-// try
-// {
-// Object o = getBean("SimpleBean");
-// assertNotNull(o);
-// }
-// finally
-// {
-// mainDeployer.removeDeployment(deployment);
-// mainDeployer.process();
-// }
-// }
-//
-// public void testWeldDeployment() throws Exception
-// {
-// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(top, "/weld/mcandweld/ear/weldonly", "META-INF");
-// createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
-//
-// testBootstrap(top, new RunSpecificTest()
-// {
-// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
-// {
-// assertWebBean(manager, unit, SimpleWebBean.class.getName());
-// }
-// });
-// }
-//
-// public void testWeldAndMcDeployment() throws Exception
-// {
-// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
-// createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
-// createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
-//
-// testBootstrap(top, new RunSpecificTest()
-// {
-// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
-// {
-// assertInstanceOf(getControllerContext("SimpleBean"), WeldKernelControllerContext.class);
-// Object o = getBean("SimpleBean");
-// assertNotNull(o);
-// assertWebBean(manager, unit, SimpleWebBean.class.getName());
-// assertNoWebBean(manager, unit, SimpleBean.class.getName());
-// }
-// });
-// assertNoControllerContext("SimpleBean", null);
-// }
-//
-// public void testMcInjectedByWeld() throws Exception
-// {
-// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
-// createMcLib(top, "/weld/mcandweld/mc/fromweld", McBeanWithInjectedWeldBean.class);
-// createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
-//
-// testBootstrap(top, new RunSpecificTest()
-// {
-// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
-// {
-// Object mc = getBean("McBean");
-// assertNotNull(mc);
-// Object weldBean = assertWebBean(manager, unit, SimpleWebBean.class.getName());
-// assertNoWebBean(manager, unit, McBeanWithInjectedWeldBean.class.getName());
-//
-// Method m = mc.getClass().getMethod("getSimpleWebBean");
-// Object injectedWeldBean = m.invoke(mc);
-// assertNotNull(injectedWeldBean);
-// assertSame(weldBean.getClass(), injectedWeldBean.getClass());
-// }
-// });
-// }
-//
-// public void testWeldInjectedByMc() throws Exception
-// {
-// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
-// createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
-// createWeldLib(top, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
-//
-// testBootstrap(top, new RunSpecificTest()
-// {
-// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
-// {
-// Object mc = getBean("SimpleBean");
-// assertNotNull(mc);
-// Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
-// assertSame(mc, assertWebBean(manager, unit, mc));
-//
-// Method m = weldBean.getClass().getMethod("getSimpleBean");
-// Object injectedBean = m.invoke(weldBean);
-// assertNotNull(injectedBean);
-// assertSame(mc, injectedBean);
-// }
-// });
-// }
-//
-// public void testMcInjectedIntoWeldInjectedIntoMc() throws Exception
-// {
-// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
-// createMcLib(top, "/weld/mcandweld/bidirectional/mc/end", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.end.First.class);
-// createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.middle.Middle.class);
-//
-// testBootstrap(top, new RunSpecificTest()
-// {
-// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
-// {
-// Object first = getBean("First");
-// assertNotNull(first);
-// Object middle = assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.middle.Middle.class.getName());
-// Object last = getBean("Last");
-//
-// Method getLast = middle.getClass().getMethod("getLast");
-// Object injectedLast = getLast.invoke(middle);
-// assertNotNull(injectedLast);
-// assertSame(last, injectedLast);
-// assertSame(last, assertWebBean(manager, unit, last));
-//
-// Method getMiddle = first.getClass().getMethod("getMiddle");
-// Object injectedMiddle = getMiddle.invoke(first);
-// assertNotNull(injectedMiddle);
-//
-// assertSame(first, assertWebBean(manager, unit, first));
-// }
-// });
-// }
-//
-// public void testWeldInjectedIntoMcInjectedIntoWeld() throws Exception
-// {
-// AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
-// addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
-// createMcLib(top, "/weld/mcandweld/bidirectional/mc/middle", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.middle.Middle.class);
-// createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.First.class);
-//
-// testBootstrap(top, new RunSpecificTest()
-// {
-// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
-// {
-// Object first = assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.First.class.getName());
-// assertNotNull(first);
-// Object middle = getBean("Middle");
-// assertNotNull(middle);
-// assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.Last.class.getName());
-//
-// Method getLast = middle.getClass().getMethod("getLast");
-// Object injectedLast = getLast.invoke(middle);
-// assertNotNull(injectedLast);
-//
-// Method getMiddle = first.getClass().getMethod("getMiddle");
-// Object injectedMiddle = getMiddle.invoke(first);
-// assertNotNull(injectedMiddle);
-// assertSame(middle, injectedMiddle);
-// assertSame(middle, assertWebBean(manager, unit, middle));
-// }
-// });
-// }
+ public void testMcDeployment() throws Exception
+ {
+ AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(top, "/weld/mcandweld/ear/mconly", "META-INF");
+ createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
+
+ Deployment deployment = createVFSDeployment(top);
+ DeployerClient mainDeployer = getDeployerClient();
+ mainDeployer.addDeployment(deployment);
+ mainDeployer.process();
+ try
+ {
+ Object o = getBean("SimpleBean");
+ assertNotNull(o);
+ }
+ finally
+ {
+ mainDeployer.removeDeployment(deployment);
+ mainDeployer.process();
+ }
+ }
+ public void testWeldDeployment() throws Exception
+ {
+ AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(top, "/weld/mcandweld/ear/weldonly", "META-INF");
+ createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
+
+ testBootstrap(top, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ assertWebBean(manager, unit, SimpleWebBean.class.getName());
+ }
+ });
+ }
+
+ public void testWeldAndMcDeployment() throws Exception
+ {
+ AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
+ createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
+
+ testBootstrap(top, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ assertInstanceOf(getControllerContext("SimpleBean"), WeldKernelControllerContext.class);
+ Object o = getBean("SimpleBean");
+ assertNotNull(o);
+ assertWebBean(manager, unit, SimpleWebBean.class.getName());
+ assertNoWebBean(manager, unit, SimpleBean.class.getName());
+ }
+ });
+ assertNoControllerContext("SimpleBean", null);
+ }
+
+ public void testMcInjectedByWeld() throws Exception
+ {
+ AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ createMcLib(top, "/weld/mcandweld/mc/fromweld", McBeanWithInjectedWeldBean.class);
+ createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
+
+ testBootstrap(top, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ Object mc = getBean("McBean");
+ assertNotNull(mc);
+ Object weldBean = assertWebBean(manager, unit, SimpleWebBean.class.getName());
+ assertNoWebBean(manager, unit, McBeanWithInjectedWeldBean.class.getName());
+
+ Method m = mc.getClass().getMethod("getSimpleWebBean");
+ Object injectedWeldBean = m.invoke(mc);
+ assertNotNull(injectedWeldBean);
+ assertSame(weldBean.getClass(), injectedWeldBean.getClass());
+ }
+ });
+ }
+
+ public void testWeldInjectedByMc() throws Exception
+ {
+ AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
+ createWeldLib(top, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
+
+ testBootstrap(top, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ Object mc = getBean("SimpleBean");
+ assertNotNull(mc);
+ Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
+ assertSame(mc, assertWebBean(manager, unit, mc));
+
+ Method m = weldBean.getClass().getMethod("getSimpleBean");
+ Object injectedBean = m.invoke(weldBean);
+ assertNotNull(injectedBean);
+ assertSame(mc, injectedBean);
+ }
+ });
+ }
+
+ public void testMcInjectedIntoWeldInjectedIntoMc() throws Exception
+ {
+ AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+ createMcLib(top, "/weld/mcandweld/bidirectional/mc/end", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.end.First.class);
+ createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.middle.Middle.class);
+
+ testBootstrap(top, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ Object first = getBean("First");
+ assertNotNull(first);
+ Object middle = assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.middle.Middle.class.getName());
+ Object last = getBean("Last");
+
+ Method getLast = middle.getClass().getMethod("getLast");
+ Object injectedLast = getLast.invoke(middle);
+ assertNotNull(injectedLast);
+ assertSame(last, injectedLast);
+ assertSame(last, assertWebBean(manager, unit, last));
+
+ Method getMiddle = first.getClass().getMethod("getMiddle");
+ Object injectedMiddle = getMiddle.invoke(first);
+ assertNotNull(injectedMiddle);
+
+ assertSame(first, assertWebBean(manager, unit, first));
+ }
+ });
+ }
+
+ public void testWeldInjectedIntoMcInjectedIntoWeld() throws Exception
+ {
+ AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+ createMcLib(top, "/weld/mcandweld/bidirectional/mc/middle", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.middle.Middle.class);
+ createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.First.class);
+
+ testBootstrap(top, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ Object first = assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.First.class.getName());
+ assertNotNull(first);
+ Object middle = getBean("Middle");
+ assertNotNull(middle);
+ assertWebBean(manager, unit, org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.Last.class.getName());
+
+ Method getLast = middle.getClass().getMethod("getLast");
+ Object injectedLast = getLast.invoke(middle);
+ assertNotNull(injectedLast);
+
+ Method getMiddle = first.getClass().getMethod("getMiddle");
+ Object injectedMiddle = getMiddle.invoke(first);
+ assertNotNull(injectedMiddle);
+ assertSame(middle, injectedMiddle);
+ assertSame(middle, assertWebBean(manager, unit, middle));
+ }
+ });
+ }
+
public void testExternalMcBeanInjectedIntoWeld() throws Exception
{
AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
@@ -263,52 +263,52 @@
}
}
-// public void testExternalMcBeanInjectedIntoWeld2() throws Exception
-// {
-// AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
-// addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
-// createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
-// Deployment mc = deploy(mcEar);
-//
-// undeploy(mc);
-//
-// AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
-// addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
-// createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
-//
-// try
-// {
-// testBootstrap(weldEar, null);
-// fail("Weld deployment should not have worked without mc deployment");
-// }
-// catch(Exception expected)
-// {
-// }
-//
-// mc = deploy(mcEar);
-// try
-// {
-// testBootstrap(weldEar, new RunSpecificTest()
-// {
-// public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
-// {
-// Object mc = getBean("SimpleBean");
-// assertNotNull(mc);
-// Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
-// assertSame(mc, assertWebBean(manager, unit, mc));
-//
-// Method m = weldBean.getClass().getMethod("getSimpleBean");
-// Object injectedBean = m.invoke(weldBean);
-// assertNotNull(injectedBean);
-// assertSame(mc, injectedBean);
-// }
-// });
-// }
-// finally
-// {
-// undeploy(mc);
-// }
-// }
+ public void testExternalMcBeanInjectedIntoWeld2() throws Exception
+ {
+ AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
+ addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
+ createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
+ Deployment mc = deploy(mcEar);
+
+ undeploy(mc);
+
+ AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
+ addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
+ createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
+
+ try
+ {
+ testBootstrap(weldEar, null);
+ fail("Weld deployment should not have worked without mc deployment");
+ }
+ catch(Exception expected)
+ {
+ }
+
+ mc = deploy(mcEar);
+ try
+ {
+ testBootstrap(weldEar, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ Object mc = getBean("SimpleBean");
+ assertNotNull(mc);
+ Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
+ assertSame(mc, assertWebBean(manager, unit, mc));
+
+ Method m = weldBean.getClass().getMethod("getSimpleBean");
+ Object injectedBean = m.invoke(weldBean);
+ assertNotNull(injectedBean);
+ assertSame(mc, injectedBean);
+ }
+ });
+ }
+ finally
+ {
+ undeploy(mc);
+ }
+ }
protected void testBootstrap(VirtualFile ear, RunSpecificTest test) throws Exception
{
@@ -378,4 +378,4 @@
void runTest(BeanManager manager, DeploymentUnit unit) throws Exception;
}
-}
\ No newline at end of file
+}
More information about the jboss-cvs-commits
mailing list