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/02/12 23:07:19 UTC
qpid-jms git commit: ensure created resources get closed
Repository: qpid-jms
Updated Branches:
refs/heads/master 44ccf5f11 -> 9e21b1db3
ensure created resources get closed
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9e21b1db
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9e21b1db
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9e21b1db
Branch: refs/heads/master
Commit: 9e21b1db3ab2dcf254092f1498d8690f1893355f
Parents: 44ccf5f
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Feb 12 17:07:11 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Feb 12 17:07:11 2015 -0500
----------------------------------------------------------------------
.../provider/failover/FailoverProviderTest.java | 27 ++++++++++++++------
.../failover/FiloverProviderFactoryTest.java | 11 ++++++++
2 files changed, 30 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9e21b1db/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 0b7533f..8999930 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
@@ -44,6 +44,7 @@ import org.apache.qpid.jms.meta.JmsSessionInfo;
import org.apache.qpid.jms.provider.DefaultProviderListener;
import org.apache.qpid.jms.provider.ProviderFuture;
import org.apache.qpid.jms.test.Wait;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -57,6 +58,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(FailoverProviderTest.class);
private List<URI> uris;
+ private FailoverProvider provider;
@Override
@Before
@@ -71,9 +73,18 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
super.setUp();
}
+ @Override
+ @After
+ public void tearDown() throws Exception {
+ if (provider != null) {
+ provider.close();
+ }
+ super.tearDown();
+ }
+
@Test(timeout = 30000)
public void testCreateProviderOnlyUris() {
- FailoverProvider provider = new FailoverProvider(uris);
+ provider = new FailoverProvider(uris);
assertEquals(FailoverUriPool.DEFAULT_RANDOMIZE_ENABLED, provider.isRandomize());
assertNull(provider.getRemoteURI());
assertNotNull(provider.getNestedOptions());
@@ -85,7 +96,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
Map<String, String> options = new HashMap<String, String>();
options.put("transport.tcpNoDelay", "true");
- FailoverProvider provider = new FailoverProvider(options);
+ provider = new FailoverProvider(options);
assertEquals(FailoverUriPool.DEFAULT_RANDOMIZE_ENABLED, provider.isRandomize());
assertNull(provider.getRemoteURI());
assertNotNull(provider.getNestedOptions());
@@ -95,7 +106,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
@Test(timeout = 30000)
public void testCreateProviderWithNestedOptions() {
- FailoverProvider provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
+ provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
assertEquals(FailoverUriPool.DEFAULT_RANDOMIZE_ENABLED, provider.isRandomize());
assertNull(provider.getRemoteURI());
assertNotNull(provider.getNestedOptions());
@@ -104,7 +115,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
@Test(timeout = 30000)
public void testProviderListener() {
- FailoverProvider provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
+ provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
assertNull(provider.getProviderListener());
provider.setProviderListener(new DefaultProviderListener());
assertNotNull(provider.getProviderListener());
@@ -112,7 +123,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
@Test(timeout = 30000)
public void testGetRemoteURI() throws Exception {
- final FailoverProvider provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
+ provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
assertNull(provider.getRemoteURI());
provider.connect();
@@ -127,7 +138,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
@Test(timeout = 30000)
public void testToString() throws Exception {
- final FailoverProvider provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
+ provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
assertNotNull(provider.toString());
provider.connect();
@@ -143,7 +154,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
@Test(timeout = 30000)
public void testConnectToMock() throws Exception {
- FailoverProvider provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
+ provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
assertEquals(FailoverUriPool.DEFAULT_RANDOMIZE_ENABLED, provider.isRandomize());
assertNull(provider.getRemoteURI());
@@ -174,7 +185,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
@Test(timeout = 30000)
public void testCannotStartWithoutListener() throws Exception {
- FailoverProvider provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
+ provider = new FailoverProvider(uris, Collections.<String, String>emptyMap());
assertEquals(FailoverUriPool.DEFAULT_RANDOMIZE_ENABLED, provider.isRandomize());
assertNull(provider.getRemoteURI());
provider.connect();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9e21b1db/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 937c50d..c1dbe21 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
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.qpid.jms.provider.Provider;
import org.apache.qpid.jms.test.QpidJmsTestCase;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -36,6 +37,7 @@ public class FiloverProviderFactoryTest extends QpidJmsTestCase {
private URI baseURI;
private final FailoverProviderFactory factory = new FailoverProviderFactory();
+ private FailoverProvider provider;
@Override
@Before
@@ -44,6 +46,15 @@ public class FiloverProviderFactoryTest extends QpidJmsTestCase {
baseURI = new URI("failover:(amqp://localhost:5672,amqp://localhost:5674)");
}
+ @Override
+ @After
+ public void tearDown() throws Exception {
+ if (provider != null) {
+ provider.close();
+ }
+ super.tearDown();
+ }
+
@Test(timeout = 60000)
public void testCreateProvider() throws Exception {
assertNotNull(factory.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org