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/10 21:41:47 UTC
qpid-jms git commit: Allow for some testing of behavior when the
connection is lost.
Repository: qpid-jms
Updated Branches:
refs/heads/master b07e61f46 -> 9b03e2926
Allow for some testing of behavior when the connection is lost.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9b03e292
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9b03e292
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9b03e292
Branch: refs/heads/master
Commit: 9b03e2926388ae3a8bf914826203e46944caf47a
Parents: b07e61f
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Feb 10 15:41:31 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Feb 10 15:41:31 2015 -0500
----------------------------------------------------------------------
.../FailoverProviderOfflineBehaviorTest.java | 118 +++++++++++++++++++
.../provider/failover/FailoverProviderTest.java | 22 ++--
.../qpid/jms/provider/mock/MockProvider.java | 22 ++++
.../jms/provider/mock/MockProviderContext.java | 85 +++++++++++++
.../jms/provider/mock/MockProviderFactory.java | 11 +-
5 files changed, 238 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9b03e292/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
new file mode 100644
index 0000000..99f7037
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderOfflineBehaviorTest.java
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.qpid.jms.provider.failover;
+
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+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 {
+
+ private final JmsConnectionFactory factory = new JmsConnectionFactory("failover:(mock://localhost)");
+
+ private JmsConnection connection;
+
+ // 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)
+ public void testConnectionCloseDoesNotBlock() throws Exception {
+ connection = (JmsConnection) factory.createConnection();
+ connection.start();
+ MockProviderContext.INSTANCE.shutdown();
+ connection.close();
+ }
+
+ @Test(timeout=60000)
+ public void testSessionCloseDoesNotBlock() throws Exception {
+ connection = (JmsConnection) factory.createConnection();
+ connection.start();
+ Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ MockProviderContext.INSTANCE.shutdown();
+ session.close();
+ connection.close();
+ }
+
+ @Test(timeout=60000)
+ public void testProducerCloseDoesNotBlock() throws Exception {
+ connection = (JmsConnection) factory.createConnection();
+ connection.start();
+
+ Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ Queue queue = session.createQueue(_testName.getMethodName());
+ MessageProducer producer = session.createProducer(queue);
+
+ MockProviderContext.INSTANCE.shutdown();
+ producer.close();
+ connection.close();
+ }
+
+ @Test(timeout=60000)
+ public void testConsumerCloseDoesNotBlock() throws Exception {
+ connection = (JmsConnection) factory.createConnection();
+ connection.start();
+
+ Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ Queue queue = session.createQueue(_testName.getMethodName());
+ MessageConsumer consumer = session.createConsumer(queue);
+
+ MockProviderContext.INSTANCE.shutdown();
+ consumer.close();
+ connection.close();
+ }
+
+ @Test(timeout=60000)
+ public void testSessionCloseWithOpenResourcesDoesNotBlock() throws Exception {
+ connection = (JmsConnection) factory.createConnection();
+ connection.start();
+
+ Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ Queue queue = session.createQueue(_testName.getMethodName());
+ session.createConsumer(queue);
+ session.createProducer(queue);
+
+ MockProviderContext.INSTANCE.shutdown();
+ session.close();
+ connection.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9b03e292/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 a66f6c8..b1b74b7 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
@@ -38,7 +38,7 @@ import javax.jms.JMSException;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.apache.qpid.jms.provider.DefaultProviderListener;
import org.apache.qpid.jms.provider.ProviderFuture;
-import org.apache.qpid.jms.provider.mock.MockProviderFactory;
+import org.apache.qpid.jms.provider.mock.MockProviderContext;
import org.apache.qpid.jms.test.Wait;
import org.junit.Before;
import org.junit.Test;
@@ -64,7 +64,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
uris.add(new URI("mock://192.168.2.3:5672"));
uris.add(new URI("mock://192.168.2.4:5672"));
- MockProviderFactory.resetStatistics();
+ MockProviderContext.INSTANCE.reset();
super.setUp();
}
@@ -166,8 +166,8 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
provider.close();
- assertEquals(1, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getProvidersCreated());
- assertEquals(1, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getConnectionAttempts());
+ assertEquals(1, MockProviderContext.INSTANCE.getContextStats().getProvidersCreated());
+ assertEquals(1, MockProviderContext.INSTANCE.getContextStats().getConnectionAttempts());
}
@Test(timeout = 30000)
@@ -203,8 +203,8 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
connection.close();
}
- assertEquals(5, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getProvidersCreated());
- assertEquals(5, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getConnectionAttempts());
+ assertEquals(5, MockProviderContext.INSTANCE.getContextStats().getProvidersCreated());
+ assertEquals(5, MockProviderContext.INSTANCE.getContextStats().getConnectionAttempts());
}
@Test(timeout = 30000)
@@ -224,8 +224,8 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
connection.close();
}
- assertEquals(5, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getProvidersCreated());
- assertEquals(5, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getConnectionAttempts());
+ assertEquals(5, MockProviderContext.INSTANCE.getContextStats().getProvidersCreated());
+ assertEquals(5, MockProviderContext.INSTANCE.getContextStats().getConnectionAttempts());
}
@Test(timeout = 30000)
@@ -237,8 +237,8 @@ public class FailoverProviderTest extends FailoverProviderTestSupport {
connection.start();
connection.close();
- assertEquals(1, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getProvidersCreated());
- assertEquals(1, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getConnectionAttempts());
- assertEquals(1, MockProviderFactory.AGGRAGATED_PROVIDER_STATS.getCloseAttempts());
+ assertEquals(1, MockProviderContext.INSTANCE.getContextStats().getProvidersCreated());
+ assertEquals(1, MockProviderContext.INSTANCE.getContextStats().getConnectionAttempts());
+ assertEquals(1, MockProviderContext.INSTANCE.getContextStats().getCloseAttempts());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9b03e292/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java
index 23c2d21..99c6030 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProvider.java
@@ -18,6 +18,7 @@ package org.apache.qpid.jms.provider.mock;
import java.io.IOException;
import java.net.URI;
+import java.util.UUID;
import javax.jms.JMSException;
@@ -45,6 +46,7 @@ public class MockProvider implements Provider {
private final URI remoteURI;
private final MockProviderConfiguration configuration;
+ private String providerId = UUID.randomUUID().toString();
private MockProviderListener eventListener;
private ProviderListener listener;
@@ -61,6 +63,8 @@ public class MockProvider implements Provider {
if (configuration.isFailOnConnect()) {
throw new IOException("Failed to connect to: " + remoteURI);
}
+
+ MockProviderContext.INSTANCE.connect(this);
}
@Override
@@ -79,6 +83,8 @@ public class MockProvider implements Provider {
public void close() {
stats.recordCloseAttempt();
+ MockProviderContext.INSTANCE.disconnect(this);
+
if (configuration.isFailOnClose()) {
throw new RuntimeException();
}
@@ -162,6 +168,14 @@ public class MockProvider implements Provider {
request.onSuccess();
}
+ //----- API for generating provider events to a connection ---------------//
+
+ public void signalConnectionFailed() {
+ listener.onConnectionFailure(new IOException("Connection lost"));
+ }
+
+ //----- Property getters and setters -------------------------------------//
+
@Override
public void pull(JmsConsumerId consumerId, long timeout, AsyncResult request) throws IOException {
stats.recordPullCall();
@@ -198,4 +212,12 @@ public class MockProvider implements Provider {
public MockProviderStats getStatistics() {
return stats;
}
+
+ public void setProviderId(String providerId) {
+ this.providerId = providerId;
+ }
+
+ public String getProviderId() {
+ return this.providerId;
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9b03e292/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderContext.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderContext.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderContext.java
new file mode 100644
index 0000000..905599f
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderContext.java
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.qpid.jms.provider.mock;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Context shared between all MockProvider instances.
+ */
+public class MockProviderContext {
+
+ public static final MockProviderContext INSTANCE = new MockProviderContext();
+
+ private final Map<String, MockProvider> activeProviders = new ConcurrentHashMap<String, MockProvider>();
+ private final MockProviderStats contextStats = new MockProviderStats();
+
+ private MockProvider lastRegistered;
+ private boolean offline;
+
+ public void connect(MockProvider provider) throws IOException {
+ if (offline) {
+ throw new IOException();
+ }
+
+ if (provider != null) {
+ activeProviders.put(provider.getProviderId(), provider);
+ lastRegistered = provider;
+ }
+ }
+
+ public void disconnect(MockProvider provider) {
+ if (provider != null) {
+ activeProviders.remove(provider.getProviderId());
+ }
+ }
+
+ public void shutdown() {
+ offline = true;
+ List<MockProvider> active = new ArrayList<MockProvider>(activeProviders.values());
+ for (MockProvider provider : active) {
+ provider.signalConnectionFailed();
+ }
+ activeProviders.clear();
+ lastRegistered = null;
+ }
+
+ public void reset() {
+ contextStats.reset();
+ activeProviders.clear();
+ lastRegistered = null;
+ offline = false;
+ }
+
+ public MockProvider getProvider(String providerId) {
+ return activeProviders.get(providerId);
+ }
+
+ public MockProvider getLastRegistered() {
+ return lastRegistered;
+ }
+
+ public MockProviderStats getContextStats() {
+ return contextStats;
+ }
+
+ private MockProviderContext() {}
+}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9b03e292/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderFactory.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderFactory.java
index b20e253..9e60223 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderFactory.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/mock/MockProviderFactory.java
@@ -27,19 +27,16 @@ import org.apache.qpid.jms.util.PropertyUtil;
*/
public class MockProviderFactory extends ProviderFactory {
- public static final MockProviderStats AGGRAGATED_PROVIDER_STATS = new MockProviderStats();
-
@Override
public MockProvider createProvider(URI remoteURI) throws Exception {
- AGGRAGATED_PROVIDER_STATS.recordProviderCreated();
-
Map<String, String> map = PropertyUtil.parseQuery(remoteURI.getQuery());
Map<String, String> providerOptions = PropertyUtil.filterProperties(map, "mock.");
remoteURI = PropertyUtil.replaceQuery(remoteURI, map);
MockProviderConfiguration configuration = new MockProviderConfiguration();
+ MockProviderContext.INSTANCE.getContextStats().recordProviderCreated();
Map<String, String> unused = PropertyUtil.setProperties(configuration, providerOptions);
if (!unused.isEmpty()) {
@@ -51,15 +48,11 @@ public class MockProviderFactory extends ProviderFactory {
throw new IllegalArgumentException(msg);
}
- return new MockProvider(remoteURI, configuration, AGGRAGATED_PROVIDER_STATS);
+ return new MockProvider(remoteURI, configuration, MockProviderContext.INSTANCE.getContextStats());
}
@Override
public String getName() {
return "Mock";
}
-
- public static void resetStatistics() {
- AGGRAGATED_PROVIDER_STATS.reset();
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org