[jboss-cvs] JBossAS SVN: r95927 - in projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers: test and 1 other directory.

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

Author: alesj
Date: 2009-11-02 12:29:10 -0500 (Mon, 02 Nov 2009)
New Revision: 95927

Modified:
   projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java
   projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
Log:
Use BM context.

Modified: projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java
===================================================================
--- projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java	2009-11-02 17:23:53 UTC (rev 95926)
+++ projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/support/deployer/CheckableJndiBinderDeployer.java	2009-11-02 17:29:10 UTC (rev 95927)
@@ -48,15 +48,15 @@
 
    public void bind(Object bootstrapBean, String deploymentUnitName) throws NamingException
    {
-      Context context = ROOT.createSubcontext(deploymentUnitName);
+      Context context = getBeanManagerContext().createSubcontext(deploymentUnitName);
       context.bind("bootstrap", bootstrapBean);
    }
 
    public void unbind(Object bootstrapBean, String deploymentUnitName) throws NamingException
    {
-      Context context = (Context)ROOT.lookup(deploymentUnitName);
+      Context context = (Context)getBeanManagerContext().lookup(deploymentUnitName);
       context.unbind("bootstrap");
 
-      ROOT.destroySubcontext(deploymentUnitName);
+      getBeanManagerContext().destroySubcontext(deploymentUnitName);
    }
 }
\ No newline at end of file

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:23:53 UTC (rev 95926)
+++ projects/weld-int/trunk/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java	2009-11-02 17:29:10 UTC (rev 95927)
@@ -82,7 +82,8 @@
 
             // test jndi binding
             duSimpleName = earDU.getSimpleName();
-            Context context = assertInstanceOf(CheckableJndiBinderDeployer.ROOT.lookup(duSimpleName), Context.class, false);
+            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"));
          }
          finally
@@ -96,7 +97,8 @@
          mainDeployer.process();
 
          // clear binding
-         assertNull(CheckableJndiBinderDeployer.ROOT.lookup(duSimpleName));
+         Context bmContext = assertInstanceOf(CheckableJndiBinderDeployer.ROOT.lookup(CheckableJndiBinderDeployer.BEAN_MANAGER_JNDI_SUBCONTEXT), Context.class, false);
+         assertNull(bmContext.lookup(duSimpleName));
       }
       assertTrue(invoke(bootstrap, "Shutdown"));
    }