[jboss-cvs] JBossAS SVN: r88647 - in projects/naming/trunk/naming-mc-int/src/test: resources/bootstrap and 1 other directory.

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

Author: alesj
Date: 2009-05-11 11:19:12 -0400 (Mon, 11 May 2009)
New Revision: 88647

Modified:
   projects/naming/trunk/naming-mc-int/src/test/java/org/jboss/test/naming/microcontainer/binding/test/JNDIBindingUnitTestCase.java
   projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml
Log:
Currently commit hack, so we at least have semi OnDemand working.

Modified: projects/naming/trunk/naming-mc-int/src/test/java/org/jboss/test/naming/microcontainer/binding/test/JNDIBindingUnitTestCase.java
===================================================================
--- projects/naming/trunk/naming-mc-int/src/test/java/org/jboss/test/naming/microcontainer/binding/test/JNDIBindingUnitTestCase.java	2009-05-11 15:14:46 UTC (rev 88646)
+++ projects/naming/trunk/naming-mc-int/src/test/java/org/jboss/test/naming/microcontainer/binding/test/JNDIBindingUnitTestCase.java	2009-05-11 15:19:12 UTC (rev 88647)
@@ -26,12 +26,14 @@
 
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.test.naming.microcontainer.BootstrapNamingTest;
 
 /**
  * PlainJNDIUnitTestCase.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
 public class JNDIBindingUnitTestCase extends BootstrapNamingTest
@@ -46,7 +48,7 @@
       super(name);
    }
    
-   public void testPlain() throws Exception
+   public void testPlain() throws Throwable
    {
       assertNoBinding("Test");
       KernelDeployment deployment = deploy("Plain.xml");
@@ -62,13 +64,14 @@
       }
    }
    
-   public void testOnDemand() throws Exception
+   public void testOnDemand() throws Throwable
    {
       assertNoBinding("Test");
       KernelDeployment deployment = deploy("OnDemand.xml");
       try
       {
-         getControllerContext("Test", ControllerState.PRE_INSTALL);
+         KernelControllerContext context = getControllerContext("Test", ControllerState.NOT_INSTALLED);
+         change(context, ControllerState.DESCRIBED); // FIXME; hack
          assertBinding("Test", "Hello");
          getControllerContext("Test", ControllerState.INSTALLED);
       }

Modified: projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml	2009-05-11 15:14:46 UTC (rev 88646)
+++ projects/naming/trunk/naming-mc-int/src/test/resources/bootstrap/bootstrap.xml	2009-05-11 15:19:12 UTC (rev 88647)
@@ -8,11 +8,11 @@
    </bean>
    
    <!-- Support for @JNDI -->
-   <lifecycle-preinstall xmlns="urn:jboss:aop-beans:1.0"
+   <lifecycle-describe xmlns="urn:jboss:aop-beans:1.0"
                name="JNDIPreInstallAdvice"
                class="org.jboss.naming.microcontainer.JNDIOnDemandLifecycleCallback"
                classes="@org.jboss.naming.microcontainer.JNDI">
-   </lifecycle-preinstall>
+   </lifecycle-describe>
    <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
                name="JNDIInstallAdvice"
                class="org.jboss.naming.microcontainer.JNDIInstallLifecycleCallback"