[jboss-cvs] JBossAS SVN: r101936 - in trunk/testsuite/src/main/org/jboss/test/jbossts: recovery and 1 other directory.

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

Author: istudens at redhat.com
Date: 2010-03-05 04:26:59 -0500 (Fri, 05 Mar 2010)
New Revision: 101936

Modified:
   trunk/testsuite/src/main/org/jboss/test/jbossts/JTSContextPropagation01/TestContextPropagation.java
   trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASFailureMode.java
   trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASTestResource.java
Log:
fixed iiop-pre_prepare_ejbexception scenario, JBQA-2604

Modified: trunk/testsuite/src/main/org/jboss/test/jbossts/JTSContextPropagation01/TestContextPropagation.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossts/JTSContextPropagation01/TestContextPropagation.java	2010-03-05 06:19:15 UTC (rev 101935)
+++ trunk/testsuite/src/main/org/jboss/test/jbossts/JTSContextPropagation01/TestContextPropagation.java	2010-03-05 09:26:59 UTC (rev 101936)
@@ -20,6 +20,7 @@
  */
 package org.jboss.test.jbossts.JTSContextPropagation01;
 
+import org.jboss.test.jbossts.recovery.ASFailureMode;
 import org.jboss.test.jbossts.recovery.ASFailureSpec;
 import org.jboss.test.jbossts.taskdefs.JUnitClientTest;
 import org.jboss.test.jbossts.taskdefs.TransactionLog;
@@ -80,6 +81,7 @@
    private Set<RecoveredXid>    existingXidsInDoubtServer1;
    private boolean              expectFailureNode0 = false;
    private boolean              expectFailureNode1 = false;
+   private boolean              expectException = false;
 
    private String   serverName0 = "default";
    private String   serverName1 = "default";
@@ -301,11 +303,11 @@
       }
       catch (Throwable t)
       {
-         if (t instanceof EJBTransactionRolledbackException
+         if (expectException ||
+             (t instanceof EJBTransactionRolledbackException
                || t instanceof java.rmi.ServerException
-               || t instanceof javax.ejb.EJBException
                || t instanceof org.jboss.tm.JBossTransactionRolledbackException
-               || t instanceof javax.transaction.TransactionRolledbackException)
+               || t instanceof javax.transaction.TransactionRolledbackException))
          {
             // try to recover, this failure was expected (maybe?!)
             print("Failure was expected (maybe?): " + t.getMessage());
@@ -399,7 +401,7 @@
          print("waiting for " + pendingUids0 + " branches on server0");
          print("waiting for " + pendingXidsInDoubt0 + " txs in doubt on server0");
          print("waiting for " + pendingUids1 + " branches on server1");
-         print("waiting for " + pendingXidsInDoubt1 + " txs in doubt on server1");
+         print("waiting for " + pendingXidsInDoubt1 + " txs in doubt on server1\n");
 
          suspendFor(retryPeriod);
          maxWait -= retryPeriod;
@@ -636,6 +638,10 @@
             else if ("specs1".equals(specKey))
                expectFailureNode1 = true;
          }
+         else if (spec != null && ASFailureMode.EJBEXCEPTION.equals(spec.getMode()))
+         {
+            expectException = true;
+         }
 
          sb.append("\t").append(name).append('\n');
       }

Modified: trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASFailureMode.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASFailureMode.java	2010-03-05 06:19:15 UTC (rev 101935)
+++ trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASFailureMode.java	2010-03-05 09:26:59 UTC (rev 101936)
@@ -71,6 +71,18 @@
        }
    }
 
+   public boolean isException()
+   {
+       switch (mode)
+       {
+          case _XAEXCEPTION:
+          case _EJBEXCEPTION:
+             return true;
+          default:
+             return false;
+       }
+   }
+
    /* enum like methods */
    public String name()
    {

Modified: trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASTestResource.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASTestResource.java	2010-03-05 06:19:15 UTC (rev 101935)
+++ trunk/testsuite/src/main/org/jboss/test/jbossts/recovery/ASTestResource.java	2010-03-05 09:26:59 UTC (rev 101936)
@@ -364,6 +364,6 @@
 
    public boolean expectException()
    {
-      return _xaFailureMode.equals(ASFailureMode.XAEXCEPTION) || _xaFailureMode.equals(ASFailureMode.EJBEXCEPTION);
+      return _xaFailureMode.isException();
    }
 }