[Jboss-cvs] JBossAS SVN: r56712 - branches/Branch_4_0/testsuite/src/main/org/jboss/test/exception

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

Author: dimitris at jboss.org
Date: 2006-09-11 06:01:32 -0400 (Mon, 11 Sep 2006)
New Revision: 56712

Modified:
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/exception/EntityExceptionUnitTestCase.java
Log:
JBAS-3492, the execution order of tests in this test case is important so it must be defined explicitly when running under some JVMs

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/exception/EntityExceptionUnitTestCase.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/exception/EntityExceptionUnitTestCase.java	2006-09-11 09:29:41 UTC (rev 56711)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/exception/EntityExceptionUnitTestCase.java	2006-09-11 10:01:32 UTC (rev 56712)
@@ -1,27 +1,28 @@
 /*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.test.exception;
 
 import java.rmi.RemoteException;
+
 import javax.ejb.EJBException;
 import javax.ejb.FinderException;
 import javax.ejb.TransactionRolledbackLocalException;
@@ -29,7 +30,8 @@
 import javax.transaction.TransactionRolledbackException;
 
 import junit.framework.Test;
-import org.apache.log4j.Category;
+import junit.framework.TestSuite;
+
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.util.ejb.EJBTestCase;
 
@@ -37,7 +39,72 @@
 {
    public static Test suite() throws Exception
    {
-      return JBossTestCase.getDeploySetup(EntityExceptionUnitTestCase.class, "exception.jar");
+      // JBAS-3492, the execution order of tests in this test case is important
+      // so it must be defined explicitly when running under some JVMs
+      TestSuite suite = new TestSuite();
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionInTxMarkRollback_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationErrorInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedApplicationErrorInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testEJBExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedEJBExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRuntimeExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRuntimeExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRemoteExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRemoteExceptionInTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionNewTxMarkRollback_remote"));
+      //suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionNewTxMarkRollback_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationErrorNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedApplicationErrorNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testEJBExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedEJBExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRuntimeExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRuntimeExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRemoteExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRemoteExceptionNewTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationErrorNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedApplicationErrorNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testEJBExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedEJBExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRuntimeExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRuntimeExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRemoteExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRemoteExceptionNoTx_remote"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionInTxMarkRollback_local"));
+      //suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionInTxMarkRollback_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationErrorInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedApplicationErrorInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testEJBExceptionInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedEJBExceptionInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRuntimeExceptionInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRuntimeExceptionInTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionNewTxMarkRollback_local"));
+      //suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionNewTxMarkRollback_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationErrorNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedApplicationErrorNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testEJBExceptionNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedEJBExceptionNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testRuntimeExceptionNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRuntimeExceptionNewTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationExceptionNoTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testNotDiscardedApplicationExceptionNoTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testApplicationErrorNoTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedApplicationErrorNoTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testEJBExceptionNoTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedEJBExceptionNoTx_local"));      
+      suite.addTest(new EntityExceptionUnitTestCase("testRuntimeExceptionNoTx_local"));
+      suite.addTest(new EntityExceptionUnitTestCase("testDiscardedRuntimeExceptionNoTx_local"));
+
+      return JBossTestCase.getDeploySetup(suite, "exception.jar");   
    }
 
    public EntityExceptionUnitTestCase(String name)
@@ -45,8 +112,6 @@
       super(name);
    }
 
-   private Category log = Category.getInstance(getClass());
-
    private EntityExceptionTesterHome exceptionTesterHome;
 
    private EntityExceptionTesterLocalHome exceptionTesterLocalHome;