made xa tests run, and made QpidTestCase more robust

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@619974 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 31 insertions, 19 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATest.java b/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
index ba4ebae258..7c03e16258 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
@@ -28,7 +28,7 @@ import javax.jms.*;
  *
  *
  */
-public abstract  class AbstractXATest extends QpidTestCase
+public abstract  class AbstractXATestCase extends QpidTestCase
 {
     protected static final String _sequenceNumberPropertyName = "seqNumber";
 
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTests.java b/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java
index cd5b228f76..a703432efb 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTests.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java
@@ -26,10 +26,10 @@ import junit.framework.TestSuite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class QueueTests extends AbstractXATest
+public class QueueTest extends AbstractXATestCase
 {
     /* this clas logger */
-    private static final Logger _logger = LoggerFactory.getLogger(QueueTests.class);
+    private static final Logger _logger = LoggerFactory.getLogger(QueueTest.class);
 
     /**
      * the queue use by all the tests
@@ -66,7 +66,7 @@ public class QueueTests extends AbstractXATest
      */
     public static TestSuite getSuite()
     {
-        return new TestSuite(QueueTests.class);
+        return new TestSuite(QueueTest.class);
     }
 
     /**
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTests.java b/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java
index 30b3b09449..5ea059b166 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTests.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java
@@ -33,10 +33,10 @@ import org.slf4j.LoggerFactory;
  *
  *
  */
-public class TopicTests extends AbstractXATest
+public class TopicTest extends AbstractXATestCase
 {
     /* this clas logger */
-    private static final Logger _logger = LoggerFactory.getLogger(TopicTests.class);
+    private static final Logger _logger = LoggerFactory.getLogger(TopicTest.class);
 
     /**
      * the topic use by all the tests
@@ -81,7 +81,7 @@ public class TopicTests extends AbstractXATest
      */
     public static TestSuite getSuite()
     {
-        return new TestSuite(TopicTests.class);
+        return new TestSuite(TopicTest.class);
     }
 
     /**
@@ -1671,12 +1671,12 @@ public class TopicTests extends AbstractXATest
             long seq = 0;
             try
             {
-                seq = message.getLongProperty(TopicTests._sequenceNumberPropertyName);
+                seq = message.getLongProperty(TopicTest._sequenceNumberPropertyName);
             }
             catch (JMSException e)
             {
                 e.printStackTrace();
-                TopicTests.failure();
+                TopicTest.failure();
                 _lock.set(false);
                 synchronized (_lock)
                 {
@@ -1686,7 +1686,7 @@ public class TopicTests extends AbstractXATest
             if (seq != _counter)
             {
                 System.out.println("received message " + seq + " expected " + _counter);
-                TopicTests.failure();
+                TopicTest.failure();
                 _lock.set(false);
                 synchronized (_lock)
                 {
diff --git a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java b/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
index e7c09fca65..9ab8379855 100644
--- a/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
+++ b/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
@@ -59,16 +59,27 @@ public class QpidTestCase extends TestCase
     private InitialContext _initialContext;
     private AMQConnectionFactory _connectionFactory;
 
-    protected void setUp() throws Exception
+    public void runBare() throws Throwable
     {
-        super.setUp();
+        String name = getClass().getSimpleName() + "." + getName();
+        _logger.info("========== start " + name + " ==========");
         startBroker();
-    }
-
-    protected void tearDown() throws Exception
-    {
-        stopBroker();
-        super.tearDown();
+        try
+        {
+            super.runBare();
+        }
+        finally
+        {
+            try
+            {
+                stopBroker();
+            }
+            catch (Exception e)
+            {
+                _logger.error("exception stopping broker", e);
+            }
+            _logger.info("==========  stop " + name + " ==========");
+        }
     }
 
     public void startBroker() throws Exception
@@ -102,7 +113,8 @@ public class QpidTestCase extends TestCase
                     }
                     catch (IOException e)
                     {
-                        _logger.info("redirector", e);
+                        // this seems to happen regularly even when
+                        // exits are normal
                     }
                 }
             }.start();