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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Sep 28 08:11:32 EDT 2009 

Author: kabir.khan at jboss.com
Date: 2009-09-28 08:11:32 -0400 (Mon, 28 Sep 2009)
New Revision: 94059

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/AsynchronousContextWithDependencyOnOnDemandTestCase.txt
   projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AutomaticContextWithDependencyOnAsynchronousTestCase.txt
Log:
Tighten up tests

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-28 11:33:10 UTC (rev 94058)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnAutomaticTestCase.txt	2009-09-28 12:11:32 UTC (rev 94059)
@@ -1,60 +1,92 @@
-RULE Increment deploy counter
+RULE Increment deploy counter and init rendezvous
 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"))
+IF TRUE
+DO 
+   debug("Counter " + incrementCounter("Deploy")),
+   deleteRendezvous("StartThreads", 0),
+   createRendezvous("StartThreads", 2)
 ENDRULE
 
-RULE Wait for Complete1 following 1st deploy on main thread
+RULE Deploy end rendezvous making sure threads have started
 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
+DO
+   debug("StartThreads rendezvous in AbstractController$InstallControllerContextTask"),
+   rendezvous("StartThreads"),
+   debug("StartThreads rendezvous go!!!")
+ENDRULE
+
+#This should be triggered on 1st call to deploy() when we install Bean1, which will stop in the Instantiated stage since Bean2 has not yet been deployed
+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
 IF 1 == readCounter("Deploy")
-DO debug("wait in deploy"),
-   waitFor("Complete1", 10000),
+DO 
+   debug("wait in deploy"),
+   waitFor("Instantiated", 10000),
    debug("go!!!")
 ENDRULE
 
-RULE Wait for Complete2 following 2nd deploy on main thread
+#This should be triggered on 2nd call to deploy() when we install Bean2, which go through to Installed
+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 2 == readCounter("Deploy")
-DO debug("wait in deploy"),
-   waitFor("Complete2", 10000),
+DO 
+   debug("wait in deploy"),
+   waitFor("Installed", 10000),
    debug("go!!!")
 ENDRULE
 
-RULE Signal wake Complete1 following complete deploy in thread
+RULE Start threads rendezvous
 CLASS org.jboss.dependency.plugins.AbstractController$InstallControllerContextTask 
 METHOD run
 HELPER org.jboss.test.kernel.asynchronous.support.Helper
-AT EXIT
 BIND NOTHING
-IF 1 == readCounter("Deploy")
-DO debug("signalling wake Complete1 in AbstractController$InstallControllerContextTask"),
-   signalWake("Complete1", true),
-   debug("signalled!")
+IF TRUE
+DO 
+   debug("StartThreads rendezvous in AbstractController$InstallControllerContextTask"),
+   rendezvous("StartThreads"),
+   debug("StartThreads rendezvous go!!!")
 ENDRULE
 
-RULE Signal wake Complete1 following complete deploy in thread
-CLASS org.jboss.dependency.plugins.AbstractController$InstallControllerContextTask 
-METHOD run
+RULE Signal Bean1 instantiated
+CLASS org.jboss.dependency.plugins.AbstractController$ContextsInstalledByExecutor
+METHOD disassociateWithTask
 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!")
+BIND ctx = $1
+IF ctx.getName().equals("Bean1") AND ctx.getState().equals(org.jboss.dependency.spi.ControllerState.INSTANTIATED)
+DO 
+   debug("signalling Instantiated in AbstractController$ContextsInstalledByExecutor"),
+   signalWake("Instantiated", true),
+   debug("signalled!!!")
 ENDRULE
 
+RULE Signal Bean1 Installed
+CLASS org.jboss.dependency.plugins.AbstractController$ContextsInstalledByExecutor
+METHOD disassociateWithTask
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+BIND ctx = $1
+IF ctx.getName().equals("Bean1") AND ctx.getState().equals(org.jboss.dependency.spi.ControllerState.INSTALLED)
+DO 
+   debug("signalling Installed in AbstractController$ContextsInstalledByExecutor"),
+   signalWake("Installed", true),
+   debug("signalled!!!")
+ENDRULE
+
 RULE Mark PreInstallAction
 CLASS org.jboss.kernel.plugins.dependency.PreInstallAction
 METHOD installActionInternal(KernelControllerContext)

Modified: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnOnDemandTestCase.txt
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnOnDemandTestCase.txt	2009-09-28 11:33:10 UTC (rev 94058)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AsynchronousContextWithDependencyOnOnDemandTestCase.txt	2009-09-28 12:11:32 UTC (rev 94059)
@@ -1,27 +1,67 @@
-RULE Wait for the asynchronous deployments
+RULE Increment deploy counter and init rendezvous
 CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
 METHOD deploy(java.net.URL)
 HELPER org.jboss.test.kernel.asynchronous.support.Helper
