You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/09/19 19:39:38 UTC
[1/2] storm git commit: STORM-2722: close the JMSSpout in the tests
when done
Repository: storm
Updated Branches:
refs/heads/master da2f03586 -> 42a4dc2f6
STORM-2722: close the JMSSpout in the tests when done
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3c88b0ce
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3c88b0ce
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3c88b0ce
Branch: refs/heads/master
Commit: 3c88b0ce87ac72492e3720d3d89ccbe91b3d89e0
Parents: da2f035
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 18 14:50:07 2017 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 18 14:50:07 2017 -0500
----------------------------------------------------------------------
.../apache/storm/jms/spout/JmsSpoutTest.java | 72 +++++++++++---------
1 file changed, 41 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3c88b0ce/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
----------------------------------------------------------------------
diff --git a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
index da312da..b6406c8 100644
--- a/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
+++ b/external/storm-jms/src/test/java/org/apache/storm/jms/spout/JmsSpoutTest.java
@@ -45,28 +45,33 @@ public class JmsSpoutTest {
@Test
public void testFailure() throws JMSException, Exception {
JmsSpout spout = new JmsSpout();
- JmsProvider mockProvider = new MockJmsProvider();
- MockSpoutOutputCollector mockCollector = new MockSpoutOutputCollector();
- SpoutOutputCollector collector =
+ try {
+ JmsProvider mockProvider = new MockJmsProvider();
+ MockSpoutOutputCollector mockCollector = new MockSpoutOutputCollector();
+ SpoutOutputCollector collector =
new SpoutOutputCollector(mockCollector);
- spout.setJmsProvider(new MockJmsProvider());
- spout.setJmsTupleProducer(new MockTupleProducer());
- spout.setJmsAcknowledgeMode(Session.CLIENT_ACKNOWLEDGE);
- spout.setRecoveryPeriodMs(10); // Rapid recovery for testing.
- spout.open(new HashMap<>(), null, collector);
- ConnectionFactory connectionFactory = mockProvider.connectionFactory();
- Destination destination = mockProvider.destination();
- Message msg = this.sendMessage(connectionFactory, destination);
- Thread.sleep(100);
- spout.nextTuple(); // Pretend to be storm.
- Assert.assertTrue(mockCollector.emitted);
+ spout.setJmsProvider(new MockJmsProvider());
+ spout.setJmsTupleProducer(new MockTupleProducer());
+ spout.setJmsAcknowledgeMode(Session.CLIENT_ACKNOWLEDGE);
+ spout.setRecoveryPeriodMs(10); // Rapid recovery for testing.
+ spout.open(new HashMap<>(), null, collector);
+ ConnectionFactory connectionFactory = mockProvider.connectionFactory();
+ Destination destination = mockProvider.destination();
+ Message msg = this.sendMessage(connectionFactory, destination);
+ Thread.sleep(100);
+ LOG.info("Calling nextTuple on the spout...");
+ spout.nextTuple(); // Pretend to be storm.
+ Assert.assertTrue(mockCollector.emitted);
- mockCollector.reset();
- spout.fail(msg.getJMSMessageID()); // Mock failure
- Thread.sleep(5000);
- spout.nextTuple(); // Pretend to be storm.
- Thread.sleep(5000);
- Assert.assertTrue(mockCollector.emitted); // Should have been re-emitted
+ mockCollector.reset();
+ spout.fail(msg.getJMSMessageID()); // Mock failure
+ Thread.sleep(5000);
+ spout.nextTuple(); // Pretend to be storm.
+ Thread.sleep(5000);
+ Assert.assertTrue(mockCollector.emitted); // Should have been re-emitted
+ } finally {
+ spout.close();
+ }
}
@Test
@@ -87,21 +92,26 @@ public class JmsSpoutTest {
@Test
public void testOpenWorksMultipleTypesOfNumberObjects() throws Exception {
JmsSpout spout = new JmsSpout();
- spout.setJmsProvider(new MockJmsProvider());
- spout.setJmsTupleProducer(new MockTupleProducer());
- Map<String, Object> configuration = new HashMap<String, Object>();
- MockSpoutOutputCollector delegateCollector =
+ try {
+ spout.setJmsProvider(new MockJmsProvider());
+ spout.setJmsTupleProducer(new MockTupleProducer());
+ Map<String, Object> configuration = new HashMap<String, Object>();
+ MockSpoutOutputCollector delegateCollector =
new MockSpoutOutputCollector();
- SpoutOutputCollector collector =
+ SpoutOutputCollector collector =
new SpoutOutputCollector(delegateCollector);
- // Test with long value
- configuration.put(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS, 1000L);
- spout.open(configuration, null, collector);
+ // Test with long value
+ configuration.put(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS, 1000L);
+ spout.open(configuration, null, collector);
+ spout.close();
- // Test with integer value
- configuration.put(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS, 1000);
- spout.open(configuration, null, collector);
+ // Test with integer value
+ configuration.put(Config.TOPOLOGY_MESSAGE_TIMEOUT_SECS, 1000);
+ spout.open(configuration, null, collector);
+ } finally {
+ spout.close();
+ }
}
public Message sendMessage(ConnectionFactory connectionFactory,
[2/2] storm git commit: Merge branch 'STORM-2722' of
https://github.com/revans2/incubator-storm into STORM-2722
Posted by bo...@apache.org.
Merge branch 'STORM-2722' of https://github.com/revans2/incubator-storm into STORM-2722
STORM-2722: close the JMSSpout in the tests when done
This closes #2329
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/42a4dc2f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/42a4dc2f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/42a4dc2f
Branch: refs/heads/master
Commit: 42a4dc2f62b652b6003229dc95b04dab7bf103c3
Parents: da2f035 3c88b0c
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Tue Sep 19 14:23:21 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Tue Sep 19 14:23:21 2017 -0500
----------------------------------------------------------------------
.../apache/storm/jms/spout/JmsSpoutTest.java | 72 +++++++++++---------
1 file changed, 41 insertions(+), 31 deletions(-)
----------------------------------------------------------------------