Repository: qpid-jms Updated Branches: refs/heads/master 52edd46bc -> 87d6ba7cd
Fix cleanup of connection instances created in the tests Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/87d6ba7c Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/87d6ba7c Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/87d6ba7c Branch: refs/heads/master Commit: 87d6ba7cd3fe26f5664130dced7476b31cde1f24 Parents: 52edd46 Author: Timothy Bish <[email protected]> Authored: Mon Jan 12 20:05:05 2015 -0500 Committer: Timothy Bish <[email protected]> Committed: Mon Jan 12 20:05:05 2015 -0500 ---------------------------------------------------------------------- .../org/apache/qpid/jms/JmsConnectionTest.java | 13 +++++++++---- .../apache/qpid/jms/JmsMessageIntegrityTest.java | 3 --- .../apache/qpid/jms/JmsQueueConnectionTest.java | 18 +++++++----------- .../apache/qpid/jms/JmsTopicConnectionTest.java | 18 +++++++----------- 4 files changed, 23 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/87d6ba7c/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java index c4c1467..2adcfcb 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java @@ -18,6 +18,7 @@ package org.apache.qpid.jms; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -52,7 +53,7 @@ public class JmsConnectionTest extends AmqpTestSupport { connection.close(); } - @Test(expected = JMSException.class) + @Test(timeout=30000) public void testCreateWithDuplicateClientIdFails() throws Exception { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); JmsConnection connection1 = (JmsConnection) factory.createConnection(); @@ -60,8 +61,13 @@ public class JmsConnectionTest extends AmqpTestSupport { assertNotNull(connection1); connection1.start(); JmsConnection connection2 = (JmsConnection) factory.createConnection(); - connection2.setClientID("Test"); - connection2.start(); + try { + connection2.setClientID("Test"); + fail("should have thrown a JMSException"); + } catch (JMSException ex) { + } catch (Exception unexpected) { + fail("Wrong exception type thrown: " + unexpected); + } connection1.close(); connection2.close(); @@ -114,7 +120,6 @@ public class JmsConnectionTest extends AmqpTestSupport { connection = factory.createConnection("unknown", "unknown"); assertNotNull(connection); connection.start(); - connection.close(); } @Test(timeout=60000) http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/87d6ba7c/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java index c81bd34..300f339 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java @@ -28,7 +28,6 @@ import java.util.UUID; import java.util.Vector; import javax.jms.BytesMessage; -import javax.jms.Connection; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.MapMessage; @@ -49,8 +48,6 @@ import org.junit.Test; */ public class JmsMessageIntegrityTest extends AmqpTestSupport { - private Connection connection; - @Override public void setUp() throws Exception { super.setUp(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/87d6ba7c/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java index 36253c6..8d54139 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java @@ -17,12 +17,12 @@ package org.apache.qpid.jms; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import javax.jms.JMSException; import javax.jms.JMSSecurityException; import javax.jms.QueueConnection; -import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.support.AmqpTestSupport; import org.junit.Test; @@ -34,9 +34,9 @@ public class JmsQueueConnectionTest extends AmqpTestSupport { @Test public void testCreateQueueConnection() throws JMSException { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); - QueueConnection connection = factory.createQueueConnection(); + connection = factory.createQueueConnection(); assertNotNull(connection); - connection.close(); + assertTrue(connection instanceof QueueConnection); } @Test(timeout=30000) @@ -44,10 +44,9 @@ public class JmsQueueConnectionTest extends AmqpTestSupport { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); factory.setUsername("system"); factory.setPassword("manager"); - QueueConnection connection = factory.createQueueConnection(); + connection = factory.createQueueConnection(); assertNotNull(connection); connection.start(); - connection.close(); } @Test(timeout=30000, expected = JMSSecurityException.class) @@ -55,27 +54,24 @@ public class JmsQueueConnectionTest extends AmqpTestSupport { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); factory.setUsername("unknown"); factory.setPassword("unknown"); - QueueConnection connection = factory.createQueueConnection(); + connection = factory.createQueueConnection(); assertNotNull(connection); connection.start(); - connection.close(); } @Test(timeout=30000) public void testCreateConnectionCallSystemAdmin() throws Exception { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); - QueueConnection connection = factory.createQueueConnection("system", "manager"); + connection = factory.createQueueConnection("system", "manager"); assertNotNull(connection); connection.start(); - connection.close(); } @Test(timeout=30000, expected = JMSSecurityException.class) public void testCreateConnectionCallUnknwonUser() throws Exception { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); - QueueConnection connection = factory.createQueueConnection("unknown", "unknown"); + connection = factory.createQueueConnection("unknown", "unknown"); assertNotNull(connection); connection.start(); - connection.close(); } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/87d6ba7c/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsTopicConnectionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsTopicConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsTopicConnectionTest.java index e423139..5818e3f 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsTopicConnectionTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsTopicConnectionTest.java @@ -17,12 +17,12 @@ package org.apache.qpid.jms; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import javax.jms.JMSException; import javax.jms.JMSSecurityException; import javax.jms.TopicConnection; -import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.support.AmqpTestSupport; import org.junit.Test; @@ -34,9 +34,9 @@ public class JmsTopicConnectionTest extends AmqpTestSupport { @Test public void testCreateQueueConnection() throws JMSException { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); - TopicConnection connection = factory.createTopicConnection(); + connection = factory.createTopicConnection(); assertNotNull(connection); - connection.close(); + assertTrue(connection instanceof TopicConnection); } @Test(timeout=30000) @@ -44,19 +44,17 @@ public class JmsTopicConnectionTest extends AmqpTestSupport { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); factory.setUsername("system"); factory.setPassword("manager"); - TopicConnection connection = factory.createTopicConnection(); + connection = factory.createTopicConnection(); assertNotNull(connection); connection.start(); - connection.close(); } @Test(timeout=30000) public void testCreateConnectionCallSystemAdmin() throws Exception { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); - TopicConnection connection = factory.createTopicConnection("system", "manager"); + connection = factory.createTopicConnection("system", "manager"); assertNotNull(connection); connection.start(); - connection.close(); } @Test(timeout=30000, expected = JMSSecurityException.class) @@ -64,18 +62,16 @@ public class JmsTopicConnectionTest extends AmqpTestSupport { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); factory.setUsername("unknown"); factory.setPassword("unknown"); - TopicConnection connection = factory.createTopicConnection(); + connection = factory.createTopicConnection(); assertNotNull(connection); connection.start(); - connection.close(); } @Test(timeout=30000, expected = JMSSecurityException.class) public void testCreateConnectionCallUnknownUser() throws Exception { JmsConnectionFactory factory = new JmsConnectionFactory(getBrokerAmqpConnectionURI()); - TopicConnection connection = factory.createTopicConnection("unknown", "unknown"); + connection = factory.createTopicConnection("unknown", "unknown"); assertNotNull(connection); connection.start(); - connection.close(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