+BIND NOTHING
+IF TRUE
+DO 
+   debug("Counter " + incrementCounter("Deploy")),
+   deleteRendezvous("StartThreads", 0),
+   createRendezvous("StartThreads", 2)
+ENDRULE
+
+RULE Deploy end rendezvous making sure threads have started
+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 !createCounter("Counter") && incrementCounter("Counter")==1
-DO debug("wait in deploy"),
-   waitFor("Complete", 10000),
-   debug("go!!!")
+IF 2 == readCounter("Deploy")
+DO
+   debug("StartThreads rendezvous in AbstractController$InstallControllerContextTask"),
+   rendezvous("StartThreads"),
+   debug("StartThreads rendezvous go!!!")
 ENDRULE
 
-RULE Signal Complete for Bean1 in InstallAction
-CLASS org.jboss.kernel.plugins.dependency.InstallAction
-METHOD installActionInternal(KernelControllerContext)
+
+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 ctx:KernelControllerContext = $1
-IF ctx.getName().equals("Bean1")
-DO debug("signalling wake"),
-   signalWake("Complete", true),
-   debug("signalled!")
+BIND NOTHING
+IF 2 == readCounter("Deploy")
+DO 
+   debug("wait in deploy"),
+   waitFor("Installed", 10000),
+   debug("go!!!")
 ENDRULE
 
+RULE Start threads rendezvous
+CLASS org.jboss.dependency.plugins.AbstractController$InstallControllerContextTask 
+METHOD run
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+BIND NOTHING
+IF NOT flagged("StartRV")
+DO 
+   flag("StartRV"),
+   debug("StartThreads rendezvous in AbstractController$InstallControllerContextTask"),
+   rendezvous("StartThreads"),
+   debug("StartThreads rendezvous go!!!")
+ENDRULE
+
+RULE Signal Bean1 Installed
+CLASS org.jboss.dependency.plugins.AbstractController$ContextsInstalledByExecutor
+METHOD disassociateWithTask
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+BIND ctx = $1
+IF ctx.getName().equals("Bean1") AND ctx.getState().equals(org.jboss.dependency.spi.ControllerState.INSTALLED)
+DO 
+   debug("signalling Installed in AbstractController$ContextsInstalledByExecutor"),
+   signalWake("Installed", true),
+   debug("signalled!!!")
+ENDRULE
+
 RULE Mark PreInstallAction
 CLASS org.jboss.kernel.plugins.dependency.PreInstallAction
 METHOD installActionInternal(KernelControllerContext)

Modified: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AutomaticContextWithDependencyOnAsynchronousTestCase.txt
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AutomaticContextWithDependencyOnAsynchronousTestCase.txt	2009-09-28 11:33:10 UTC (rev 94058)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/asynchronous/test/AutomaticContextWithDependencyOnAsynchronousTestCase.txt	2009-09-28 12:11:32 UTC (rev 94059)
@@ -1,3 +1,30 @@
+RULE Increment deploy counter and init rendezvous
+CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
+METHOD deploy(java.net.URL)
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+BIND NOTHING
+IF TRUE
+DO 
+   debug("Counter " + incrementCounter("Deploy")),
+   flag("StartRV"),
+   deleteRendezvous("StartThreads", 0),
+   createRendezvous("StartThreads", 2)
+ENDRULE
+
+RULE Deploy end rendezvous making sure threads have started
+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("StartThreads rendezvous in AbstractController$InstallControllerContextTask"),
+   rendezvous("StartThreads"),
+   debug("StartThreads rendezvous go!!!")
+ENDRULE
+
+
 RULE Wait for Complete following deploy on main thread
 CLASS org.jboss.test.kernel.junit.MicrocontainerTestDelegate 
 METHOD deploy(java.net.URL)
@@ -4,12 +31,24 @@
 HELPER org.jboss.test.kernel.asynchronous.support.Helper
 AT EXIT
 BIND NOTHING
-IF 1 < incrementCounter("Start")
+IF 2 == readCounter("Deploy")
 DO debug("wait in deploy"),
    waitFor("Complete", 10000),
    debug("go!!!")
 ENDRULE
 
+RULE Start threads rendezvous
+CLASS org.jboss.dependency.plugins.AbstractController$InstallControllerContextTask 
+METHOD run
+HELPER org.jboss.test.kernel.asynchronous.support.Helper
+BIND NOTHING
+IF flagged("StartRV")
+DO 
+   clear("StartRV"),
+   debug("StartThreads rendezvous in AbstractController$InstallControllerContextTask"),
+   rendezvous("StartThreads"),
+   debug("StartThreads rendezvous go!!!")
+ENDRULE
 
 RULE Signal wake Complete following complete deploy in thread
 CLASS org.jboss.dependency.plugins.AbstractController$InstallControllerContextTask

More information about the jboss-cvs-commits mailing list