[jboss-cvs] JBossAS SVN: r60343 - branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test.

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

Author: dimitris at jboss.org
Date: 2007-02-06 15:18:49 -0500 (Tue, 06 Feb 2007)
New Revision: 60343

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/UIL2JBossMQUnitTestCase.java
Log:
JBAS-4074, the execution order of tests in this test case is important

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java	2007-02-06 19:48:06 UTC (rev 60342)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/JBossMQUnitTest.java	2007-02-06 20:18:49 UTC (rev 60343)
@@ -51,6 +51,9 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.apache.log4j.Category;
 import org.jboss.test.JBossTestCase;
 
@@ -63,6 +66,7 @@
  *
  * @author Hiram Chirino <Cojonudo14 at hotmail.com>
  * @author Scott.Stark at jboss.org
+ * @author Dimitris.Andreadis at jboss.org
  * @version $Revision$
  */
 public class JBossMQUnitTest extends JBossTestCase
@@ -81,6 +85,34 @@
    static QueueConnection queueConnection;
    static TopicConnection topicConnection;
 
+   public static Test suite() throws Exception
+   {
+      // JBAS-4074, 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 JBossMQUnitTest("testQueueMessageOrder"));
+      suite.addTest(new JBossMQUnitTest("testRequestReplyQueue"));
+      suite.addTest(new JBossMQUnitTest("testTemporaryQueueDelete"));
+      suite.addTest(new JBossMQUnitTest("testTemporaryTopicDelete"));
+      suite.addTest(new JBossMQUnitTest("testInvalidDestinationQueueSend"));
+      suite.addTest(new JBossMQUnitTest("testInvalidDestinationQueueBrowse"));
+      suite.addTest(new JBossMQUnitTest("testInvalidDestinationTopicPublish"));
+      suite.addTest(new JBossMQUnitTest("testErrorsTopicSubscribe"));
+      suite.addTest(new JBossMQUnitTest("testCreateQueue"));
+      suite.addTest(new JBossMQUnitTest("testMessageListener"));
+      suite.addTest(new JBossMQUnitTest("testApplicationServerStuff"));
+      suite.addTest(new JBossMQUnitTest("testTopics"));
+      suite.addTest(new JBossMQUnitTest("testTopicNoLocal"));
+      suite.addTest(new JBossMQUnitTest("testTopicNoLocalBounce"));
+      suite.addTest(new JBossMQUnitTest("testTopicSelectorChange"));
+      suite.addTest(new JBossMQUnitTest("testTopicSelectorNullOrEmpty"));
+      suite.addTest(new JBossMQUnitTest("testSendReceiveOutdated"));
+      suite.addTest(new JBossMQUnitTest("testSendReceiveExpired"));
+      suite.addTest(new JBossMQUnitTest("testSendListenOutdated"));
+      
+      return suite;
+   }
+
    public JBossMQUnitTest(String name) throws Exception
    {
       super(name);

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/UIL2JBossMQUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/UIL2JBossMQUnitTestCase.java	2007-02-06 19:48:06 UTC (rev 60342)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/jbossmq/test/UIL2JBossMQUnitTestCase.java	2007-02-06 20:18:49 UTC (rev 60343)
@@ -26,13 +26,11 @@
 
 import org.jboss.test.JBossTestSetup;
 
-
 /**
  * JBossMQ tests over UIL2
  * @author Hiram Chirino <Cojonudo14 at hotmail.com>
  */
-public class UIL2JBossMQUnitTestCase
-   extends JBossMQUnitTest
+public class UIL2JBossMQUnitTestCase extends JBossMQUnitTest
 {
    public UIL2JBossMQUnitTestCase(String name) throws Exception
    {
@@ -43,7 +41,7 @@
    {
       TestSuite suite = new TestSuite();
       
-      suite.addTest(new JBossTestSetup(new TestSuite(UIL2JBossMQUnitTestCase.class))
+      suite.addTest(new JBossTestSetup(JBossMQUnitTest.suite())
       {
          protected void setUp() throws Exception
          {