Repository: qpid-jms Updated Branches: refs/heads/master e5ed52ec0 -> bea9502b3
Do some more test cleanup, make sure resources are reset. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/bea9502b Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/bea9502b Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/bea9502b Branch: refs/heads/master Commit: bea9502b3d6b11c833508d4ae9af52d05df43670 Parents: e5ed52e Author: Timothy Bish <[email protected]> Authored: Thu Feb 12 10:17:07 2015 -0500 Committer: Timothy Bish <[email protected]> Committed: Thu Feb 12 10:17:07 2015 -0500 ---------------------------------------------------------------------- .../FailoverProviderOfflineBehaviorTest.java | 23 ++++++-------------- .../provider/failover/FailoverProviderTest.java | 4 +--- .../failover/FailoverProviderTestSupport.java | 11 ++++++++++ .../provider/failover/FailoverUriPoolTest.java | 6 ++++- .../failover/FiloverProviderFactoryTest.java | 8 ++++--- 5 files changed, 29 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bea9502b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderOfflineBehaviorTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderOfflineBehaviorTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderOfflineBehaviorTest.java index 9594aac..8b89c5a 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderOfflineBehaviorTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderOfflineBehaviorTest.java @@ -24,16 +24,14 @@ import javax.jms.Session; import org.apache.qpid.jms.JmsConnection; import org.apache.qpid.jms.JmsConnectionFactory; import org.apache.qpid.jms.provider.mock.MockProviderContext; -import org.apache.qpid.jms.test.QpidJmsTestCase; import org.junit.After; -import org.junit.Before; import org.junit.Test; /** * Test that calls into the FailoverProvider when it is not connected works * as expected based on the call and the resource type in question. */ -public class FailoverProviderOfflineBehaviorTest extends QpidJmsTestCase { +public class FailoverProviderOfflineBehaviorTest extends FailoverProviderTestSupport { private final JmsConnectionFactory factory = new JmsConnectionFactory("failover:(mock://localhost)"); @@ -42,20 +40,13 @@ public class FailoverProviderOfflineBehaviorTest extends QpidJmsTestCase { // TODO - Should add a wait for true connection interruption. @Override - @Before - public void setUp() throws Exception { - MockProviderContext.INSTANCE.reset(); - super.tearDown(); - } - - @Override @After public void tearDown() throws Exception { connection.close(); super.tearDown(); } - @Test(timeout=60000) + @Test(timeout=10000) public void testConnectionCloseDoesNotBlock() throws Exception { connection = (JmsConnection) factory.createConnection(); connection.start(); @@ -63,7 +54,7 @@ public class FailoverProviderOfflineBehaviorTest extends QpidJmsTestCase { connection.close(); } - @Test(timeout=60000) + @Test(timeout=10000) public void testSessionCloseDoesNotBlock() throws Exception { connection = (JmsConnection) factory.createConnection(); connection.start(); @@ -73,7 +64,7 @@ public class FailoverProviderOfflineBehaviorTest extends QpidJmsTestCase { connection.close(); } - @Test(timeout=60000) + @Test(timeout=10000) public void testProducerCloseDoesNotBlock() throws Exception { connection = (JmsConnection) factory.createConnection(); connection.start(); @@ -87,7 +78,7 @@ public class FailoverProviderOfflineBehaviorTest extends QpidJmsTestCase { connection.close(); } - @Test(timeout=60000) + @Test(timeout=10000) public void testConsumerCloseDoesNotBlock() throws Exception { connection = (JmsConnection) factory.createConnection(); connection.start(); @@ -101,7 +92,7 @@ public class FailoverProviderOfflineBehaviorTest extends QpidJmsTestCase { connection.close(); } - @Test(timeout=60000) + @Test(timeout=10000) public void testSessionCloseWithOpenResourcesDoesNotBlock() throws Exception { connection = (JmsConnection) factory.createConnection(); connection.start(); @@ -116,7 +107,7 @@ public class FailoverProviderOfflineBehaviorTest extends QpidJmsTestCase { connection.close(); } - @Test(timeout=60000) + @Test(timeout=10000) public void testSessionRecoverDoesNotBlock() throws Exception { connection = (JmsConnection) factory.createConnection(); connection.start(); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bea9502b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java index 40b4f22..833d962 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java @@ -68,9 +68,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport { uris.add(new URI("mock://192.168.2.2:5672")); uris.add(new URI("mock://192.168.2.3:5672")); uris.add(new URI("mock://192.168.2.4:5672")); - - MockProviderContext.INSTANCE.reset(); - + super.setUp(); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bea9502b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTestSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTestSupport.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTestSupport.java index 3c5c690..5542910 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTestSupport.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTestSupport.java @@ -24,8 +24,10 @@ import org.apache.qpid.jms.meta.JmsConsumerId; import org.apache.qpid.jms.meta.JmsConsumerInfo; import org.apache.qpid.jms.meta.JmsSessionId; import org.apache.qpid.jms.meta.JmsSessionInfo; +import org.apache.qpid.jms.provider.mock.MockProviderContext; import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.jms.util.IdGenerator; +import org.junit.After; import org.junit.Before; /** @@ -44,6 +46,15 @@ public class FailoverProviderTestSupport extends QpidJmsTestCase { nextSessionId.set(0); nextConsumerId.set(0); + + MockProviderContext.INSTANCE.reset(); + } + + @Override + @After + public void tearDown() throws Exception { + MockProviderContext.INSTANCE.reset(); + super.tearDown(); } protected JmsConnectionInfo createConnectionInfo() { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bea9502b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java index 3b2457a..de976f1 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverUriPoolTest.java @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.jms.util.URISupport; import org.junit.Before; import org.junit.Test; @@ -38,12 +39,15 @@ import org.junit.Test; /** * Test for the behavior of the FailoverUriPool */ -public class FailoverUriPoolTest { +public class FailoverUriPoolTest extends QpidJmsTestCase { private List<URI> uris; + @Override @Before public void setUp() throws Exception { + super.setUp(); + uris = new ArrayList<URI>(); uris.add(new URI("tcp://192.168.2.1:5672")); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bea9502b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java index 97736d8..937c50d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FiloverProviderFactoryTest.java @@ -22,23 +22,25 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.net.URI; -import java.net.URISyntaxException; import java.util.Map; import org.apache.qpid.jms.provider.Provider; +import org.apache.qpid.jms.test.QpidJmsTestCase; import org.junit.Before; import org.junit.Test; /** * Test that the provider factory correctly creates and configures the provider. */ -public class FiloverProviderFactoryTest { +public class FiloverProviderFactoryTest extends QpidJmsTestCase { private URI baseURI; private final FailoverProviderFactory factory = new FailoverProviderFactory(); + @Override @Before - public void setUp() throws URISyntaxException { + public void setUp() throws Exception { + super.setUp(); baseURI = new URI("failover:(amqp://localhost:5672,amqp://localhost:5674)"); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
