You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/21 21:44:36 UTC
[37/50] [abbrv] git commit: close resources in tests
close resources in tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/98cfe930
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/98cfe930
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/98cfe930
Branch: refs/heads/master
Commit: 98cfe93010ff069af2f7c607b11e6735060e2405
Parents: 93ca654
Author: wurstmeister <wu...@users.noreply.github.com>
Authored: Sat Apr 5 13:19:46 2014 +0100
Committer: wurstmeister <wu...@users.noreply.github.com>
Committed: Sat Apr 5 13:21:37 2014 +0100
----------------------------------------------------------------------
src/test/storm/kafka/DynamicBrokersReaderTest.java | 2 ++
src/test/storm/kafka/KafkaTestBroker.java | 1 +
src/test/storm/kafka/KafkaUtilsTest.java | 1 +
src/test/storm/kafka/ZkCoordinatorTest.java | 4 +++-
src/test/storm/kafka/bolt/KafkaBoltTest.java | 1 +
5 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/98cfe930/src/test/storm/kafka/DynamicBrokersReaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/storm/kafka/DynamicBrokersReaderTest.java b/src/test/storm/kafka/DynamicBrokersReaderTest.java
index 47387e3..d03bab3 100644
--- a/src/test/storm/kafka/DynamicBrokersReaderTest.java
+++ b/src/test/storm/kafka/DynamicBrokersReaderTest.java
@@ -43,6 +43,8 @@ public class DynamicBrokersReaderTest {
@After
public void tearDown() throws Exception {
+ dynamicBrokersReader.close();
+ zookeeper.close();
server.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/98cfe930/src/test/storm/kafka/KafkaTestBroker.java
----------------------------------------------------------------------
diff --git a/src/test/storm/kafka/KafkaTestBroker.java b/src/test/storm/kafka/KafkaTestBroker.java
index 7019c86..d2a44a4 100644
--- a/src/test/storm/kafka/KafkaTestBroker.java
+++ b/src/test/storm/kafka/KafkaTestBroker.java
@@ -48,5 +48,6 @@ public class KafkaTestBroker {
public void shutdown() {
kafka.shutdown();
+ server.stop();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/98cfe930/src/test/storm/kafka/KafkaUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/storm/kafka/KafkaUtilsTest.java b/src/test/storm/kafka/KafkaUtilsTest.java
index a4e7f52..25fa618 100644
--- a/src/test/storm/kafka/KafkaUtilsTest.java
+++ b/src/test/storm/kafka/KafkaUtilsTest.java
@@ -42,6 +42,7 @@ public class KafkaUtilsTest {
@After
public void shutdown() {
+ simpleConsumer.close();
broker.shutdown();
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/98cfe930/src/test/storm/kafka/ZkCoordinatorTest.java
----------------------------------------------------------------------
diff --git a/src/test/storm/kafka/ZkCoordinatorTest.java b/src/test/storm/kafka/ZkCoordinatorTest.java
index 35b3b4b..c08ce82 100644
--- a/src/test/storm/kafka/ZkCoordinatorTest.java
+++ b/src/test/storm/kafka/ZkCoordinatorTest.java
@@ -31,6 +31,7 @@ public class ZkCoordinatorTest {
private Map stormConf = new HashMap();
private SpoutConfig spoutConfig;
private ZkState state;
+ private SimpleConsumer simpleConsumer;
@Before
public void setUp() throws Exception {
@@ -42,7 +43,7 @@ public class ZkCoordinatorTest {
spoutConfig = new SpoutConfig(hosts, "topic", "/test", "id");
Map conf = buildZookeeperConfig(server);
state = new ZkState(conf);
- SimpleConsumer simpleConsumer = new SimpleConsumer("localhost", broker.getPort(), 60000, 1024, "testClient");
+ simpleConsumer = new SimpleConsumer("localhost", broker.getPort(), 60000, 1024, "testClient");
when(dynamicPartitionConnections.register(any(Broker.class), anyInt())).thenReturn(simpleConsumer);
}
@@ -58,6 +59,7 @@ public class ZkCoordinatorTest {
@After
public void shutdown() throws Exception {
+ simpleConsumer.close();
broker.shutdown();
server.stop();
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/98cfe930/src/test/storm/kafka/bolt/KafkaBoltTest.java
----------------------------------------------------------------------
diff --git a/src/test/storm/kafka/bolt/KafkaBoltTest.java b/src/test/storm/kafka/bolt/KafkaBoltTest.java
index 129b0f6..fa5a104 100644
--- a/src/test/storm/kafka/bolt/KafkaBoltTest.java
+++ b/src/test/storm/kafka/bolt/KafkaBoltTest.java
@@ -53,6 +53,7 @@ public class KafkaBoltTest {
@After
public void shutdown() {
+ simpleConsumer.close();
broker.shutdown();
}