[jboss-svn-commits] JBL Code SVN: r24979 - labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CurrentTests01.

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

Author: jhalliday
Date: 2009-01-28 12:26:05 -0500 (Wed, 28 Jan 2009)
New Revision: 24979

Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CurrentTests01/Test35.java
Log:
Update test to reflect new exception throwing behaviour of the JTS. JBTM-477


Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CurrentTests01/Test35.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CurrentTests01/Test35.java	2009-01-28 16:48:49 UTC (rev 24978)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/CurrentTests01/Test35.java	2009-01-28 17:26:05 UTC (rev 24979)
@@ -61,6 +61,7 @@
 import org.jboss.jbossts.qa.Utils.ORBInterface;
 import org.jboss.jbossts.qa.Utils.OTS;
 import org.omg.CORBA.INVALID_TRANSACTION;
+import org.omg.CORBA.TRANSACTION_ROLLEDBACK;
 
 public class Test35
 {
@@ -121,7 +122,7 @@
 
 				System.err.println("Client: Trying commit (expect INVALID_TRANSACTION exception)...");
 				current.commit(true);
-				System.err.println("Client: Commit OK - Warning: Expected INVALID_TRANSACTION exception to be thrown");
+				System.err.println("Client: Commit OK - Warning: Expected INVALID_TRANSACTION or TRANSACTION_ROLLEDBACK exception to be thrown");
 				System.err.println("Client: Test should fail");
 				correct = false;
 			}
@@ -129,6 +130,10 @@
 			{
 				System.err.println("Client: Caught INVALID_TRANSACTION exception");
 			}
+            catch(TRANSACTION_ROLLEDBACK transactionRolledback)
+            {
+                System.out.println("Client: Caught TRANSACTION_ROLLEDBACK exception");
+            }
 			catch (Exception exception)
 			{
 				System.err.println("Client: Caught unexpected exception: " + exception);