[jboss-cvs] JBossAS SVN: r93997 - projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test.

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

Author: kabir.khan at jboss.com
Date: 2009-09-24 13:31:34 -0400 (Thu, 24 Sep 2009)
New Revision: 93997

Modified:
   projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAsynchronousTestCase.txt
   projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAutomaticTestCase.txt
Log:
[JBKERNEL-25] Don't reuse the event to be signalled. This is a workaround for BYTEMAN-38

Modified: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAsynchronousTestCase.txt
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAsynchronousTestCase.txt	2009-09-24 17:30:18 UTC (rev 93996)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAsynchronousTestCase.txt	2009-09-24 17:31:34 UTC (rev 93997)
@@ -1,15 +1,30 @@
-RULE Wait for Complete following deploy on main thread
+RULE Wait for Bean1 to be installed
 CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
 METHOD deploy(java.net.URL)
 HELPER org.jboss.test.kernel.asynchronous.support.Helper
 AT EXIT
 BIND NOTHING
-IF TRUE
+#This should be triggered on 2nd call to deploy()
+IF 1 == readCounter("Deploy")
 DO debug("wait in deploy"),
-   waitFor("Complete", 10000),
+   waitFor("Installed", 10000),
    debug("go!!!")
 ENDRULE
 
+RULE Wait for Bean1 to be instantiated
+CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
+METHOD deploy(java.net.URL)
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+AT EXIT
+BIND NOTHING
+#This should be triggered on 1st call to deploy()
+IF 0 == readCounter("Deploy")
+DO debug("wait in deploy"),
+   debug("Counter is now " + incrementCounter("Deploy")),
+   waitFor("Instantiated", 10000),
+   debug("go!!!")
+ENDRULE
+
 RULE Signal Complete for Bean1 in InstantiateAction
 CLASS org.jboss.kernel.plugins.dependency.InstantiateAction
 METHOD installActionInternal(KernelControllerContext)
@@ -18,7 +33,7 @@
 BIND ctx:KernelControllerContext = $1
 IF ctx.getName().equals("Bean1")
 DO debug("signalling wake"),
-   signalWake("Complete", true),
+   signalWake("Instantiated", true),
    debug("signalled!")
 ENDRULE
 
@@ -30,7 +45,7 @@
 BIND ctx:KernelControllerContext = $1
 IF ctx.getName().equals("Bean1")
 DO debug("signalling wake"),
-   signalWake("Complete", true),
+   signalWake("Installed", true),
    debug("signalled!")
 ENDRULE
 

Modified: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAutomaticTestCase.txt
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAutomaticTestCase.txt	2009-09-24 17:30:18 UTC (rev 93996)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAutomaticTestCase.txt	2009-09-24 17:31:34 UTC (rev 93997)
@@ -1,27 +1,60 @@
-RULE Wait for Complete following deploy on main thread
+RULE Increment deploy counter
 CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
 METHOD deploy(java.net.URL)
 HELPER org.jboss.test.kernel.asynchronous.support.Helper
+BIND NOTHING
+IF -1 < incrementCounter("Deploy")
+DO debug("Counter " + readCounter("Deploy"))
+ENDRULE
+
+RULE Wait for Complete1 following 1st deploy on main thread
+CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
+METHOD deploy(java.net.URL)
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
 AT EXIT
 BIND NOTHING
-IF TRUE
+IF 1 == readCounter("Deploy")
 DO debug("wait in deploy"),
-   waitFor("Complete", 10000),
+   waitFor("Complete1", 10000),
    debug("go!!!")
 ENDRULE
 
-RULE Signal wake Complete following complete deploy in thread
+RULE Wait for Complete2 following 2nd deploy on main thread
+CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
+METHOD deploy(java.net.URL)
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+AT EXIT
+BIND NOTHING
+IF 2 == readCounter("Deploy")
+DO debug("wait in deploy"),
+   waitFor("Complete2", 10000),
+   debug("go!!!")
+ENDRULE
+
+RULE Signal wake Complete1 following complete deploy in thread
 CLASS org.jboss.dependency.plugins.AbstractController$InstallControllerContextTask 
 METHOD run
 HELPER org.jboss.test.kernel.asynchronous.support.Helper
 AT EXIT
 BIND NOTHING
-IF TRUE
-DO debug("signalling wake in AbstractController$InstallControllerContextTask"),
-   signalWake("Complete", true),
+IF 1 == readCounter("Deploy")
+DO debug("signalling wake Complete1 in AbstractController$InstallControllerContextTask"),
+   signalWake("Complete1", true),
    debug("signalled!")
 ENDRULE
 
+RULE Signal wake Complete1 following complete deploy in thread
+CLASS org.jboss.dependency.plugins.AbstractController$InstallControllerContextTask 
+METHOD run
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+AT EXIT
+BIND NOTHING
+IF 2 == readCounter("Deploy")
+DO debug("signalling wake Complete1 in AbstractController$InstallControllerContextTask"),
+   signalWake("Complete2", true),
+   debug("signalled!")
+ENDRULE
+
 RULE Mark PreInstallAction
 CLASS org.jboss.kernel.plugins.dependency.PreInstallAction
 METHOD installActionInternal(KernelControllerContext)