[jboss-svn-commits] JBL Code SVN: r18799 - labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba.

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

Author: adinn
Date: 2008-03-10 09:53:14 -0400 (Mon, 10 Mar 2008)
New Revision: 18799

Modified:
   labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiCancel.java
   labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiClose.java
Log:
fixed remaining two BA tests which were failing. changes for JBTM-339

Modified: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiCancel.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiCancel.java	2008-03-10 13:53:05 UTC (rev 18798)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiCancel.java	2008-03-10 13:53:14 UTC (rev 18799)
@@ -68,8 +68,8 @@
 	    try {
 	    uba.cancel();
         } catch (SystemException ex) {
-            // we should get here
-            assertTrue(p.passed());
+            // failure will result in heuristic hazard warning message but wil not throw an exception
+            throw ex;
         } catch (Exception eouter) {
             try {
                 uba.cancel();
@@ -77,6 +77,6 @@
             }
             throw eouter;
         }
-        fail("expected SystemError");
+        assertTrue(p.passed());
     }
 }

Modified: labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiClose.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiClose.java	2008-03-10 13:53:05 UTC (rev 18798)
+++ labs/jbosstm/trunk/XTS/WSTX/tests/classes/com/arjuna/wst/tests/junit/ba/MultiClose.java	2008-03-10 13:53:14 UTC (rev 18799)
@@ -76,6 +76,7 @@
         } catch (SystemException ex) {
             // we should get here
             assertTrue(p.passed());
+            return;
         } catch (Exception eouter) {
             try {
                 uba.cancel();