[jboss-svn-commits] JBL Code SVN: r29403 - labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 18 06:28:45 EDT 2009
Author: mark.little at jboss.com
Date: 2009-09-18 06:28:45 -0400 (Fri, 18 Sep 2009)
New Revision: 29403
Modified:
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client011.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client012.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client013.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client014.java
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client015.java
Log:
https://jira.jboss.org/jira/browse/JBTM-605
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client011.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client011.java 2009-09-18 10:19:31 UTC (rev 29402)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client011.java 2009-09-18 10:28:45 UTC (rev 29403)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
import org.omg.CosTransactions.HeuristicHazard;
import org.omg.CosTransactions.HeuristicMixed;
@@ -108,6 +109,9 @@
System.err.println("Commit succeeded when it shouldn't");
correct = false;
}
+ catch (final TRANSACTION_ROLLEDBACK ex)
+ {
+ }
catch (HeuristicMixed heuristicMixed)
{
}
@@ -125,7 +129,7 @@
ResourceTrace resourceTrace2 = service2.get_resource_trace(0);
correct = correct && (resourceTrace1 == ResourceTrace.ResourceTracePrepareCommitForget);
- correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareCommit);
+ correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareRollback);
if (correct)
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client012.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client012.java 2009-09-18 10:19:31 UTC (rev 29402)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client012.java 2009-09-18 10:28:45 UTC (rev 29403)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
import org.omg.CosTransactions.HeuristicHazard;
public class Client012
@@ -107,6 +108,9 @@
System.err.println("Commit succeeded when it shouldn't");
correct = false;
}
+ catch (final TRANSACTION_ROLLEDBACK ex)
+ {
+ }
catch (HeuristicHazard heuristicHazard)
{
}
@@ -121,7 +125,7 @@
ResourceTrace resourceTrace2 = service2.get_resource_trace(0);
correct = correct && (resourceTrace1 == ResourceTrace.ResourceTracePrepareCommitForget);
- correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareCommit);
+ correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareRollback);
if (correct)
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client013.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client013.java 2009-09-18 10:19:31 UTC (rev 29402)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client013.java 2009-09-18 10:28:45 UTC (rev 29403)
@@ -96,6 +96,8 @@
boolean correct = true;
+ System.err.println("**running");
+
OTS.current().begin();
service1.oper(resourceBehaviors1);
@@ -122,7 +124,7 @@
ResourceTrace resourceTrace2 = service2.get_resource_trace(0);
correct = correct && (resourceTrace1 == ResourceTrace.ResourceTracePrepareCommitForget);
- correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareCommitForget);
+ correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareRollback);
if (correct)
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client014.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client014.java 2009-09-18 10:19:31 UTC (rev 29402)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client014.java 2009-09-18 10:28:45 UTC (rev 29403)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
import org.omg.CosTransactions.HeuristicHazard;
import org.omg.CosTransactions.HeuristicMixed;
@@ -108,6 +109,9 @@
System.err.println("Commit succeeded when it shouldn't");
correct = false;
}
+ catch (final TRANSACTION_ROLLEDBACK ex)
+ {
+ }
catch (HeuristicMixed heuristicMixed)
{
}
@@ -123,9 +127,9 @@
ResourceTrace resourceTrace1 = service1.get_resource_trace(0);
ResourceTrace resourceTrace2 = service2.get_resource_trace(0);
-
+
correct = correct && (resourceTrace1 == ResourceTrace.ResourceTracePrepareCommitForget);
- correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareCommitForget);
+ correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareRollback);
if (correct)
{
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client015.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client015.java 2009-09-18 10:19:31 UTC (rev 29402)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/RawResources01Clients2/Client015.java 2009-09-18 10:28:45 UTC (rev 29403)
@@ -62,6 +62,7 @@
import org.jboss.jbossts.qa.Utils.ORBInterface;
import org.jboss.jbossts.qa.Utils.OTS;
import org.jboss.jbossts.qa.Utils.ServerIORStore;
+import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
import org.omg.CosTransactions.HeuristicHazard;
public class Client015
@@ -107,6 +108,9 @@
System.err.println("Commit succeeded when it shouldn't");
correct = false;
}
+ catch (final TRANSACTION_ROLLEDBACK ex)
+ {
+ }
catch (HeuristicHazard heuristicHazard)
{
}
@@ -121,7 +125,7 @@
ResourceTrace resourceTrace2 = service2.get_resource_trace(0);
correct = correct && (resourceTrace1 == ResourceTrace.ResourceTracePrepareCommitForget);
- correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareCommitForget);
+ correct = correct && (resourceTrace2 == ResourceTrace.ResourceTracePrepareRollback);
if (correct)
{
More information about the jboss-svn-commits
mailing list