You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/01/16 00:22:22 UTC
qpid-jms git commit: Refactor some more tests to avoid hangs in
connection open in the setup method,
defer to test method to allow for timeout of the test.
Repository: qpid-jms
Updated Branches:
refs/heads/master 44eda7db2 -> e4e5ea8e6
Refactor some more tests to avoid hangs in connection open in the setup
method, defer to test method to allow for timeout of the test.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/e4e5ea8e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/e4e5ea8e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/e4e5ea8e
Branch: refs/heads/master
Commit: e4e5ea8e67a4c2974057c3cd425e15b636c283b7
Parents: 44eda7d
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Jan 15 18:22:17 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Jan 15 18:22:17 2015 -0500
----------------------------------------------------------------------
.../qpid/jms/consumer/JmsClientAckTest.java | 11 ----
.../JmsConsumerPriorityDispatchTest.java | 10 +---
.../consumer/JmsMessageConsumerClosedTest.java | 27 +++++-----
.../consumer/JmsTopicSubscriberClosedTest.java | 15 ++----
.../producer/JmsMessageProducerClosedTest.java | 54 ++++++++++++--------
.../jms/session/JmsQueueSessionClosedTest.java | 13 ++---
.../jms/session/JmsTopicSessionClosedTest.java | 13 ++---
7 files changed, 62 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4e5ea8e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
index 57c3ae0..653961a 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.jms.Connection;
import javax.jms.DeliveryMode;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -38,7 +37,6 @@ import javax.jms.TextMessage;
import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.qpid.jms.support.AmqpTestSupport;
import org.apache.qpid.jms.support.Wait;
-import org.junit.After;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -51,15 +49,6 @@ public class JmsClientAckTest extends AmqpTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(JmsClientAckTest.class);
- private Connection connection;
-
- @Override
- @After
- public void tearDown() throws Exception {
- connection.close();
- super.tearDown();
- }
-
@Test(timeout = 60000)
public void testAckedMessageAreConsumed() throws Exception {
connection = createAmqpConnection();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4e5ea8e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java
index f584e67..cee54d3 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsConsumerPriorityDispatchTest.java
@@ -31,7 +31,6 @@ import org.apache.activemq.broker.jmx.QueueViewMBean;
import org.apache.qpid.jms.JmsConnection;
import org.apache.qpid.jms.support.AmqpTestSupport;
import org.apache.qpid.jms.support.Wait;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -39,15 +38,9 @@ import org.junit.Test;
*/
public class JmsConsumerPriorityDispatchTest extends AmqpTestSupport {
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- connection = createAmqpConnection();
- }
-
@Test(timeout = 60000)
public void testPrefetchedMessageArePriorityOrdered() throws Exception {
+ connection = createAmqpConnection();
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue(name.getMethodName());
@@ -85,6 +78,7 @@ public class JmsConsumerPriorityDispatchTest extends AmqpTestSupport {
// We are assuming that Broker side priority support is not enabled in the create
// broker method in AmqpTestSupport. If that changes then this test will sometimes
// fail.
+ connection = createAmqpConnection();
((JmsConnection) connection).setMessagePrioritySupported(false);
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4e5ea8e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerClosedTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerClosedTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerClosedTest.java
index 8fbcbad..a374b1a 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerClosedTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerClosedTest.java
@@ -42,24 +42,21 @@ public class JmsMessageConsumerClosedTest extends AmqpTestSupport {
return consumer;
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- consumer = createConsumer();
- }
-
@Test(timeout=30000, expected=JMSException.class)
- public void testGetMessageSelectorFails() throws JMSException {
+ public void testGetMessageSelectorFails() throws Exception {
+ consumer = createConsumer();
consumer.getMessageSelector();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testGetMessageListenerFails() throws JMSException {
+ public void testGetMessageListenerFails() throws Exception {
+ consumer = createConsumer();
consumer.getMessageListener();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSetMessageListenerFails() throws JMSException {
+ public void testSetMessageListenerFails() throws Exception {
+ consumer = createConsumer();
consumer.setMessageListener(new MessageListener() {
@Override
public void onMessage(Message message) {
@@ -68,22 +65,26 @@ public class JmsMessageConsumerClosedTest extends AmqpTestSupport {
}
@Test(timeout=30000, expected=JMSException.class)
- public void testRreceiveFails() throws JMSException {
+ public void testRreceiveFails() throws Exception {
+ consumer = createConsumer();
consumer.receive();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testRreceiveTimedFails() throws JMSException {
+ public void testRreceiveTimedFails() throws Exception {
+ consumer = createConsumer();
consumer.receive(11);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testRreceiveNoWaitFails() throws JMSException {
+ public void testRreceiveNoWaitFails() throws Exception {
+ consumer = createConsumer();
consumer.receiveNoWait();
}
@Test(timeout=30000)
- public void testClose() throws JMSException {
+ public void testClose() throws Exception {
+ consumer = createConsumer();
consumer.close();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4e5ea8e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsTopicSubscriberClosedTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsTopicSubscriberClosedTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsTopicSubscriberClosedTest.java
index d2d992c..ff842d9 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsTopicSubscriberClosedTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsTopicSubscriberClosedTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.qpid.jms.consumer;
-import javax.jms.JMSException;
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.TopicConnection;
@@ -25,7 +24,6 @@ import javax.jms.TopicSubscriber;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.apache.qpid.jms.support.AmqpTestSupport;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -46,20 +44,15 @@ public class JmsTopicSubscriberClosedTest extends AmqpTestSupport {
return subscriber;
}
- @Before
- @Override
- public void setUp() throws Exception {
- super.setUp();
- subscriber = createAndCloseSubscriber();
- }
-
@Test(timeout=30000, expected=javax.jms.IllegalStateException.class)
- public void testGetNoLocalFails() throws JMSException {
+ public void testGetNoLocalFails() throws Exception {
+ subscriber = createAndCloseSubscriber();
subscriber.getNoLocal();
}
@Test(timeout=30000, expected=javax.jms.IllegalStateException.class)
- public void testGetTopicFails() throws JMSException {
+ public void testGetTopicFails() throws Exception {
+ subscriber = createAndCloseSubscriber();
subscriber.getTopic();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4e5ea8e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerClosedTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerClosedTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerClosedTest.java
index a7b8cdf..d2aca10 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerClosedTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerClosedTest.java
@@ -44,89 +44,99 @@ public class JmsMessageProducerClosedTest extends AmqpTestSupport {
return producer;
}
- @Override
- public void setUp() throws Exception {
- super.setUp();
- producer = createProducer();
- }
-
@Test(timeout=30000)
- public void testClose() throws JMSException {
+ public void testClose() throws Exception {
+ producer = createProducer();
producer.close();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSetDisableMessageIDFails() throws JMSException {
+ public void testSetDisableMessageIDFails() throws Exception {
+ producer = createProducer();
producer.setDisableMessageID(true);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testGetDisableMessageIDFails() throws JMSException {
+ public void testGetDisableMessageIDFails() throws Exception {
+ producer = createProducer();
producer.getDisableMessageID();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSetDisableMessageTimestampFails() throws JMSException {
+ public void testSetDisableMessageTimestampFails() throws Exception {
+ producer = createProducer();
producer.setDisableMessageTimestamp(false);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testGetDisableMessageTimestampFails() throws JMSException {
+ public void testGetDisableMessageTimestampFails() throws Exception {
+ producer = createProducer();
producer.getDisableMessageTimestamp();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSetDeliveryModeFails() throws JMSException {
+ public void testSetDeliveryModeFails() throws Exception {
+ producer = createProducer();
producer.setDeliveryMode(1);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testGetDeliveryModeFails() throws JMSException {
+ public void testGetDeliveryModeFails() throws Exception {
+ producer = createProducer();
producer.getDeliveryMode();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSetPriorityFails() throws JMSException {
+ public void testSetPriorityFails() throws Exception {
+ producer = createProducer();
producer.setPriority(1);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testGetPriorityFails() throws JMSException {
+ public void testGetPriorityFails() throws Exception {
+ producer = createProducer();
producer.getPriority();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSetTimeToLiveFails() throws JMSException {
+ public void testSetTimeToLiveFails() throws Exception {
+ producer = createProducer();
producer.setTimeToLive(1);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testGetTimeToLiveFails() throws JMSException {
+ public void testGetTimeToLiveFails() throws Exception {
+ producer = createProducer();
producer.getTimeToLive();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testGetDestinationFails() throws JMSException {
+ public void testGetDestinationFails() throws Exception {
+ producer = createProducer();
producer.getDestination();
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSendFails() throws JMSException {
+ public void testSendFails() throws Exception {
+ producer = createProducer();
producer.send(message);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSendWithDestinationFails() throws JMSException {
+ public void testSendWithDestinationFails() throws Exception {
+ producer = createProducer();
producer.send(destination, message);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSendWithModePriorityTTLFails() throws JMSException {
+ public void testSendWithModePriorityTTLFails() throws Exception {
+ producer = createProducer();
producer.send(message, 1, 3, 111);
}
@Test(timeout=30000, expected=JMSException.class)
- public void testSendWithDestinationModePriorityTTLFails() throws JMSException {
+ public void testSendWithDestinationModePriorityTTLFails() throws Exception {
+ producer = createProducer();
producer.send(destination, message, 1, 3, 111);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4e5ea8e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionClosedTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionClosedTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionClosedTest.java
index 0ad6cd0..a48edce 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionClosedTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionClosedTest.java
@@ -25,7 +25,6 @@ import javax.jms.Session;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.apache.qpid.jms.support.AmqpTestSupport;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -51,38 +50,36 @@ public class JmsQueueSessionClosedTest extends AmqpTestSupport {
session.close();
}
- @Before
- @Override
- public void setUp() throws Exception {
- super.setUp();
- createAndCloseSession();
- }
-
@Test(timeout=30000)
public void testSessionCloseAgain() throws Exception {
+ createAndCloseSession();
// Close it again
session.close();
}
@Test(timeout=30000)
public void testReceiverCloseAgain() throws Exception {
+ createAndCloseSession();
// Close it again (closing the session should have closed it already).
receiver.close();
}
@Test(timeout=30000)
public void testSenderCloseAgain() throws Exception {
+ createAndCloseSession();
// Close it again (closing the session should have closed it already).
sender.close();
}
@Test(timeout=30000, expected=javax.jms.IllegalStateException.class)
public void testReceiverGetQueueFails() throws Exception {
+ createAndCloseSession();
receiver.getQueue();
}
@Test(timeout=30000, expected=javax.jms.IllegalStateException.class)
public void testSenderGetQueueFails() throws Exception {
+ createAndCloseSession();
sender.getQueue();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4e5ea8e/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionClosedTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionClosedTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionClosedTest.java
index 53a3e4f..3f9f40c 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionClosedTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionClosedTest.java
@@ -25,7 +25,6 @@ import javax.jms.TopicSubscriber;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.apache.qpid.jms.support.AmqpTestSupport;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -51,38 +50,36 @@ public class JmsTopicSessionClosedTest extends AmqpTestSupport {
session.close();
}
- @Before
- @Override
- public void setUp() throws Exception {
- super.setUp();
- createAndCloseSession();
- }
-
@Test(timeout=30000)
public void testSessionCloseAgain() throws Exception {
+ createAndCloseSession();
// Close it again
session.close();
}
@Test(timeout=30000)
public void testSubscriberCloseAgain() throws Exception {
+ createAndCloseSession();
// Close it again (closing the session should have closed it already).
subscriber.close();
}
@Test(timeout=30000)
public void testPublisherCloseAgain() throws Exception {
+ createAndCloseSession();
// Close it again (closing the session should have closed it already).
publisher.close();
}
@Test(timeout=30000, expected=javax.jms.IllegalStateException.class)
public void testSubscriberGetTopicFails() throws Exception {
+ createAndCloseSession();
subscriber.getTopic();
}
@Test(timeout=30000, expected=javax.jms.IllegalStateException.class)
public void testPublisherGetTopicFails() throws Exception {
+ createAndCloseSession();
publisher.getTopic();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org