[jboss-cvs] JBossAS SVN: r60127 - in trunk/testsuite/src/main/org/jboss/test/jbossmessaging: ra and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2007-01-30 22:41:04 -0500 (Tue, 30 Jan 2007)
New Revision: 60127

Modified:
   trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java
Log:
Fixing testcases

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java	2007-01-31 02:01:00 UTC (rev 60126)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/perf/ReceiveNackClientStressTestCase.java	2007-01-31 03:41:04 UTC (rev 60127)
@@ -127,12 +127,12 @@
          }
          finally
          {
+            drainQueue("Impatient") ;
             queueConnection.close();
          }
       }
       finally
       {
-	 drainQueue("Impatient") ;
          deleteQueue("Impatient");
       }
    }

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java	2007-01-31 02:01:00 UTC (rev 60126)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaJMSSessionUnitTestCase.java	2007-01-31 03:41:04 UTC (rev 60127)
@@ -64,6 +64,7 @@
       {
          protected void setUp() throws Exception
          {
+            super.setUp();
             ClassLoader loader = Thread.currentThread().getContextClassLoader();
 	    String resourceName = getJMSResourceRelativePathname("test-destinations-service.xml") ;
             deploy (loader.getResource(resourceName).toString());
@@ -75,6 +76,7 @@
             String resourceName = getJMSResourceRelativePathname("test-destinations-service.xml") ;
             undeploy ("jmsra.jar");
             undeploy (loader.getResource(resourceName).toString());
+            super.tearDown();
          }
       });
 

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java	2007-01-31 02:01:00 UTC (rev 60126)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaSyncRecUnitTestCase.java	2007-01-31 03:41:04 UTC (rev 60127)
@@ -195,20 +195,10 @@
 
              protected void tearDown() throws Exception
              {
-                super.tearDown();
-
-                // Remove the messages
-		// richard.achmatowicz: why do we need to drain a Queue before we undeploy it?
-                //getServer().invoke
-                //(
-                //   new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
-                //   "removeAllMessages",
-                //   new Object[0],
-                //   new String[0]
-                //);
                 ClassLoader loader = Thread.currentThread().getContextClassLoader();
 		String resourceName = getJMSResourceRelativePathname("test-destinations-full-service.xml") ;
                 undeploy (loader.getResource(resourceName).toString());
+                super.tearDown();
              }
           };
    }

Modified: trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java	2007-01-31 02:01:00 UTC (rev 60126)
+++ trunk/testsuite/src/main/org/jboss/test/jbossmessaging/ra/RaTest.java	2007-01-31 03:41:04 UTC (rev 60127)
@@ -172,17 +172,10 @@
 
       // Create a publisher
       Context context = getInitialContext();
-      try
-      {
-         PublisherHome home = (PublisherHome)context.lookup(beanJNDI);
-         publisher = home.create();
+      PublisherHome home = (PublisherHome)context.lookup(beanJNDI);
+      publisher = home.create();
 
-         init(context);
-      }
-      finally
-      {
-         context.close();
-      }
+      init(context);
 
       // start up the session
       connection.start();