diff options
author | Robert Gemmell <robbie@apache.org> | 2012-03-11 16:43:36 +0000 |
---|---|---|
committer | Robert Gemmell <robbie@apache.org> | 2012-03-11 16:43:36 +0000 |
commit | 0e13aff34a6dfb783373cd126b86ba60cb75b385 (patch) | |
tree | 09f532cf98d369710e2b66f9cea8a8d56281f1d3 | |
parent | 7f8b5ecd9a9d1c44503eb867cc8c9815b092bb7d (diff) | |
download | qpid-python-0e13aff34a6dfb783373cd126b86ba60cb75b385.tar.gz |
QPID-3873: update test additions to fix defects around deliverymode variation, reduce the unecessarily large number of messages sent, remove the effectively duplicate tests using topics
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1299396 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java index 9e11e940c0..cc76d89a67 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java @@ -25,10 +25,6 @@ import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageProducer; import javax.jms.Queue; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; /** * This tests the behaviour of transactional sessions when the {@code transactionTimeout} configuration @@ -316,59 +312,32 @@ public class TransactionTimeoutTest extends TransactionTimeoutTestCase monitor(0, 0); } + /** + * Tests that sending an unroutable persistent message does not result in a long running store transaction [warning]. + */ public void testTransactionCommittedOnNonRoutableQueuePersistentMessage() throws Exception { checkTransactionCommittedOnNonRoutableQueueMessage(DeliveryMode.PERSISTENT); } + /** + * Tests that sending an unroutable transient message does not result in a long running store transaction [warning]. + */ public void testTransactionCommittedOnNonRoutableQueueTransientMessage() throws Exception { - checkTransactionCommittedOnNonRoutableQueueMessage(DeliveryMode.PERSISTENT); - } - - public void testTransactionCommittedOnNonRoutableTopicPersistentMessage() throws Exception - { - checkTransactionCommittedOnNonRoutableTopicMessage(DeliveryMode.PERSISTENT); - } - - public void testTransactionCommittedOnNonRoutableTopicTransientMessage() throws Exception - { - checkTransactionCommittedOnNonRoutableTopicMessage(DeliveryMode.PERSISTENT); + checkTransactionCommittedOnNonRoutableQueueMessage(DeliveryMode.NON_PERSISTENT); } - protected void checkTransactionCommittedOnNonRoutableQueueMessage(int deliveryMode) throws JMSException, Exception + private void checkTransactionCommittedOnNonRoutableQueueMessage(int deliveryMode) throws JMSException, Exception { - Queue nonExisting = _psession.createQueue("non-existent-queue-" + System.currentTimeMillis()); + Queue nonExisting = _psession.createQueue(getTestQueueName() + System.currentTimeMillis()); MessageProducer producer = _psession.createProducer(nonExisting); Message message = _psession.createMessage(); - message.setJMSDeliveryMode(deliveryMode); - for (int i=0;i<1000; i++) - { - producer.send(message); - } + producer.send(message, deliveryMode, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE); _psession.commit(); // give time to house keeping thread to log messages sleep(3f); monitor(0, 0); } - - protected void checkTransactionCommittedOnNonRoutableTopicMessage(int deliveryMode) throws JMSException, Exception - { - final TopicSession session = _con.createTopicSession(true, Session.SESSION_TRANSACTED); - Topic nonExisting = session.createTopic("non-existent-topic-" + System.currentTimeMillis()); - - TopicPublisher topicPublisher = session.createPublisher(nonExisting); - Message message = session.createMessage(); - message.setJMSDeliveryMode(deliveryMode); - for (int i=0;i<1000; i++) - { - topicPublisher.send(message); - } - session.commit(); - - // give time to house keeping thread to log messages - sleep(3f); - monitor(0, 0); - } } |