You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2008/02/08 19:30:12 UTC
svn commit: r619974 - in
/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid:
test/unit/xa/ testutil/
Author: rhs
Date: Fri Feb 8 10:30:04 2008
New Revision: 619974
URL: http://svn.apache.org/viewvc?rev=619974&view=rev
Log:
made xa tests run, and made QpidTestCase more robust
Added:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
- copied, changed from r619534, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java
- copied, changed from r619534, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTests.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java
- copied, changed from r619534, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTests.java
Removed:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTests.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTests.java
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
Copied: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java (from r619534, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATest.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java?p2=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java&p1=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATest.java&r1=619534&r2=619974&rev=619974&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java Fri Feb 8 10:30:04 2008
@@ -28,7 +28,7 @@
*
*
*/
-public abstract class AbstractXATest extends QpidTestCase
+public abstract class AbstractXATestCase extends QpidTestCase
{
protected static final String _sequenceNumberPropertyName = "seqNumber";
Copied: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java (from r619534, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTests.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java?p2=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java&p1=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTests.java&r1=619534&r2=619974&rev=619974&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTests.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/QueueTest.java Fri Feb 8 10:30:04 2008
@@ -26,10 +26,10 @@
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 static TestSuite getSuite()
{
- return new TestSuite(QueueTests.class);
+ return new TestSuite(QueueTest.class);
}
/**
Copied: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java (from r619534, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTests.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java?p2=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java&p1=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTests.java&r1=619534&r2=619974&rev=619974&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTests.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/TopicTest.java Fri Feb 8 10:30:04 2008
@@ -33,10 +33,10 @@
*
*
*/
-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 static TestSuite getSuite()
{
- return new TestSuite(TopicTests.class);
+ return new TestSuite(TopicTest.class);
}
/**
@@ -1671,12 +1671,12 @@
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 @@
if (seq != _counter)
{
System.out.println("received message " + seq + " expected " + _counter);
- TopicTests.failure();
+ TopicTest.failure();
_lock.set(false);
synchronized (_lock)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java?rev=619974&r1=619973&r2=619974&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java Fri Feb 8 10:30:04 2008
@@ -59,16 +59,27 @@
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 @@
}
catch (IOException e)
{
- _logger.info("redirector", e);
+ // this seems to happen regularly even when
+ // exits are normal
}
}
}.start();