[jboss-cvs] JBossAS SVN: r95928 - projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test.

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

Author: alesj
Date: 2009-11-02 12:31:18 -0500 (Mon, 02 Nov 2009)
New Revision: 95928

Modified:
   projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
Log:
Extract bm context.

Modified: projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
===================================================================
--- projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java	2009-11-02 17:29:10 UTC (rev 95927)
+++ projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java	2009-11-02 17:31:18 UTC (rev 95928)
@@ -54,6 +54,13 @@
 
    protected void testBootstrap(VirtualFile ear) throws Exception
    {
+      // 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);
@@ -82,7 +89,6 @@
 
             // test jndi binding
             duSimpleName = earDU.getSimpleName();
-            Context bmContext = assertInstanceOf(CheckableJndiBinderDeployer.ROOT.lookup(CheckableJndiBinderDeployer.BEAN_MANAGER_JNDI_SUBCONTEXT), Context.class, false);
             Context context = assertInstanceOf(bmContext.lookup(duSimpleName), Context.class, false);
             assertSame(bootstrap, context.lookup("bootstrap"));
          }
@@ -97,7 +103,6 @@
          mainDeployer.process();
 
          // clear binding
-         Context bmContext = assertInstanceOf(CheckableJndiBinderDeployer.ROOT.lookup(CheckableJndiBinderDeployer.BEAN_MANAGER_JNDI_SUBCONTEXT), Context.class, false);
          assertNull(bmContext.lookup(duSimpleName));
       }
       assertTrue(invoke(bootstrap, "Shutdown"));