You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/07/05 18:23:06 UTC
[1/2] storm git commit: STORM-3142: Add JUnit 5 support,
migrate a couple of tests in storm-kafka-client to check that both
JUnit 5 and 4 work. Also fix storm-kafka-client tests so they delete their
temporary directories when done testing.
Repository: storm
Updated Branches:
refs/heads/master 26d2f9552 -> db86bade0
STORM-3142: Add JUnit 5 support, migrate a couple of tests in storm-kafka-client to check that both JUnit 5 and 4 work. Also fix storm-kafka-client tests so they delete their temporary directories when done testing.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c14a9b53
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c14a9b53
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c14a9b53
Branch: refs/heads/master
Commit: c14a9b53f2aa68c161063a5a5e141c4eab0356bb
Parents: 26d2f95
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Wed Jul 4 17:11:59 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Wed Jul 4 19:41:53 2018 +0200
----------------------------------------------------------------------
examples/storm-loadgen/pom.xml | 5 --
examples/storm-starter/pom.xml | 5 --
external/storm-elasticsearch/pom.xml | 5 --
external/storm-hbase/pom.xml | 5 --
external/storm-jms/pom.xml | 6 ---
external/storm-kafka-client/pom.xml | 4 ++
.../java/org/apache/storm/kafka/KafkaUnit.java | 6 ++-
.../apache/storm/kafka/KafkaUnitExtension.java | 45 ++++++++++++++++
.../org/apache/storm/kafka/KafkaUnitRule.java | 45 ----------------
.../storm/kafka/NullRecordTranslator.java | 1 -
.../kafka/spout/KafkaSpoutAbstractTest.java | 50 ++++++++----------
.../storm/kafka/spout/KafkaSpoutConfigTest.java | 31 +++++------
.../storm/kafka/spout/KafkaSpoutEmitTest.java | 8 ++-
.../kafka/spout/KafkaSpoutNullTupleTest.java | 12 ++---
.../kafka/spout/KafkaSpoutReactivationTest.java | 25 +++++----
.../kafka/spout/KafkaSpoutSingleTopicTest.java | 55 +++++++++-----------
...outTopologyDeployActivateDeactivateTest.java | 9 ++--
.../kafka/spout/MaxUncommittedOffsetTest.java | 34 ++++++------
.../kafka/spout/internal/OffsetManagerTest.java | 17 +++---
external/storm-mongodb/pom.xml | 5 --
external/storm-opentsdb/pom.xml | 5 --
external/storm-redis/pom.xml | 5 --
external/storm-rocketmq/pom.xml | 5 --
pom.xml | 28 +++++++---
sql/storm-sql-core/pom.xml | 5 --
sql/storm-sql-external/storm-sql-hdfs/pom.xml | 5 --
sql/storm-sql-external/storm-sql-kafka/pom.xml | 5 --
.../storm-sql-mongodb/pom.xml | 5 --
sql/storm-sql-external/storm-sql-redis/pom.xml | 5 --
sql/storm-sql-runtime/pom.xml | 5 --
storm-buildtools/storm-maven-plugins/pom.xml | 5 --
storm-client/pom.xml | 4 --
.../jvm/org/apache/storm/testing/TmpPath.java | 2 +-
storm-core/pom.xml | 5 --
storm-webapp/pom.xml | 4 --
35 files changed, 182 insertions(+), 284 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/examples/storm-loadgen/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-loadgen/pom.xml b/examples/storm-loadgen/pom.xml
index 68478b5..ebca6b1 100644
--- a/examples/storm-loadgen/pom.xml
+++ b/examples/storm-loadgen/pom.xml
@@ -36,11 +36,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>HdrHistogram</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-client</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 569daf5..6842fee 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -40,11 +40,6 @@
<artifactId>HdrHistogram</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.5</version>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-elasticsearch/pom.xml b/external/storm-elasticsearch/pom.xml
index c6371a4..3386fbd 100644
--- a/external/storm-elasticsearch/pom.xml
+++ b/external/storm-elasticsearch/pom.xml
@@ -81,11 +81,6 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>${guava.version}</version>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-hbase/pom.xml b/external/storm-hbase/pom.xml
index 04e8ba0..e5295a6 100644
--- a/external/storm-hbase/pom.xml
+++ b/external/storm-hbase/pom.xml
@@ -84,11 +84,6 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-jms/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml
index d5121ab..387c052 100644
--- a/external/storm-jms/pom.xml
+++ b/external/storm-jms/pom.xml
@@ -48,12 +48,6 @@
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
<!-- Active MQ for testing JMS-->
<dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index 54043a7..d3d1aab 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -89,6 +89,10 @@
<artifactId>mockito-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
index a9f8208..3f212cc 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnit.java
@@ -40,12 +40,14 @@ import org.I0Itec.zkclient.ZkClient;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.Serializer;
+import org.apache.storm.testing.TmpPath;
public class KafkaUnit {
private KafkaServer kafkaServer;
private EmbeddedZookeeper zkServer;
private ZkUtils zkUtils;
private KafkaProducer<String, String> producer;
+ private TmpPath kafkaDir;
private static final String ZK_HOST = "127.0.0.1";
private static final String KAFKA_HOST = "127.0.0.1";
private static final int KAFKA_PORT = 9092;
@@ -61,10 +63,11 @@ public class KafkaUnit {
zkUtils = ZkUtils.apply(zkClient, false);
// setup Broker
+ kafkaDir = new TmpPath(Files.createTempDirectory("kafka-").toAbsolutePath().toString());
Properties brokerProps = new Properties();
brokerProps.setProperty("zookeeper.connect", zkConnect);
brokerProps.setProperty("broker.id", "0");
- brokerProps.setProperty("log.dirs", Files.createTempDirectory("kafka-").toAbsolutePath().toString());
+ brokerProps.setProperty("log.dirs", kafkaDir.getPath());
brokerProps.setProperty("listeners", String.format("PLAINTEXT://%s:%d", KAFKA_HOST, KAFKA_PORT));
KafkaConfig config = new KafkaConfig(brokerProps);
MockTime mock = new MockTime();
@@ -77,6 +80,7 @@ public class KafkaUnit {
public void tearDown() {
closeProducer();
kafkaServer.shutdown();
+ kafkaDir.close();
zkUtils.close();
zkServer.shutdown();
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitExtension.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitExtension.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitExtension.java
new file mode 100644
index 0000000..e7e0041
--- /dev/null
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitExtension.java
@@ -0,0 +1,45 @@
+/*
+ * 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.storm.kafka;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class KafkaUnitExtension implements BeforeEachCallback, AfterEachCallback {
+
+ private final KafkaUnit kafkaUnit;
+
+ public KafkaUnitExtension() {
+ this.kafkaUnit = new KafkaUnit();
+ }
+
+ @Override
+ public void beforeEach(ExtensionContext ctx) throws Exception {
+ kafkaUnit.setUp();
+ }
+
+ @Override
+ public void afterEach(ExtensionContext ctx) throws Exception {
+ kafkaUnit.tearDown();
+ }
+
+ public KafkaUnit getKafkaUnit() {
+ return this.kafkaUnit;
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java
deleted file mode 100644
index 013d20f..0000000
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/KafkaUnitRule.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.storm.kafka;
-
-import java.io.IOException;
-import org.junit.rules.ExternalResource;
-
-
-public class KafkaUnitRule extends ExternalResource {
-
- private final KafkaUnit kafkaUnit;
-
- public KafkaUnitRule() {
- this.kafkaUnit = new KafkaUnit();
- }
-
- @Override
- public void before() throws IOException {
- kafkaUnit.setUp();
- }
-
- @Override
- public void after() {
- kafkaUnit.tearDown();
- }
-
- public KafkaUnit getKafkaUnit() {
- return this.kafkaUnit;
- }
-}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
index 065244e..8f800a0 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/NullRecordTranslator.java
@@ -16,7 +16,6 @@
package org.apache.storm.kafka;
-import java.util.Collections;
import java.util.List;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.storm.kafka.spout.RecordTranslator;
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java
index a7b3e09..98aed93 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutAbstractTest.java
@@ -18,45 +18,41 @@
package org.apache.storm.kafka.spout;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import java.util.HashMap;
+import java.util.Map;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.consumer.OffsetAndMetadata;
import org.apache.kafka.common.TopicPartition;
-import org.apache.storm.kafka.KafkaUnitRule;
+import org.apache.storm.kafka.KafkaUnitExtension;
import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
import org.apache.storm.kafka.spout.internal.KafkaConsumerFactory;
import org.apache.storm.kafka.spout.internal.KafkaConsumerFactoryDefault;
+import org.apache.storm.kafka.spout.subscription.TopicAssigner;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.tuple.Values;
import org.apache.storm.utils.Time;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
+import org.mockito.junit.jupiter.MockitoExtension;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import org.apache.storm.kafka.spout.subscription.TopicAssigner;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
+@ExtendWith(MockitoExtension.class)
public abstract class KafkaSpoutAbstractTest {
- @Rule
- public MockitoRule mockito = MockitoJUnit.rule();
-
- @Rule
- public KafkaUnitRule kafkaUnitRule = new KafkaUnitRule();
+ @RegisterExtension
+ public KafkaUnitExtension kafkaUnitExtension = new KafkaUnitExtension();
final TopologyContext topologyContext = mock(TopologyContext.class);
final Map<String, Object> conf = new HashMap<>();
@@ -79,7 +75,7 @@ public abstract class KafkaSpoutAbstractTest {
this.commitOffsetPeriodMs = commitOffsetPeriodMs;
}
- @Before
+ @BeforeEach
public void setUp() {
spoutConfig = createSpoutConfig();
@@ -105,7 +101,7 @@ public abstract class KafkaSpoutAbstractTest {
return spy(new KafkaConsumerFactoryDefault<String, String>().createConsumer(spoutConfig));
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
simulatedTime.close();
}
@@ -113,7 +109,7 @@ public abstract class KafkaSpoutAbstractTest {
abstract KafkaSpoutConfig<String, String> createSpoutConfig();
void prepareSpout(int messageCount) throws Exception {
- SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitRule.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, messageCount);
+ SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitExtension.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, messageCount);
SingleTopicKafkaUnitSetupHelper.initializeSpout(spout, conf, topologyContext, collectorMock);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutConfigTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutConfigTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutConfigTest.java
index 17e0700..e168f07 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutConfigTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutConfigTest.java
@@ -19,28 +19,24 @@ package org.apache.storm.kafka.spout;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.HashMap;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.storm.kafka.spout.KafkaSpoutConfig.FirstPollOffsetStrategy;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class KafkaSpoutConfigTest {
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
@Test
public void testBasic() {
KafkaSpoutConfig<String, String> conf = KafkaSpoutConfig.builder("localhost:1234", "topic").build();
- assertEquals(FirstPollOffsetStrategy.UNCOMMITTED_EARLIEST, conf.getFirstPollOffsetStrategy());
+ assertEquals(conf.getFirstPollOffsetStrategy(), FirstPollOffsetStrategy.UNCOMMITTED_EARLIEST);
assertNull(conf.getConsumerGroupId());
assertTrue(conf.getTranslator() instanceof DefaultRecordTranslator);
HashMap<String, Object> expected = new HashMap<>();
@@ -49,8 +45,8 @@ public class KafkaSpoutConfigTest {
expected.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest");
expected.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
expected.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
- assertEquals(expected, conf.getKafkaProps());
- assertEquals(KafkaSpoutConfig.DEFAULT_METRICS_TIME_BUCKET_SIZE_SECONDS, conf.getMetricsTimeBucketSizeInSecs());
+ assertEquals(conf.getKafkaProps(), expected);
+ assertEquals(conf.getMetricsTimeBucketSizeInSecs(), KafkaSpoutConfig.DEFAULT_METRICS_TIME_BUCKET_SIZE_SECONDS);
}
@Test
@@ -59,7 +55,7 @@ public class KafkaSpoutConfigTest {
.setEmitNullTuples(true)
.build();
- assertTrue("Failed to set emit null tuples to true", conf.isEmitNullTuples());
+ assertTrue(conf.isEmitNullTuples(), "Failed to set emit null tuples to true");
}
@Test
@@ -88,14 +84,13 @@ public class KafkaSpoutConfigTest {
.setMetricsTimeBucketSizeInSecs(100)
.build();
- assertEquals(100, conf.getMetricsTimeBucketSizeInSecs());
+ assertEquals(conf.getMetricsTimeBucketSizeInSecs(), 100);
}
@Test
public void testThrowsIfEnableAutoCommitIsSet() {
- expectedException.expect(IllegalStateException.class);
- KafkaSpoutConfig.builder("localhost:1234", "topic")
+ Assertions.assertThrows(IllegalStateException.class, () -> KafkaSpoutConfig.builder("localhost:1234", "topic")
.setProp(ConsumerConfig.ENABLE_AUTO_COMMIT_CONFIG, true)
- .build();
+ .build());
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java
index 01e2e9f..c8f490c 100755
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutEmitTest.java
@@ -16,7 +16,6 @@
package org.apache.storm.kafka.spout;
import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
@@ -40,8 +39,6 @@ import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.utils.Time;
import org.apache.storm.utils.Time.SimulatedTime;
-import org.junit.Before;
-import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.InOrder;
@@ -54,9 +51,10 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
-import org.apache.kafka.clients.consumer.internals.PartitionAssignor.Subscription;
import org.apache.storm.kafka.spout.subscription.ManualPartitioner;
import org.apache.storm.kafka.spout.subscription.TopicFilter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class KafkaSpoutEmitTest {
@@ -68,7 +66,7 @@ public class KafkaSpoutEmitTest {
private KafkaConsumer<String, String> consumerMock;
private KafkaSpoutConfig<String, String> spoutConfig;
- @Before
+ @BeforeEach
public void setUp() {
spoutConfig = createKafkaSpoutConfigBuilder(mock(TopicFilter.class), mock(ManualPartitioner.class), -1)
.setOffsetCommitPeriodMs(offsetCommitPeriodMs)
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutNullTupleTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutNullTupleTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutNullTupleTest.java
index ce93ea2..6d52030 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutNullTupleTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutNullTupleTest.java
@@ -18,17 +18,15 @@
package org.apache.storm.kafka.spout;
-import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
-import org.apache.storm.utils.Time;
-import org.junit.Test;
-
-import java.util.regex.Pattern;
-
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import java.util.regex.Pattern;
import org.apache.storm.kafka.NullRecordTranslator;
+import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
+import org.apache.storm.utils.Time;
+import org.junit.jupiter.api.Test;
public class KafkaSpoutNullTupleTest extends KafkaSpoutAbstractTest {
@@ -39,7 +37,7 @@ public class KafkaSpoutNullTupleTest extends KafkaSpoutAbstractTest {
@Override
KafkaSpoutConfig<String, String> createSpoutConfig() {
- return KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitRule.getKafkaUnit().getKafkaPort(),
+ return KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitExtension.getKafkaUnit().getKafkaPort(),
Pattern.compile(SingleTopicKafkaSpoutConfiguration.TOPIC))
.setOffsetCommitPeriodMs(commitOffsetPeriodMs)
.setRecordTranslator(new NullRecordTranslator<>())
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java
index 5b37a8d..1b3a490 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutReactivationTest.java
@@ -34,7 +34,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.consumer.OffsetAndMetadata;
import org.apache.kafka.common.TopicPartition;
-import org.apache.storm.kafka.KafkaUnitRule;
+import org.apache.storm.kafka.KafkaUnitExtension;
import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
import org.apache.storm.kafka.spout.internal.KafkaConsumerFactory;
import org.apache.storm.kafka.spout.internal.KafkaConsumerFactoryDefault;
@@ -42,19 +42,19 @@ import org.apache.storm.kafka.spout.subscription.TopicAssigner;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.utils.Time;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class KafkaSpoutReactivationTest {
- @Rule
- public KafkaUnitRule kafkaUnitRule = new KafkaUnitRule();
+ @RegisterExtension
+ public KafkaUnitExtension kafkaUnitExtension = new KafkaUnitExtension();
@Captor
private ArgumentCaptor<Map<TopicPartition, OffsetAndMetadata>> commitCapture;
@@ -68,11 +68,10 @@ public class KafkaSpoutReactivationTest {
private KafkaSpout<String, String> spout;
private final int maxPollRecords = 10;
- @Before
+ @BeforeEach
public void setUp() {
KafkaSpoutConfig<String, String> spoutConfig =
- SingleTopicKafkaSpoutConfiguration.setCommonSpoutConfig(
- KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitRule.getKafkaUnit().getKafkaPort(),
+ SingleTopicKafkaSpoutConfiguration.setCommonSpoutConfig(KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitExtension.getKafkaUnit().getKafkaPort(),
SingleTopicKafkaSpoutConfiguration.TOPIC))
.setFirstPollOffsetStrategy(UNCOMMITTED_EARLIEST)
.setOffsetCommitPeriodMs(commitOffsetPeriodMs)
@@ -89,7 +88,7 @@ public class KafkaSpoutReactivationTest {
}
private void prepareSpout(int messageCount) throws Exception {
- SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitRule.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, messageCount);
+ SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitExtension.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, messageCount);
SingleTopicKafkaUnitSetupHelper.initializeSpout(spout, conf, topologyContext, collector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutSingleTopicTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutSingleTopicTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutSingleTopicTest.java
index 7842349..1d877f5 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutSingleTopicTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutSingleTopicTest.java
@@ -18,40 +18,35 @@
package org.apache.storm.kafka.spout;
-import org.apache.kafka.clients.consumer.OffsetAndMetadata;
-import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
-import org.apache.storm.tuple.Values;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-import java.util.Map;
-
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyListOf;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
-
-import org.apache.kafka.common.TopicPartition;
-import org.apache.storm.utils.Time;
-
-import static org.mockito.Mockito.clearInvocations;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.junit.Assert.assertEquals;
-
import java.util.regex.Pattern;
import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.OffsetAndMetadata;
+import org.apache.kafka.common.TopicPartition;
+import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
+import org.apache.storm.tuple.Values;
+import org.apache.storm.utils.Time;
import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
public class KafkaSpoutSingleTopicTest extends KafkaSpoutAbstractTest {
private final int maxPollRecords = 10;
@@ -64,7 +59,7 @@ public class KafkaSpoutSingleTopicTest extends KafkaSpoutAbstractTest {
@Override
KafkaSpoutConfig<String, String> createSpoutConfig() {
return SingleTopicKafkaSpoutConfiguration.setCommonSpoutConfig(
- KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitRule.getKafkaUnit().getKafkaPort(),
+ KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitExtension.getKafkaUnit().getKafkaPort(),
Pattern.compile(SingleTopicKafkaSpoutConfiguration.TOPIC)))
.setOffsetCommitPeriodMs(commitOffsetPeriodMs)
.setRetry(new KafkaSpoutRetryExponentialBackoff(KafkaSpoutRetryExponentialBackoff.TimeInterval.seconds(0), KafkaSpoutRetryExponentialBackoff.TimeInterval.seconds(0),
@@ -338,7 +333,7 @@ public class KafkaSpoutSingleTopicTest extends KafkaSpoutAbstractTest {
spout.nextTuple();
verify(collectorMock, never()).emit(anyString(), anyList(), any(KafkaSpoutMessageId.class));
- SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitRule.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, 1);
+ SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitExtension.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, 1);
Time.advanceTime(KafkaSpoutConfig.DEFAULT_PARTITION_REFRESH_PERIOD_MS + KafkaSpout.TIMER_DELAY_MS);
//The new partition should be discovered and the message should be emitted
@@ -352,14 +347,14 @@ public class KafkaSpoutSingleTopicTest extends KafkaSpoutAbstractTest {
prepareSpout(messageCount);
Map<String, Long> offsetMetric = (Map<String, Long>) spout.getKafkaOffsetMetric().getValueAndReset();
- assertEquals(0, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalEarliestTimeOffset").longValue());
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalEarliestTimeOffset").longValue(), 0);
// the offset of the last available message + 1.
- assertEquals(10, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestTimeOffset").longValue());
- assertEquals(10, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalRecordsInPartitions").longValue());
- assertEquals(0, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestEmittedOffset").longValue());
- assertEquals(0, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestCompletedOffset").longValue());
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestTimeOffset").longValue(), 10);
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalRecordsInPartitions").longValue(), 10);
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestEmittedOffset").longValue(), 0);
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestCompletedOffset").longValue(), 0);
//totalSpoutLag = totalLatestTimeOffset-totalLatestCompletedOffset
- assertEquals(10, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalSpoutLag").longValue());
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalSpoutLag").longValue(), 10);
//Emit all messages and check that they are emitted. Ack the messages too
for (int i = 0; i < messageCount; i++) {
@@ -369,12 +364,12 @@ public class KafkaSpoutSingleTopicTest extends KafkaSpoutAbstractTest {
commitAndVerifyAllMessagesCommitted(messageCount);
offsetMetric = (Map<String, Long>) spout.getKafkaOffsetMetric().getValueAndReset();
- assertEquals(0, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalEarliestTimeOffset").longValue());
- assertEquals(10, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestTimeOffset").longValue());
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalEarliestTimeOffset").longValue(), 0);
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestTimeOffset").longValue(), 10);
//latest offset
- assertEquals(9, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestEmittedOffset").longValue());
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestEmittedOffset").longValue(), 9);
// offset where processing will resume upon spout restart
- assertEquals(10, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestCompletedOffset").longValue());
- assertEquals(0, offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalSpoutLag").longValue());
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalLatestCompletedOffset").longValue(), 10);
+ assertEquals(offsetMetric.get(SingleTopicKafkaSpoutConfiguration.TOPIC+"/totalSpoutLag").longValue(), 0);
}
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyDeployActivateDeactivateTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyDeployActivateDeactivateTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyDeployActivateDeactivateTest.java
index a9d7c75..3276210 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyDeployActivateDeactivateTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutTopologyDeployActivateDeactivateTest.java
@@ -18,12 +18,11 @@
package org.apache.storm.kafka.spout;
-import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
-import org.junit.Test;
+import static org.mockito.Mockito.when;
import java.util.regex.Pattern;
-
-import static org.mockito.Mockito.when;
+import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
+import org.junit.jupiter.api.Test;
public class KafkaSpoutTopologyDeployActivateDeactivateTest extends KafkaSpoutAbstractTest {
@@ -34,7 +33,7 @@ public class KafkaSpoutTopologyDeployActivateDeactivateTest extends KafkaSpoutAb
@Override
KafkaSpoutConfig<String, String> createSpoutConfig() {
return SingleTopicKafkaSpoutConfiguration.setCommonSpoutConfig(
- KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitRule.getKafkaUnit().getKafkaPort(),
+ KafkaSpoutConfig.builder("127.0.0.1:" + kafkaUnitExtension.getKafkaUnit().getKafkaPort(),
Pattern.compile(SingleTopicKafkaSpoutConfiguration.TOPIC)))
.setOffsetCommitPeriodMs(commitOffsetPeriodMs)
.setFirstPollOffsetStrategy(KafkaSpoutConfig.FirstPollOffsetStrategy.EARLIEST)
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/MaxUncommittedOffsetTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/MaxUncommittedOffsetTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/MaxUncommittedOffsetTest.java
index 6b8b94b..646134a 100755
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/MaxUncommittedOffsetTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/MaxUncommittedOffsetTest.java
@@ -15,14 +15,19 @@
*/
package org.apache.storm.kafka.spout;
+import static org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration.createKafkaSpoutConfigBuilder;
import static org.hamcrest.CoreMatchers.either;
import static org.hamcrest.CoreMatchers.everyItem;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.isIn;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
-import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -31,31 +36,22 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-
import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.storm.kafka.KafkaUnitRule;
+import org.apache.storm.kafka.KafkaUnitExtension;
import org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration;
import org.apache.storm.kafka.spout.internal.KafkaConsumerFactoryDefault;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.utils.Time;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.ArgumentCaptor;
-import org.mockito.MockitoAnnotations;
-
-import static org.apache.storm.kafka.spout.config.builder.SingleTopicKafkaSpoutConfiguration.createKafkaSpoutConfigBuilder;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.never;
public class MaxUncommittedOffsetTest {
- @Rule
- public KafkaUnitRule kafkaUnitRule = new KafkaUnitRule();
+ @RegisterExtension
+ public KafkaUnitExtension kafkaUnitExtension = new KafkaUnitExtension();
private final TopologyContext topologyContext = mock(TopologyContext.class);
private final Map<String, Object> conf = new HashMap<>();
@@ -65,7 +61,7 @@ public class MaxUncommittedOffsetTest {
private final int maxUncommittedOffsets = 10;
private final int maxPollRecords = 5;
private final int initialRetryDelaySecs = 60;
- private final KafkaSpoutConfig<String, String> spoutConfig = createKafkaSpoutConfigBuilder(kafkaUnitRule.getKafkaUnit().getKafkaPort())
+ private final KafkaSpoutConfig<String, String> spoutConfig = createKafkaSpoutConfigBuilder(kafkaUnitExtension.getKafkaUnit().getKafkaPort())
.setOffsetCommitPeriodMs(commitOffsetPeriodMs)
.setProp(ConsumerConfig.MAX_POLL_RECORDS_CONFIG, maxPollRecords)
.setMaxUncommittedOffsets(maxUncommittedOffsets)
@@ -74,7 +70,7 @@ public class MaxUncommittedOffsetTest {
.build();
private KafkaSpout<String, String> spout;
- @Before
+ @BeforeEach
public void setUp() {
//This is because the tests are checking that a hard cap of maxUncommittedOffsets + maxPollRecords - 1 uncommitted offsets exists
//so Kafka must be able to return more messages than that in order for the tests to be meaningful
@@ -87,7 +83,7 @@ public class MaxUncommittedOffsetTest {
}
private void prepareSpout(int msgCount) throws Exception {
- SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitRule.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, msgCount);
+ SingleTopicKafkaUnitSetupHelper.populateTopicData(kafkaUnitExtension.getKafkaUnit(), SingleTopicKafkaSpoutConfiguration.TOPIC, msgCount);
SingleTopicKafkaUnitSetupHelper.initializeSpout(spout, conf, topologyContext, collector);
}
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/internal/OffsetManagerTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/internal/OffsetManagerTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/internal/OffsetManagerTest.java
index 9972d4c..6aa37d1 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/internal/OffsetManagerTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/internal/OffsetManagerTest.java
@@ -18,24 +18,20 @@ package org.apache.storm.kafka.spout.internal;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import java.util.NoSuchElementException;
import org.apache.kafka.clients.consumer.OffsetAndMetadata;
import org.apache.kafka.common.TopicPartition;
import org.apache.storm.kafka.spout.KafkaSpoutMessageId;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class OffsetManagerTest {
private static final String COMMIT_METADATA = "{\"topologyId\":\"tp1\",\"taskId\":3,\"threadName\":\"Thread-20\"}";
-
- @Rule
- public ExpectedException expect = ExpectedException.none();
private final long initialFetchOffset = 0;
private final TopicPartition testTp = new TopicPartition("testTopic", 0);
@@ -183,8 +179,7 @@ public class OffsetManagerTest {
assertThat("The third uncommitted offset should be 5", manager.getNthUncommittedOffsetAfterCommittedOffset(3), is(initialFetchOffset + 5L));
assertThat("The fourth uncommitted offset should be 30", manager.getNthUncommittedOffsetAfterCommittedOffset(4), is(initialFetchOffset + 30L));
- expect.expect(NoSuchElementException.class);
- manager.getNthUncommittedOffsetAfterCommittedOffset(5);
+ Assertions.assertThrows(NoSuchElementException.class, () -> manager.getNthUncommittedOffsetAfterCommittedOffset(5));
}
@Test
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-mongodb/pom.xml b/external/storm-mongodb/pom.xml
index b374957..f4b65dd 100644
--- a/external/storm-mongodb/pom.xml
+++ b/external/storm-mongodb/pom.xml
@@ -57,11 +57,6 @@
</dependency>
<!--test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-opentsdb/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-opentsdb/pom.xml b/external/storm-opentsdb/pom.xml
index 53ce5ba..84c8e68 100644
--- a/external/storm-opentsdb/pom.xml
+++ b/external/storm-opentsdb/pom.xml
@@ -91,11 +91,6 @@
<!--test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-redis/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-redis/pom.xml b/external/storm-redis/pom.xml
index 5943496..52915d9 100644
--- a/external/storm-redis/pom.xml
+++ b/external/storm-redis/pom.xml
@@ -71,11 +71,6 @@
</dependency>
<!--test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/external/storm-rocketmq/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-rocketmq/pom.xml b/external/storm-rocketmq/pom.xml
index bc0272d..7c2ae45 100644
--- a/external/storm-rocketmq/pom.xml
+++ b/external/storm-rocketmq/pom.xml
@@ -62,11 +62,6 @@
</dependency>
<!--test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a89e339..5c107c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,8 @@
<servlet.version>3.1.0</servlet.version>
<joda-time.version>2.3</joda-time.version>
<thrift.version>0.11.0</thrift.version>
- <junit.version>4.11</junit.version>
+ <junit.jupiter.version>5.2.0</junit.jupiter.version>
+ <surefire.version>2.22.0</surefire.version>
<awaitility.version>3.1.0</awaitility.version>
<metrics-clojure.version>2.5.1</metrics-clojure.version>
<hdrhistogram.version>2.1.10</hdrhistogram.version>
@@ -413,8 +414,14 @@
<dependencies>
<!-- The JUnit dependency is required for submodules by the maven-surefire-plugin <excludedGroups> configuration -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- This also puts JUnit 4 on the test classpath for all modules -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -1036,6 +1043,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
@@ -1061,10 +1074,11 @@
</dependency>
<!-- used by examples/storm-starter -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/sql/storm-sql-core/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-core/pom.xml b/sql/storm-sql-core/pom.xml
index e92a80d..712f734 100644
--- a/sql/storm-sql-core/pom.xml
+++ b/sql/storm-sql-core/pom.xml
@@ -86,11 +86,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/sql/storm-sql-external/storm-sql-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-hdfs/pom.xml b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
index 4259951..2695d56 100644
--- a/sql/storm-sql-external/storm-sql-hdfs/pom.xml
+++ b/sql/storm-sql-external/storm-sql-hdfs/pom.xml
@@ -82,11 +82,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/sql/storm-sql-external/storm-sql-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-kafka/pom.xml b/sql/storm-sql-external/storm-sql-kafka/pom.xml
index 97bd87c..b1173a0 100644
--- a/sql/storm-sql-external/storm-sql-kafka/pom.xml
+++ b/sql/storm-sql-external/storm-sql-kafka/pom.xml
@@ -71,11 +71,6 @@
<version>${storm.kafka.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/sql/storm-sql-external/storm-sql-mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-mongodb/pom.xml b/sql/storm-sql-external/storm-sql-mongodb/pom.xml
index 8bd5651..ef75405 100644
--- a/sql/storm-sql-external/storm-sql-mongodb/pom.xml
+++ b/sql/storm-sql-external/storm-sql-mongodb/pom.xml
@@ -62,11 +62,6 @@
<scope>${provided.scope}</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/sql/storm-sql-external/storm-sql-redis/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-external/storm-sql-redis/pom.xml b/sql/storm-sql-external/storm-sql-redis/pom.xml
index 4627450..0e2646e 100644
--- a/sql/storm-sql-external/storm-sql-redis/pom.xml
+++ b/sql/storm-sql-external/storm-sql-redis/pom.xml
@@ -54,11 +54,6 @@
<scope>${provided.scope}</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/sql/storm-sql-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/sql/storm-sql-runtime/pom.xml b/sql/storm-sql-runtime/pom.xml
index 77e22a4..b6601a9 100644
--- a/sql/storm-sql-runtime/pom.xml
+++ b/sql/storm-sql-runtime/pom.xml
@@ -91,11 +91,6 @@
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<sourceDirectory>src/jvm</sourceDirectory>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/storm-buildtools/storm-maven-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/storm-buildtools/storm-maven-plugins/pom.xml b/storm-buildtools/storm-maven-plugins/pom.xml
index b850f21..7ecffb3 100644
--- a/storm-buildtools/storm-maven-plugins/pom.xml
+++ b/storm-buildtools/storm-maven-plugins/pom.xml
@@ -52,11 +52,6 @@
<version>${maven.dependency.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 2bf0ed1..7c28cce 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -99,10 +99,6 @@
<!-- test -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java b/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
index 92bb591..115a3f0 100644
--- a/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
+++ b/storm-client/src/jvm/org/apache/storm/testing/TmpPath.java
@@ -48,7 +48,7 @@ public class TmpPath implements AutoCloseable {
}
@Override
- public void close() throws Exception {
+ public void close() {
if (path.exists()) {
try {
FileUtils.forceDelete(path);
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 9690a06..7829f49 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -175,11 +175,6 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/storm/blob/c14a9b53/storm-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/storm-webapp/pom.xml b/storm-webapp/pom.xml
index ba11870..407cd92 100644
--- a/storm-webapp/pom.xml
+++ b/storm-webapp/pom.xml
@@ -62,10 +62,6 @@
<artifactId>metrics-core</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</dependency>
[2/2] storm git commit: Merge branch 'STORM-3142' of
https://github.com/srdo/storm into asfgit-master
Posted by sr...@apache.org.
Merge branch 'STORM-3142' of https://github.com/srdo/storm into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/db86bade
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/db86bade
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/db86bade
Branch: refs/heads/master
Commit: db86bade005494aa26e782a3be5a64cb67ed522b
Parents: 26d2f95 c14a9b5
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Thu Jul 5 20:22:38 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Thu Jul 5 20:22:38 2018 +0200
----------------------------------------------------------------------
examples/storm-loadgen/pom.xml | 5 --
examples/storm-starter/pom.xml | 5 --
external/storm-elasticsearch/pom.xml | 5 --
external/storm-hbase/pom.xml | 5 --
external/storm-jms/pom.xml | 6 ---
external/storm-kafka-client/pom.xml | 4 ++
.../java/org/apache/storm/kafka/KafkaUnit.java | 6 ++-
.../apache/storm/kafka/KafkaUnitExtension.java | 45 ++++++++++++++++
.../org/apache/storm/kafka/KafkaUnitRule.java | 45 ----------------
.../storm/kafka/NullRecordTranslator.java | 1 -
.../kafka/spout/KafkaSpoutAbstractTest.java | 50 ++++++++----------
.../storm/kafka/spout/KafkaSpoutConfigTest.java | 31 +++++------
.../storm/kafka/spout/KafkaSpoutEmitTest.java | 8 ++-
.../kafka/spout/KafkaSpoutNullTupleTest.java | 12 ++---
.../kafka/spout/KafkaSpoutReactivationTest.java | 25 +++++----
.../kafka/spout/KafkaSpoutSingleTopicTest.java | 55 +++++++++-----------
...outTopologyDeployActivateDeactivateTest.java | 9 ++--
.../kafka/spout/MaxUncommittedOffsetTest.java | 34 ++++++------
.../kafka/spout/internal/OffsetManagerTest.java | 17 +++---
external/storm-mongodb/pom.xml | 5 --
external/storm-opentsdb/pom.xml | 5 --
external/storm-redis/pom.xml | 5 --
external/storm-rocketmq/pom.xml | 5 --
pom.xml | 28 +++++++---
sql/storm-sql-core/pom.xml | 5 --
sql/storm-sql-external/storm-sql-hdfs/pom.xml | 5 --
sql/storm-sql-external/storm-sql-kafka/pom.xml | 5 --
.../storm-sql-mongodb/pom.xml | 5 --
sql/storm-sql-external/storm-sql-redis/pom.xml | 5 --
sql/storm-sql-runtime/pom.xml | 5 --
storm-buildtools/storm-maven-plugins/pom.xml | 5 --
storm-client/pom.xml | 4 --
.../jvm/org/apache/storm/testing/TmpPath.java | 2 +-
storm-core/pom.xml | 5 --
storm-webapp/pom.xml | 4 --
35 files changed, 182 insertions(+), 284 deletions(-)
----------------------------------------------------------------------