[jboss-svn-commits] JBL Code SVN: r25495 - in labs/jbosstm/trunk/XTS/sar/tests: src/org/jboss/jbossts/xts/servicetests/service and 1 other directory.

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

Author: adinn
Date: 2009-03-04 11:44:04 -0500 (Wed, 04 Mar 2009)
New Revision: 25495

Modified:
   labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt
   labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java
Log:
latest test for subordinate AT transaction code which exercises the code but uses the wrong model -- needs to use a service which install a subordinate AT context in teh context handler and parcel up the usbordinate tx commands as a block of commands -- partially fixes JBTM-447

Modified: labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt	2009-03-04 16:38:01 UTC (rev 25494)
+++ labs/jbosstm/trunk/XTS/sar/tests/dd/scripts/ATSubordinateCrashDuringCommit.txt	2009-03-04 16:44:04 UTC (rev 25495)
@@ -515,10 +515,10 @@
 # (SubordinateDurable2PCStub) returns from sending a commit message. It
 # traces the call.
 
-RULE trace subordinate participant stub prepare
+RULE trace subordinate participant stub commit return
 CLASS com.arjuna.wst11.stub.SubordinateDurable2PCStub
 METHOD commit
-AFTER INVOKE commit 2
+AT EXIT
 BIND NOTHING
 IF TRUE
 DO debug("commit completed for pseudo-participant " + $0),
@@ -541,6 +541,21 @@
 ENDRULE
 
 #######################################################################
+# This rule is triggered when a subordinate coordinator
+# (SubordinateCoordinator) is requested to perform a commit. It
+# traces the call.
+
+RULE trace subordinate coordinator commit
+CLASS com.arjuna.mwlabs.wscf.model.twophase.arjunacore.subordinate.SubordinateCoordinator
+METHOD commit
+AT EXIT
+BIND NOTHING
+IF TRUE
+DO debug("commit completed for subordinate coordinator " + $0),
+   traceln("log", "commit completed for subordinate coordinator " + $0)
+ENDRULE
+
+#######################################################################
 # This rule is triggered when the recovery system finds a PREPARED
 # activity in the log and reruns the phase 2 commit operation.
 # It prints a message which can be used to verify that the test has

Modified: labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java
===================================================================
--- labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java	2009-03-04 16:38:01 UTC (rev 25494)
+++ labs/jbosstm/trunk/XTS/sar/tests/src/org/jboss/jbossts/xts/servicetests/service/XTSServiceTestPortTypeImpl.java	2009-03-04 16:44:04 UTC (rev 25495)
@@ -283,6 +283,10 @@
             }
         } else if (command.equals("subtransaction")) {
 // create subordinate AT transaction
+// this needs replacing since we should really be running against a service which uses
+// the subordinate interposition JaxWS handler to install a subordinate transaction before
+// entering the service method. we ought to test that handler rather than hand crank the
+// interposition in the service
             TxContext currentTx;
             TxContext newTx;
             try {