You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2022/02/24 03:22:22 UTC
[nifi] branch main updated: NIFI-9133 Refactored nifi-media-bundle to use JUnit 5
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 51cf0fb NIFI-9133 Refactored nifi-media-bundle to use JUnit 5
51cf0fb is described below
commit 51cf0fb0d1bc43d90c18969ed4f24d8992271872
Author: Mike Thomsen <mt...@apache.org>
AuthorDate: Thu Sep 2 10:28:53 2021 -0400
NIFI-9133 Refactored nifi-media-bundle to use JUnit 5
- NIFI-9130 Refactored nifi-language-translation-bundle to use JUnit 5
- NIFI-9126 Refactored nifi-kafka-bundle to use JUnit 5
- NIFI-9125 Refactored nifi-jolt-record-bundle to use JUnit 5
This closes #5792
Signed-off-by: David Handermann <ex...@apache.org>
---
.../jolt/record/TestJoltTransformRecord.java | 22 ++----
.../jolt/record/util/TestTransformFactory.java | 23 +++---
.../processors/kafka/pubsub/ConsumeKafkaTest.java | 37 ++++-----
.../processors/kafka/pubsub/ConsumerPoolTest.java | 19 ++---
.../processors/kafka/pubsub/ITConsumeKafka.java | 19 +++--
.../kafka/pubsub/KafkaProcessorUtilsTest.java | 6 +-
.../kafka/pubsub/TestConsumeKafkaRecord_1_0.java | 50 +++++-------
.../kafka/pubsub/TestInFlightMessageTracker.java | 27 ++++---
.../processors/kafka/pubsub/TestPublishKafka.java | 10 +--
.../kafka/pubsub/TestPublishKafkaRecord_1_0.java | 10 +--
.../kafka/pubsub/TestPublisherLease.java | 91 ++++++++--------------
.../processors/kafka/pubsub/TestPublisherPool.java | 10 +--
.../record/sink/kafka/TestKafkaRecordSink_1_0.java | 6 +-
.../processors/kafka/pubsub/ConsumerPoolTest.java | 33 ++++----
.../kafka/pubsub/ITConsumeKafka_2_0.java | 6 +-
.../kafka/pubsub/KafkaProcessorUtilsTest.java | 6 +-
.../kafka/pubsub/TestConsumeKafkaRecord_2_0.java | 37 ++++-----
.../kafka/pubsub/TestConsumeKafka_2_0.java | 37 ++++-----
.../kafka/pubsub/TestConsumerPartitionsUtil.java | 23 +++---
.../kafka/pubsub/TestInFlightMessageTracker.java | 26 +++----
.../kafka/pubsub/TestPublishKafkaRecord_2_0.java | 48 +++++-------
.../kafka/pubsub/TestPublishKafka_2_0.java | 18 ++---
.../kafka/pubsub/TestPublisherLease.java | 91 ++++++++--------------
.../processors/kafka/pubsub/TestPublisherPool.java | 5 +-
.../record/sink/kafka/TestKafkaRecordSink_2_0.java | 4 +-
.../processors/kafka/pubsub/ConsumerPoolTest.java | 33 ++++----
.../kafka/pubsub/ITConsumeKafka_2_6.java | 12 +--
.../kafka/pubsub/KafkaProcessorUtilsTest.java | 9 +--
.../kafka/pubsub/TestConsumeKafkaRecord_2_6.java | 37 ++++-----
.../kafka/pubsub/TestConsumeKafka_2_6.java | 37 ++++-----
.../kafka/pubsub/TestConsumerPartitionsUtil.java | 21 +++--
.../kafka/pubsub/TestInFlightMessageTracker.java | 24 +++---
.../kafka/pubsub/TestPublishKafkaRecord_2_6.java | 48 +++++-------
.../kafka/pubsub/TestPublishKafka_2_6.java | 18 ++---
.../kafka/pubsub/TestPublisherLease.java | 91 ++++++++--------------
.../processors/kafka/pubsub/TestPublisherPool.java | 4 +-
.../record/sink/kafka/TestKafkaRecordSink_2_6.java | 6 +-
.../processors/yandex/TestYandexTranslate.java | 89 ++++++++++-----------
.../processors/image/ExtractImageMetadataTest.java | 10 +--
.../nifi/processors/image/TestResizeImage.java | 4 +-
.../processors/media/TestExtractMediaMetadata.java | 6 +-
41 files changed, 462 insertions(+), 651 deletions(-)
diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/TestJoltTransformRecord.java b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/TestJoltTransformRecord.java
index 288efe0..6bc5244 100644
--- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/TestJoltTransformRecord.java
+++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/TestJoltTransformRecord.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.processors.jolt.record;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.json.JsonRecordSetWriter;
import org.apache.nifi.processor.Relationship;
@@ -33,10 +32,10 @@ import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.StringUtils;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import java.io.IOException;
import java.net.URL;
@@ -50,9 +49,10 @@ import java.util.Map;
import java.util.Set;
import java.util.function.BiFunction;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+@DisabledOnOs(OS.WINDOWS) //The pretty printed json comparisons dont work on windows
public class TestJoltTransformRecord {
private TestRunner runner;
@@ -60,13 +60,7 @@ public class TestJoltTransformRecord {
private MockRecordParser parser;
private JsonRecordSetWriter writer;
- //The pretty printed json comparisons dont work on windows
- @BeforeClass
- public static void setUpSuite() {
- Assume.assumeTrue("Test only runs on *nix", !SystemUtils.IS_OS_WINDOWS);
- }
-
- @Before
+ @BeforeEach
public void setup() throws Exception {
processor = new JoltTransformRecord();
runner = TestRunners.newTestRunner(processor);
diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/util/TestTransformFactory.java b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/util/TestTransformFactory.java
index 016bebf..47aca1e 100644
--- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/util/TestTransformFactory.java
+++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/src/test/java/org/apache/nifi/processors/jolt/record/util/TestTransformFactory.java
@@ -17,14 +17,6 @@
package org.apache.nifi.processors.jolt.record.util;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.junit.Test;
-
import com.bazaarvoice.jolt.CardinalityTransform;
import com.bazaarvoice.jolt.Chainr;
import com.bazaarvoice.jolt.Defaultr;
@@ -34,14 +26,19 @@ import com.bazaarvoice.jolt.Modifier;
import com.bazaarvoice.jolt.Removr;
import com.bazaarvoice.jolt.Shiftr;
import com.bazaarvoice.jolt.Sortr;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class TestTransformFactory {
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+public class TestTransformFactory {
@Test
public void testGetChainTransform() throws Exception {
final String chainrSpec = new String(Files.readAllBytes(Paths.get("src/test/resources/TestTransformFactory/chainrSpec.json")));
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
index be63f62..ff276b6 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumeKafkaTest.java
@@ -20,11 +20,11 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
public class ConsumeKafkaTest {
@@ -32,7 +32,7 @@ public class ConsumeKafkaTest {
ConsumerLease mockLease = null;
ConsumerPool mockConsumerPool = null;
- @Before
+ @BeforeEach
public void setup() {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
@@ -68,28 +68,19 @@ public class ConsumeKafkaTest {
runner.setProperty(ConsumeKafka_1_0.AUTO_OFFSET_RESET, ConsumeKafka_1_0.OFFSET_EARLIEST);
runner.removeProperty(ConsumeKafka_1_0.GROUP_ID);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("invalid because Group ID is required"));
- }
+
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("invalid because Group ID is required"));
runner.setProperty(ConsumeKafka_1_0.GROUP_ID, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
runner.setProperty(ConsumeKafka_1_0.GROUP_ID, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
}
@Test
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
index 3e2fbd0..13a0e78 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
@@ -26,8 +26,8 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processors.kafka.pubsub.ConsumerPool.PoolStats;
import org.apache.nifi.provenance.ProvenanceReporter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.nio.charset.StandardCharsets;
@@ -39,8 +39,8 @@ import java.util.Map;
import java.util.UUID;
import java.util.regex.Pattern;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -57,7 +57,7 @@ public class ConsumerPoolTest {
private ConsumerPool testDemarcatedPool = null;
private ComponentLog logger = null;
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setup() {
consumer = mock(Consumer.class);
@@ -196,16 +196,11 @@ public class ConsumerPoolTest {
}
@Test
- public void validatePoolConsumerFails() throws Exception {
+ public void validatePoolConsumerFails() {
when(consumer.poll(anyLong())).thenThrow(new KafkaException("oops"));
try (final ConsumerLease lease = testPool.obtainConsumer(mockSession, mockContext)) {
- try {
- lease.poll();
- fail();
- } catch (final KafkaException ke) {
-
- }
+ assertThrows(KafkaException.class, () -> lease.poll());
}
testPool.close();
verify(mockSession, times(0)).create();
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka.java
index 4103185..a7eb913 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka.java
@@ -16,6 +16,13 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
+import org.apache.nifi.logging.ComponentLog;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -23,19 +30,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-import org.apache.nifi.logging.ComponentLog;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
-
public class ITConsumeKafka {
ConsumerLease mockLease = null;
ConsumerPool mockConsumerPool = null;
- @Before
+ @BeforeEach
public void setup() {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
@@ -131,5 +131,4 @@ public class ITConsumeKafka {
verifyNoMoreInteractions(mockConsumerPool);
verifyNoMoreInteractions(mockLease);
}
-
-}
+}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
index 1a20d2d..11808d4 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
import java.util.function.Supplier;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class KafkaProcessorUtilsTest {
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_1_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_1_0.java
index fc86aea..439c2f3 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_1_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_1_0.java
@@ -16,15 +16,6 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.logging.ComponentLog;
@@ -36,8 +27,17 @@ import org.apache.nifi.serialization.record.MockRecordWriter;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
public class TestConsumeKafkaRecord_1_0 {
@@ -45,7 +45,7 @@ public class TestConsumeKafkaRecord_1_0 {
private ConsumerPool mockConsumerPool = null;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() throws InitializationException {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
@@ -100,28 +100,18 @@ public class TestConsumeKafkaRecord_1_0 {
runner.setProperty(ConsumeKafkaRecord_1_0.AUTO_OFFSET_RESET, ConsumeKafkaRecord_1_0.OFFSET_EARLIEST);
runner.removeProperty(ConsumeKafkaRecord_1_0.GROUP_ID);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("invalid because Group ID is required"));
- }
+
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("invalid because Group ID is required"));
runner.setProperty(ConsumeKafkaRecord_1_0.GROUP_ID, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
runner.setProperty(ConsumeKafkaRecord_1_0.GROUP_ID, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
}
@Test
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
index 78c03ec..1cf1dc0 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
@@ -17,20 +17,24 @@
package org.apache.nifi.processors.kafka.pubsub;
+import org.apache.nifi.util.MockComponentLog;
+import org.apache.nifi.util.MockFlowFile;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.nifi.util.MockComponentLog;
-import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class TestInFlightMessageTracker {
- @Test(timeout = 5000L)
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS)
public void testAwaitCompletionWhenComplete() throws InterruptedException, TimeoutException {
final MockFlowFile flowFile = new MockFlowFile(1L);
@@ -49,7 +53,8 @@ public class TestInFlightMessageTracker {
tracker.awaitCompletion(1L);
}
- @Test(timeout = 5000L)
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS)
public void testAwaitCompletionWhileWaiting() throws InterruptedException, ExecutionException {
final MockFlowFile flowFile = new MockFlowFile(1L);
@@ -76,13 +81,7 @@ public class TestInFlightMessageTracker {
future.get();
}
- private void verifyNotComplete(final InFlightMessageTracker tracker) throws InterruptedException {
- try {
- tracker.awaitCompletion(10L);
- Assert.fail("Expected timeout");
- } catch (final TimeoutException te) {
- // expected
- }
+ private void verifyNotComplete(final InFlightMessageTracker tracker) {
+ assertThrows(TimeoutException.class, () -> tracker.awaitCompletion(10L));
}
-
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
index 82e0b18..8d8786b 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka.java
@@ -22,8 +22,8 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.io.InputStream;
@@ -36,8 +36,8 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
@@ -53,7 +53,7 @@ public class TestPublishKafka {
private PublisherLease mockLease;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() {
mockPool = mock(PublisherPool.class);
mockLease = mock(PublisherLease.class);
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_1_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_1_0.java
index f531f36..c41d337 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_1_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_1_0.java
@@ -29,8 +29,8 @@ import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.AdditionalMatchers;
import org.mockito.Mockito;
@@ -45,8 +45,8 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -65,7 +65,7 @@ public class TestPublishKafkaRecord_1_0 {
private TestRunner runner;
@SuppressWarnings("unchecked")
- @Before
+ @BeforeEach
public void setup() throws InitializationException, IOException {
mockPool = mock(PublisherPool.class);
mockLease = mock(PublisherLease.class);
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
index 16c825a..0a78afd 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
@@ -35,11 +35,9 @@ import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.ByteArrayInputStream;
@@ -49,8 +47,9 @@ import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
@@ -61,7 +60,7 @@ public class TestPublisherLease {
private ComponentLog logger;
private Producer<byte[], byte[]> producer;
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setup() {
logger = Mockito.mock(ComponentLog.class);
@@ -86,12 +85,7 @@ public class TestPublisherLease {
}
};
- try {
- lease.publish(flowFile, failureInputStream, messageKey, demarcatorBytes, topic, null);
- Assert.fail("Expected IOException");
- } catch (final IOException ioe) {
- // expected
- }
+ assertThrows(IOException.class, () -> lease.publish(flowFile, failureInputStream, messageKey, demarcatorBytes, topic, null));
assertEquals(1, lease.getPoisonCount());
@@ -106,19 +100,11 @@ public class TestPublisherLease {
final FlowFile flowFile = Mockito.spy(new MockFlowFile(1L));
// Need a size grater than zero to make the lease reads the InputStream.
Mockito.when(flowFile.getSize()).thenReturn(1L);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intenitional exception thrown from unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intenitional exception thrown from unit test");
}).when(producer).beginTransaction();
- try {
- lease.beginTransaction();
- Assert.fail("Expected ProducerFencedException");
- } catch (final ProducerFencedException pfe) {
- // expected
- }
+ assertThrows(ProducerFencedException.class, () -> lease.beginTransaction());
assertEquals(1, lease.getPoisonCount());
}
@@ -133,13 +119,10 @@ public class TestPublisherLease {
final byte[] messageKey = null;
final byte[] demarcatorBytes = null;
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocation) {
- final Callback callback = invocation.getArgument(1);
- callback.onCompletion(null, new RuntimeException("Unit Test Intentional Exception"));
- return null;
- }
+ doAnswer((Answer<Object>) invocation -> {
+ final Callback callback = invocation.getArgument(1);
+ callback.onCompletion(null, new RuntimeException("Unit Test Intentional Exception"));
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
lease.publish(flowFile, new ByteArrayInputStream(new byte[1]), messageKey, demarcatorBytes, topic, null);
@@ -156,20 +139,17 @@ public class TestPublisherLease {
final PoisonCountingLease lease = new PoisonCountingLease();
final AtomicInteger correctMessages = new AtomicInteger(0);
final AtomicInteger incorrectMessages = new AtomicInteger(0);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(InvocationOnMock invocation) {
- final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
- final byte[] value = record.value();
- final String valueString = new String(value, StandardCharsets.UTF_8);
- if ("1234567890".equals(valueString)) {
- correctMessages.incrementAndGet();
- } else {
- incorrectMessages.incrementAndGet();
- }
-
- return null;
+ doAnswer((Answer<Object>) invocation -> {
+ final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
+ final byte[] value = record.value();
+ final String valueString = new String(value, StandardCharsets.UTF_8);
+ if ("1234567890".equals(valueString)) {
+ correctMessages.incrementAndGet();
+ } else {
+ incorrectMessages.incrementAndGet();
}
+
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
final FlowFile flowFile = new MockFlowFile(1L);
@@ -209,20 +189,17 @@ public class TestPublisherLease {
final AtomicInteger correctMessages = new AtomicInteger(0);
final AtomicInteger incorrectMessages = new AtomicInteger(0);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(InvocationOnMock invocation) {
- final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
- final byte[] value = record.value();
- final String valueString = new String(value, StandardCharsets.UTF_8);
- if ("".equals(valueString)) {
- correctMessages.incrementAndGet();
- } else {
- incorrectMessages.incrementAndGet();
- }
-
- return null;
+ doAnswer((Answer<Object>) invocation -> {
+ final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
+ final byte[] value = record.value();
+ final String valueString = new String(value, StandardCharsets.UTF_8);
+ if ("".equals(valueString)) {
+ correctMessages.incrementAndGet();
+ } else {
+ incorrectMessages.incrementAndGet();
}
+
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
final FlowFile flowFile = new MockFlowFile(1L);
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
index 4deeba3..27f9fb7 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
@@ -17,16 +17,16 @@
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertEquals;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
+import org.apache.nifi.logging.ComponentLog;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
-import org.apache.kafka.common.serialization.ByteArraySerializer;
-import org.apache.nifi.logging.ComponentLog;
-import org.junit.Test;
-import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestPublisherPool {
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_1_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_1_0.java
index 6f18ce0..ae0da43 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_1_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-1-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_1_0.java
@@ -45,7 +45,7 @@ import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.state.MockStateManager;
import org.apache.nifi.util.MockControllerServiceInitializationContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatcher;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
@@ -61,8 +61,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
index 1aa4a27..a961866 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
@@ -26,8 +26,8 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processors.kafka.pubsub.ConsumerPool.PoolStats;
import org.apache.nifi.provenance.ProvenanceReporter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.nio.charset.StandardCharsets;
@@ -40,11 +40,11 @@ import java.util.Map;
import java.util.UUID;
import java.util.regex.Pattern;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -61,7 +61,7 @@ public class ConsumerPoolTest {
private ConsumerPool testDemarcatedPool = null;
private ComponentLog logger = null;
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setup() {
consumer = mock(Consumer.class);
@@ -112,7 +112,7 @@ public class ConsumerPoolTest {
}
@Test
- public void validatePoolSimpleCreateClose() throws Exception {
+ public void validatePoolSimpleCreateClose() {
when(consumer.poll(any(Duration.class))).thenReturn(createConsumerRecords("nifi", 0, 0L, new byte[][]{}));
try (final ConsumerLease lease = testPool.obtainConsumer(mockSession, mockContext)) {
@@ -138,7 +138,7 @@ public class ConsumerPoolTest {
@Test
@SuppressWarnings("unchecked")
- public void validatePoolSimpleCreatePollClose() throws Exception {
+ public void validatePoolSimpleCreatePollClose() {
final byte[][] firstPassValues = new byte[][]{
"Hello-1".getBytes(StandardCharsets.UTF_8),
"Hello-2".getBytes(StandardCharsets.UTF_8),
@@ -244,7 +244,7 @@ public class ConsumerPoolTest {
@Test
- public void validatePoolSimpleBatchCreateClose() throws Exception {
+ public void validatePoolSimpleBatchCreateClose() {
when(consumer.poll(any(Duration.class))).thenReturn(createConsumerRecords("nifi", 0, 0L, new byte[][]{}));
for (int i = 0; i < 100; i++) {
try (final ConsumerLease lease = testPool.obtainConsumer(mockSession, mockContext)) {
@@ -264,7 +264,7 @@ public class ConsumerPoolTest {
@Test
@SuppressWarnings("unchecked")
- public void validatePoolBatchCreatePollClose() throws Exception {
+ public void validatePoolBatchCreatePollClose() {
final byte[][] firstPassValues = new byte[][]{
"Hello-1".getBytes(StandardCharsets.UTF_8),
"Hello-2".getBytes(StandardCharsets.UTF_8),
@@ -287,16 +287,11 @@ public class ConsumerPoolTest {
}
@Test
- public void validatePoolConsumerFails() throws Exception {
+ public void validatePoolConsumerFails() {
when(consumer.poll(any(Duration.class))).thenThrow(new KafkaException("oops"));
try (final ConsumerLease lease = testPool.obtainConsumer(mockSession, mockContext)) {
- try {
- lease.poll();
- fail();
- } catch (final KafkaException ke) {
-
- }
+ assertThrows(KafkaException.class, () -> lease.poll());
}
testPool.close();
verify(mockSession, times(0)).create();
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_0.java
index 357ca80..c4e8813 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_0.java
@@ -20,8 +20,8 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -35,7 +35,7 @@ public class ITConsumeKafka_2_0 {
ConsumerLease mockLease = null;
ConsumerPool mockConsumerPool = null;
- @Before
+ @BeforeEach
public void setup() {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
index 1a20d2d..11808d4 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.nifi.processors.kafka.pubsub;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.jupiter.api.Test;
import java.util.function.Supplier;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class KafkaProcessorUtilsTest {
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_0.java
index 08cc612..e57d070 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_0.java
@@ -27,11 +27,11 @@ import org.apache.nifi.serialization.record.MockRecordWriter;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -45,7 +45,7 @@ public class TestConsumeKafkaRecord_2_0 {
private ConsumerPool mockConsumerPool = null;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() throws InitializationException {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
@@ -100,28 +100,19 @@ public class TestConsumeKafkaRecord_2_0 {
runner.setProperty(ConsumeKafkaRecord_2_0.AUTO_OFFSET_RESET, ConsumeKafkaRecord_2_0.OFFSET_EARLIEST);
runner.removeProperty(ConsumeKafkaRecord_2_0.GROUP_ID);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("invalid because Group ID is required"));
- }
+
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("invalid because Group ID is required"));
runner.setProperty(ConsumeKafkaRecord_2_0.GROUP_ID, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
runner.setProperty(ConsumeKafkaRecord_2_0.GROUP_ID, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
}
@Test
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java
index 5367494..6d5f44f 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_0.java
@@ -20,11 +20,11 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
public class TestConsumeKafka_2_0 {
@@ -32,7 +32,7 @@ public class TestConsumeKafka_2_0 {
ConsumerLease mockLease = null;
ConsumerPool mockConsumerPool = null;
- @Before
+ @BeforeEach
public void setup() {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
@@ -68,28 +68,19 @@ public class TestConsumeKafka_2_0 {
runner.setProperty(ConsumeKafka_2_0.AUTO_OFFSET_RESET, ConsumeKafka_2_0.OFFSET_EARLIEST);
runner.removeProperty(ConsumeKafka_2_0.GROUP_ID);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("invalid because Group ID is required"));
- }
+
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("invalid because Group ID is required"));
runner.setProperty(ConsumeKafka_2_0.GROUP_ID, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
runner.setProperty(ConsumeKafka_2_0.GROUP_ID, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
}
@Test
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java
index 1053f2b..4f53bab 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java
@@ -20,8 +20,9 @@ package org.apache.nifi.processors.kafka.pubsub;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.mock.MockComponentLogger;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -29,18 +30,17 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestConsumerPartitionsUtil {
private final ComponentLog logger = new MockComponentLogger();
private String hostname;
- @Before
+ @BeforeEach
public void setup() throws UnknownHostException {
hostname = InetAddress.getLocalHost().getHostName();;
}
@@ -49,7 +49,7 @@ public class TestConsumerPartitionsUtil {
public void testNoPartitionAssignments() throws UnknownHostException {
final Map<String, String> properties = Collections.singletonMap("key", "value");
final int[] partitions = ConsumerPartitionsUtil.getPartitionsForHost(properties, logger);
- assertNull(partitions);
+ Assertions.assertNull(partitions);
}
@Test
@@ -116,5 +116,4 @@ public class TestConsumerPartitionsUtil {
assertNotNull(partitions);
assertEquals(0, partitions.length);
}
-
-}
+}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
index f95c3c4..3e1c5bb 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
@@ -17,21 +17,24 @@
package org.apache.nifi.processors.kafka.pubsub;
-import org.apache.nifi.processors.kafka.pubsub.InFlightMessageTracker;
import org.apache.nifi.util.MockComponentLog;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class TestInFlightMessageTracker {
- @Test(timeout = 5000L)
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS)
public void testAwaitCompletionWhenComplete() throws InterruptedException, TimeoutException {
final MockFlowFile flowFile = new MockFlowFile(1L);
@@ -50,7 +53,8 @@ public class TestInFlightMessageTracker {
tracker.awaitCompletion(1L);
}
- @Test(timeout = 5000L)
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS)
public void testAwaitCompletionWhileWaiting() throws InterruptedException, ExecutionException {
final MockFlowFile flowFile = new MockFlowFile(1L);
@@ -77,13 +81,7 @@ public class TestInFlightMessageTracker {
future.get();
}
- private void verifyNotComplete(final InFlightMessageTracker tracker) throws InterruptedException {
- try {
- tracker.awaitCompletion(10L);
- Assert.fail("Expected timeout");
- } catch (final TimeoutException te) {
- // expected
- }
+ private void verifyNotComplete(final InFlightMessageTracker tracker) {
+ assertThrows(TimeoutException.class, () -> tracker.awaitCompletion(10L));
}
-
-}
+}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_0.java
index dec9176..0feed62 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_0.java
@@ -31,11 +31,10 @@ import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.AdditionalMatchers;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.IOException;
@@ -49,8 +48,8 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -69,7 +68,7 @@ public class TestPublishKafkaRecord_2_0 {
private PublisherLease mockLease;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() throws InitializationException, IOException {
mockPool = mock(PublisherPool.class);
mockLease = mock(PublisherLease.class);
@@ -177,11 +176,8 @@ public class TestPublishKafkaRecord_2_0 {
public void testFailureWhenCreationgTransaction() {
runner.enqueue("John Doe, 48");
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
}).when(mockLease).beginTransaction();
runner.run();
@@ -196,11 +192,8 @@ public class TestPublishKafkaRecord_2_0 {
runner.setProperty(KafkaProcessorUtils.FAILURE_STRATEGY, KafkaProcessorUtils.FAILURE_STRATEGY_ROLLBACK);
runner.enqueue("John Doe, 48");
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
}).when(mockLease).beginTransaction();
runner.run();
@@ -329,22 +322,19 @@ public class TestPublishKafkaRecord_2_0 {
when(mockPool.obtainPublisher()).thenReturn(mockLease);
final Map<Integer, List<Integer>> partitionsByAge = new HashMap<>();
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) throws Throwable {
- final Function<Record, Integer> partitioner = invocationOnMock.getArgument(6, Function.class);
- final RecordSet recordSet = invocationOnMock.getArgument(1, RecordSet.class);
-
- Record record;
- while ((record = recordSet.next()) != null) {
- final int partition = partitioner.apply(record);
- final Integer age = record.getAsInt("age");
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ final Function<Record, Integer> partitioner = invocationOnMock.getArgument(6, Function.class);
+ final RecordSet recordSet = invocationOnMock.getArgument(1, RecordSet.class);
- partitionsByAge.computeIfAbsent(age, k -> new ArrayList<>()).add(partition);
- }
+ Record record;
+ while ((record = recordSet.next()) != null) {
+ final int partition = partitioner.apply(record);
+ final Integer age = record.getAsInt("age");
- return null;
+ partitionsByAge.computeIfAbsent(age, k -> new ArrayList<>()).add(partition);
}
+
+ return null;
}).when(mockLease).publish(any(FlowFile.class), any(RecordSet.class), any(RecordSetWriterFactory.class),
nullable(RecordSchema.class), nullable(String.class), any(String.class), nullable(Function.class));
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_0.java
index 1cdc249..1433a89 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_0.java
@@ -23,9 +23,8 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import java.io.IOException;
@@ -39,8 +38,8 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
@@ -57,7 +56,7 @@ public class TestPublishKafka_2_0 {
private PublisherLease mockLease;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() {
mockPool = mock(PublisherPool.class);
mockLease = mock(PublisherLease.class);
@@ -113,11 +112,8 @@ public class TestPublishKafka_2_0 {
runner.enqueue("hello world");
runner.enqueue("Hello World");
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
}).when(mockLease).beginTransaction();
runner.run();
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
index 16c825a..0a78afd 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
@@ -35,11 +35,9 @@ import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.ByteArrayInputStream;
@@ -49,8 +47,9 @@ import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
@@ -61,7 +60,7 @@ public class TestPublisherLease {
private ComponentLog logger;
private Producer<byte[], byte[]> producer;
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setup() {
logger = Mockito.mock(ComponentLog.class);
@@ -86,12 +85,7 @@ public class TestPublisherLease {
}
};
- try {
- lease.publish(flowFile, failureInputStream, messageKey, demarcatorBytes, topic, null);
- Assert.fail("Expected IOException");
- } catch (final IOException ioe) {
- // expected
- }
+ assertThrows(IOException.class, () -> lease.publish(flowFile, failureInputStream, messageKey, demarcatorBytes, topic, null));
assertEquals(1, lease.getPoisonCount());
@@ -106,19 +100,11 @@ public class TestPublisherLease {
final FlowFile flowFile = Mockito.spy(new MockFlowFile(1L));
// Need a size grater than zero to make the lease reads the InputStream.
Mockito.when(flowFile.getSize()).thenReturn(1L);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intenitional exception thrown from unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intenitional exception thrown from unit test");
}).when(producer).beginTransaction();
- try {
- lease.beginTransaction();
- Assert.fail("Expected ProducerFencedException");
- } catch (final ProducerFencedException pfe) {
- // expected
- }
+ assertThrows(ProducerFencedException.class, () -> lease.beginTransaction());
assertEquals(1, lease.getPoisonCount());
}
@@ -133,13 +119,10 @@ public class TestPublisherLease {
final byte[] messageKey = null;
final byte[] demarcatorBytes = null;
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocation) {
- final Callback callback = invocation.getArgument(1);
- callback.onCompletion(null, new RuntimeException("Unit Test Intentional Exception"));
- return null;
- }
+ doAnswer((Answer<Object>) invocation -> {
+ final Callback callback = invocation.getArgument(1);
+ callback.onCompletion(null, new RuntimeException("Unit Test Intentional Exception"));
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
lease.publish(flowFile, new ByteArrayInputStream(new byte[1]), messageKey, demarcatorBytes, topic, null);
@@ -156,20 +139,17 @@ public class TestPublisherLease {
final PoisonCountingLease lease = new PoisonCountingLease();
final AtomicInteger correctMessages = new AtomicInteger(0);
final AtomicInteger incorrectMessages = new AtomicInteger(0);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(InvocationOnMock invocation) {
- final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
- final byte[] value = record.value();
- final String valueString = new String(value, StandardCharsets.UTF_8);
- if ("1234567890".equals(valueString)) {
- correctMessages.incrementAndGet();
- } else {
- incorrectMessages.incrementAndGet();
- }
-
- return null;
+ doAnswer((Answer<Object>) invocation -> {
+ final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
+ final byte[] value = record.value();
+ final String valueString = new String(value, StandardCharsets.UTF_8);
+ if ("1234567890".equals(valueString)) {
+ correctMessages.incrementAndGet();
+ } else {
+ incorrectMessages.incrementAndGet();
}
+
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
final FlowFile flowFile = new MockFlowFile(1L);
@@ -209,20 +189,17 @@ public class TestPublisherLease {
final AtomicInteger correctMessages = new AtomicInteger(0);
final AtomicInteger incorrectMessages = new AtomicInteger(0);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(InvocationOnMock invocation) {
- final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
- final byte[] value = record.value();
- final String valueString = new String(value, StandardCharsets.UTF_8);
- if ("".equals(valueString)) {
- correctMessages.incrementAndGet();
- } else {
- incorrectMessages.incrementAndGet();
- }
-
- return null;
+ doAnswer((Answer<Object>) invocation -> {
+ final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
+ final byte[] value = record.value();
+ final String valueString = new String(value, StandardCharsets.UTF_8);
+ if ("".equals(valueString)) {
+ correctMessages.incrementAndGet();
+ } else {
+ incorrectMessages.incrementAndGet();
}
+
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
final FlowFile flowFile = new MockFlowFile(1L);
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
index 275d867..405202b 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
@@ -19,14 +19,15 @@ package org.apache.nifi.processors.kafka.pubsub;
import org.apache.kafka.common.serialization.ByteArraySerializer;
import org.apache.nifi.logging.ComponentLog;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class TestPublisherPool {
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_0.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_0.java
index 3799cb6..d1bd0ff 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_0.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-0-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_0.java
@@ -61,8 +61,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
index bea87bd..02591ec 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ConsumerPoolTest.java
@@ -27,8 +27,8 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processors.kafka.pubsub.ConsumerPool.PoolStats;
import org.apache.nifi.provenance.ProvenanceReporter;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.nio.charset.StandardCharsets;
@@ -41,11 +41,11 @@ import java.util.Map;
import java.util.UUID;
import java.util.regex.Pattern;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -62,7 +62,7 @@ public class ConsumerPoolTest {
private ConsumerPool testDemarcatedPool = null;
private ComponentLog logger = null;
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setup() {
consumer = mock(Consumer.class);
@@ -115,7 +115,7 @@ public class ConsumerPoolTest {
}
@Test
- public void validatePoolSimpleCreateClose() throws Exception {
+ public void validatePoolSimpleCreateClose() {
when(consumer.poll(any(Duration.class))).thenReturn(createConsumerRecords("nifi", 0, 0L, new byte[][]{}));
try (final ConsumerLease lease = testPool.obtainConsumer(mockSession, mockContext)) {
@@ -141,7 +141,7 @@ public class ConsumerPoolTest {
@Test
@SuppressWarnings("unchecked")
- public void validatePoolSimpleCreatePollClose() throws Exception {
+ public void validatePoolSimpleCreatePollClose() {
final byte[][] firstPassValues = new byte[][]{
"Hello-1".getBytes(StandardCharsets.UTF_8),
"Hello-2".getBytes(StandardCharsets.UTF_8),
@@ -248,7 +248,7 @@ public class ConsumerPoolTest {
}
@Test
- public void validatePoolSimpleBatchCreateClose() throws Exception {
+ public void validatePoolSimpleBatchCreateClose() {
when(consumer.poll(any(Duration.class))).thenReturn(createConsumerRecords("nifi", 0, 0L, new byte[][]{}));
for (int i = 0; i < 100; i++) {
try (final ConsumerLease lease = testPool.obtainConsumer(mockSession, mockContext)) {
@@ -268,7 +268,7 @@ public class ConsumerPoolTest {
@Test
@SuppressWarnings("unchecked")
- public void validatePoolBatchCreatePollClose() throws Exception {
+ public void validatePoolBatchCreatePollClose() {
final byte[][] firstPassValues = new byte[][]{
"Hello-1".getBytes(StandardCharsets.UTF_8),
"Hello-2".getBytes(StandardCharsets.UTF_8),
@@ -292,16 +292,11 @@ public class ConsumerPoolTest {
}
@Test
- public void validatePoolConsumerFails() throws Exception {
+ public void validatePoolConsumerFails() {
when(consumer.poll(any(Duration.class))).thenThrow(new KafkaException("oops"));
try (final ConsumerLease lease = testPool.obtainConsumer(mockSession, mockContext)) {
- try {
- lease.poll();
- fail();
- } catch (final KafkaException ke) {
-
- }
+ assertThrows(KafkaException.class, () -> lease.poll());
}
testPool.close();
verify(mockSession, times(0)).create();
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_6.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_6.java
index 6b958a3..336e998 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_6.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/ITConsumeKafka_2_6.java
@@ -20,8 +20,8 @@ import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
@@ -35,14 +35,14 @@ public class ITConsumeKafka_2_6 {
ConsumerLease mockLease = null;
ConsumerPool mockConsumerPool = null;
- @Before
+ @BeforeEach
public void setup() {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
}
@Test
- public void validateGetAllMessages() throws Exception {
+ public void validateGetAllMessages() {
String groupName = "validateGetAllMessages";
when(mockConsumerPool.obtainConsumer(any(), any())).thenReturn(mockLease);
@@ -72,7 +72,7 @@ public class ITConsumeKafka_2_6 {
}
@Test
- public void validateGetAllMessagesPattern() throws Exception {
+ public void validateGetAllMessagesPattern() {
String groupName = "validateGetAllMessagesPattern";
when(mockConsumerPool.obtainConsumer(any(), any())).thenReturn(mockLease);
@@ -103,7 +103,7 @@ public class ITConsumeKafka_2_6 {
}
@Test
- public void validateGetErrorMessages() throws Exception {
+ public void validateGetErrorMessages() {
String groupName = "validateGetErrorMessages";
when(mockConsumerPool.obtainConsumer(any(), any())).thenReturn(mockLease);
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
index dceba0d..c836add 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/KafkaProcessorUtilsTest.java
@@ -18,16 +18,16 @@ package org.apache.nifi.processors.kafka.pubsub;
import org.apache.nifi.kerberos.SelfContainedKerberosUserService;
import org.apache.nifi.security.krb.KerberosUser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.security.auth.login.AppConfigurationEntry;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -68,5 +68,4 @@ public class KafkaProcessorUtilsTest {
assertNotNull(jaasConfig);
assertEquals("com.sun.security.auth.module.Krb5LoginModule required option1=\"value1\" option2=\"value2\";", jaasConfig);
}
-
}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_6.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_6.java
index 5d3f27a..7fa4ee9 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_6.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafkaRecord_2_6.java
@@ -27,11 +27,11 @@ import org.apache.nifi.serialization.record.MockRecordWriter;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@@ -45,7 +45,7 @@ public class TestConsumeKafkaRecord_2_6 {
private ConsumerPool mockConsumerPool = null;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() throws InitializationException {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
@@ -100,28 +100,19 @@ public class TestConsumeKafkaRecord_2_6 {
runner.setProperty(ConsumeKafkaRecord_2_6.AUTO_OFFSET_RESET, ConsumeKafkaRecord_2_6.OFFSET_EARLIEST);
runner.removeProperty(ConsumeKafkaRecord_2_6.GROUP_ID);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("invalid because Group ID is required"));
- }
+
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("invalid because Group ID is required"));
runner.setProperty(ConsumeKafkaRecord_2_6.GROUP_ID, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
runner.setProperty(ConsumeKafkaRecord_2_6.GROUP_ID, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
}
@Test
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java
index a7c582b..5f5a5d9 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumeKafka_2_6.java
@@ -24,11 +24,11 @@ import org.apache.nifi.kerberos.SelfContainedKerberosUserService;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -37,7 +37,7 @@ public class TestConsumeKafka_2_6 {
ConsumerLease mockLease = null;
ConsumerPool mockConsumerPool = null;
- @Before
+ @BeforeEach
public void setup() {
mockLease = mock(ConsumerLease.class);
mockConsumerPool = mock(ConsumerPool.class);
@@ -73,28 +73,19 @@ public class TestConsumeKafka_2_6 {
runner.setProperty(ConsumeKafka_2_6.AUTO_OFFSET_RESET, ConsumeKafka_2_6.OFFSET_EARLIEST);
runner.removeProperty(ConsumeKafka_2_6.GROUP_ID);
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("invalid because Group ID is required"));
- }
+
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("invalid because Group ID is required"));
runner.setProperty(ConsumeKafka_2_6.GROUP_ID, "");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
runner.setProperty(ConsumeKafka_2_6.GROUP_ID, " ");
- try {
- runner.assertValid();
- fail();
- } catch (AssertionError e) {
- assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
- }
+
+ e = assertThrows(AssertionError.class, () -> runner.assertValid());
+ assertTrue(e.getMessage().contains("must contain at least one character that is not white space"));
}
@Test
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java
index 1053f2b..d54c413 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestConsumerPartitionsUtil.java
@@ -20,8 +20,8 @@ package org.apache.nifi.processors.kafka.pubsub;
import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.mock.MockComponentLogger;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -29,18 +29,18 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestConsumerPartitionsUtil {
private final ComponentLog logger = new MockComponentLogger();
private String hostname;
- @Before
+ @BeforeEach
public void setup() throws UnknownHostException {
hostname = InetAddress.getLocalHost().getHostName();;
}
@@ -116,5 +116,4 @@ public class TestConsumerPartitionsUtil {
assertNotNull(partitions);
assertEquals(0, partitions.length);
}
-
-}
+}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
index f95c3c4..1cf1dc0 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestInFlightMessageTracker.java
@@ -17,21 +17,24 @@
package org.apache.nifi.processors.kafka.pubsub;
-import org.apache.nifi.processors.kafka.pubsub.InFlightMessageTracker;
import org.apache.nifi.util.MockComponentLog;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
public class TestInFlightMessageTracker {
- @Test(timeout = 5000L)
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS)
public void testAwaitCompletionWhenComplete() throws InterruptedException, TimeoutException {
final MockFlowFile flowFile = new MockFlowFile(1L);
@@ -50,7 +53,8 @@ public class TestInFlightMessageTracker {
tracker.awaitCompletion(1L);
}
- @Test(timeout = 5000L)
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS)
public void testAwaitCompletionWhileWaiting() throws InterruptedException, ExecutionException {
final MockFlowFile flowFile = new MockFlowFile(1L);
@@ -77,13 +81,7 @@ public class TestInFlightMessageTracker {
future.get();
}
- private void verifyNotComplete(final InFlightMessageTracker tracker) throws InterruptedException {
- try {
- tracker.awaitCompletion(10L);
- Assert.fail("Expected timeout");
- } catch (final TimeoutException te) {
- // expected
- }
+ private void verifyNotComplete(final InFlightMessageTracker tracker) {
+ assertThrows(TimeoutException.class, () -> tracker.awaitCompletion(10L));
}
-
}
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_6.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_6.java
index aefc1c0..47a7aaa 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_6.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafkaRecord_2_6.java
@@ -31,11 +31,10 @@ import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.AdditionalMatchers;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.IOException;
@@ -49,8 +48,8 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -69,7 +68,7 @@ public class TestPublishKafkaRecord_2_6 {
private PublisherLease mockLease;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() throws InitializationException, IOException {
mockPool = mock(PublisherPool.class);
mockLease = mock(PublisherLease.class);
@@ -177,11 +176,8 @@ public class TestPublishKafkaRecord_2_6 {
public void testFailureWhenCreationgTransaction() {
runner.enqueue("John Doe, 48");
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
}).when(mockLease).beginTransaction();
runner.run();
@@ -196,11 +192,8 @@ public class TestPublishKafkaRecord_2_6 {
runner.setProperty(KafkaProcessorUtils.FAILURE_STRATEGY, KafkaProcessorUtils.FAILURE_STRATEGY_ROLLBACK);
runner.enqueue("John Doe, 48");
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
}).when(mockLease).beginTransaction();
runner.run();
@@ -329,22 +322,19 @@ public class TestPublishKafkaRecord_2_6 {
when(mockPool.obtainPublisher()).thenReturn(mockLease);
final Map<Integer, List<Integer>> partitionsByAge = new HashMap<>();
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) throws Throwable {
- final Function<Record, Integer> partitioner = invocationOnMock.getArgument(6, Function.class);
- final RecordSet recordSet = invocationOnMock.getArgument(1, RecordSet.class);
-
- Record record;
- while ((record = recordSet.next()) != null) {
- final int partition = partitioner.apply(record);
- final Integer age = record.getAsInt("age");
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ final Function<Record, Integer> partitioner = invocationOnMock.getArgument(6, Function.class);
+ final RecordSet recordSet = invocationOnMock.getArgument(1, RecordSet.class);
- partitionsByAge.computeIfAbsent(age, k -> new ArrayList<>()).add(partition);
- }
+ Record record;
+ while ((record = recordSet.next()) != null) {
+ final int partition = partitioner.apply(record);
+ final Integer age = record.getAsInt("age");
- return null;
+ partitionsByAge.computeIfAbsent(age, k -> new ArrayList<>()).add(partition);
}
+
+ return null;
}).when(mockLease).publish(any(FlowFile.class), any(RecordSet.class), any(RecordSetWriterFactory.class),
nullable(RecordSchema.class), nullable(String.class), any(String.class), nullable(Function.class));
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_6.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_6.java
index 1f410a7..1157607 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_6.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublishKafka_2_6.java
@@ -23,9 +23,8 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
import java.io.IOException;
@@ -39,8 +38,8 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
@@ -57,7 +56,7 @@ public class TestPublishKafka_2_6 {
private PublisherLease mockLease;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() {
mockPool = mock(PublisherPool.class);
mockLease = mock(PublisherLease.class);
@@ -113,11 +112,8 @@ public class TestPublishKafka_2_6 {
runner.enqueue("hello world");
runner.enqueue("Hello World");
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intentional ProducedFencedException for unit test");
}).when(mockLease).beginTransaction();
runner.run();
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
index 16c825a..0a78afd 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherLease.java
@@ -35,11 +35,9 @@ import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.serialization.record.RecordSchema;
import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.io.ByteArrayInputStream;
@@ -49,8 +47,9 @@ import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
@@ -61,7 +60,7 @@ public class TestPublisherLease {
private ComponentLog logger;
private Producer<byte[], byte[]> producer;
- @Before
+ @BeforeEach
@SuppressWarnings("unchecked")
public void setup() {
logger = Mockito.mock(ComponentLog.class);
@@ -86,12 +85,7 @@ public class TestPublisherLease {
}
};
- try {
- lease.publish(flowFile, failureInputStream, messageKey, demarcatorBytes, topic, null);
- Assert.fail("Expected IOException");
- } catch (final IOException ioe) {
- // expected
- }
+ assertThrows(IOException.class, () -> lease.publish(flowFile, failureInputStream, messageKey, demarcatorBytes, topic, null));
assertEquals(1, lease.getPoisonCount());
@@ -106,19 +100,11 @@ public class TestPublisherLease {
final FlowFile flowFile = Mockito.spy(new MockFlowFile(1L));
// Need a size grater than zero to make the lease reads the InputStream.
Mockito.when(flowFile.getSize()).thenReturn(1L);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocationOnMock) {
- throw new ProducerFencedException("Intenitional exception thrown from unit test");
- }
+ doAnswer((Answer<Object>) invocationOnMock -> {
+ throw new ProducerFencedException("Intenitional exception thrown from unit test");
}).when(producer).beginTransaction();
- try {
- lease.beginTransaction();
- Assert.fail("Expected ProducerFencedException");
- } catch (final ProducerFencedException pfe) {
- // expected
- }
+ assertThrows(ProducerFencedException.class, () -> lease.beginTransaction());
assertEquals(1, lease.getPoisonCount());
}
@@ -133,13 +119,10 @@ public class TestPublisherLease {
final byte[] messageKey = null;
final byte[] demarcatorBytes = null;
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(final InvocationOnMock invocation) {
- final Callback callback = invocation.getArgument(1);
- callback.onCompletion(null, new RuntimeException("Unit Test Intentional Exception"));
- return null;
- }
+ doAnswer((Answer<Object>) invocation -> {
+ final Callback callback = invocation.getArgument(1);
+ callback.onCompletion(null, new RuntimeException("Unit Test Intentional Exception"));
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
lease.publish(flowFile, new ByteArrayInputStream(new byte[1]), messageKey, demarcatorBytes, topic, null);
@@ -156,20 +139,17 @@ public class TestPublisherLease {
final PoisonCountingLease lease = new PoisonCountingLease();
final AtomicInteger correctMessages = new AtomicInteger(0);
final AtomicInteger incorrectMessages = new AtomicInteger(0);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(InvocationOnMock invocation) {
- final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
- final byte[] value = record.value();
- final String valueString = new String(value, StandardCharsets.UTF_8);
- if ("1234567890".equals(valueString)) {
- correctMessages.incrementAndGet();
- } else {
- incorrectMessages.incrementAndGet();
- }
-
- return null;
+ doAnswer((Answer<Object>) invocation -> {
+ final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
+ final byte[] value = record.value();
+ final String valueString = new String(value, StandardCharsets.UTF_8);
+ if ("1234567890".equals(valueString)) {
+ correctMessages.incrementAndGet();
+ } else {
+ incorrectMessages.incrementAndGet();
}
+
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
final FlowFile flowFile = new MockFlowFile(1L);
@@ -209,20 +189,17 @@ public class TestPublisherLease {
final AtomicInteger correctMessages = new AtomicInteger(0);
final AtomicInteger incorrectMessages = new AtomicInteger(0);
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(InvocationOnMock invocation) {
- final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
- final byte[] value = record.value();
- final String valueString = new String(value, StandardCharsets.UTF_8);
- if ("".equals(valueString)) {
- correctMessages.incrementAndGet();
- } else {
- incorrectMessages.incrementAndGet();
- }
-
- return null;
+ doAnswer((Answer<Object>) invocation -> {
+ final ProducerRecord<byte[], byte[]> record = invocation.getArgument(0);
+ final byte[] value = record.value();
+ final String valueString = new String(value, StandardCharsets.UTF_8);
+ if ("".equals(valueString)) {
+ correctMessages.incrementAndGet();
+ } else {
+ incorrectMessages.incrementAndGet();
}
+
+ return null;
}).when(producer).send(any(ProducerRecord.class), any(Callback.class));
final FlowFile flowFile = new MockFlowFile(1L);
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
index 275d867..27f9fb7 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/processors/kafka/pubsub/TestPublisherPool.java
@@ -19,14 +19,14 @@ package org.apache.nifi.processors.kafka.pubsub;
import org.apache.kafka.common.serialization.ByteArraySerializer;
import org.apache.nifi.logging.ComponentLog;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestPublisherPool {
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_6.java b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_6.java
index 3372ee5..8ca54bf 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_6.java
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/src/test/java/org/apache/nifi/record/sink/kafka/TestKafkaRecordSink_2_6.java
@@ -45,7 +45,7 @@ import org.apache.nifi.serialization.record.RecordSet;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.state.MockStateManager;
import org.apache.nifi.util.MockControllerServiceInitializationContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatcher;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
@@ -61,8 +61,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/src/test/java/org/apache/nifi/processors/yandex/TestYandexTranslate.java b/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/src/test/java/org/apache/nifi/processors/yandex/TestYandexTranslate.java
index 0b62b2d..ed6e303 100644
--- a/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/src/test/java/org/apache/nifi/processors/yandex/TestYandexTranslate.java
+++ b/nifi-nar-bundles/nifi-language-translation-bundle/nifi-yandex-processors/src/test/java/org/apache/nifi/processors/yandex/TestYandexTranslate.java
@@ -20,10 +20,9 @@ import org.apache.nifi.processors.yandex.model.Translation;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import javax.ws.rs.client.Invocation;
@@ -35,13 +34,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestYandexTranslate {
private static final Map<String, String> translations = new HashMap<>();
- @BeforeClass
+ @BeforeAll
public static void setupTranslationMap() {
translations.put("bonjour", "hello");
translations.put("traduire", "translate");
@@ -55,49 +54,46 @@ public class TestYandexTranslate {
protected Invocation prepareResource(final String key, final List<String> text, final String sourceLanguage, final String destLanguage) {
final Invocation invocation = Mockito.mock(Invocation.class);
- Mockito.doAnswer(new Answer<Response>() {
- @Override
- public Response answer(final InvocationOnMock invocation) throws Throwable {
- final Response response = Mockito.mock(Response.class);
-
- final StatusType statusType = new StatusType() {
- @Override
- public int getStatusCode() {
- return statusCode;
- }
-
- @Override
- public String getReasonPhrase() {
- return String.valueOf(statusCode);
- }
-
- @Override
- public Family getFamily() {
- return statusCode == 200 ? Family.SUCCESSFUL : Family.SERVER_ERROR;
- }
- };
-
- Mockito.when(response.getStatus()).thenReturn(statusCode);
- Mockito.when(response.getStatusInfo()).thenReturn(statusType);
-
- if (statusCode == 200) {
- final Translation translation = new Translation();
- translation.setCode(statusCode);
- translation.setLang(destLanguage);
-
- final List<String> translationList = new ArrayList<>();
- for (final String original : text) {
- final String translated = translations.get(original);
- translationList.add(translated == null ? original : translated);
- }
-
- translation.setText(translationList);
-
- Mockito.when(response.readEntity(Translation.class)).thenReturn(translation);
+ Mockito.doAnswer((Answer<Response>) invocation1 -> {
+ final Response response = Mockito.mock(Response.class);
+
+ final StatusType statusType = new StatusType() {
+ @Override
+ public int getStatusCode() {
+ return statusCode;
+ }
+
+ @Override
+ public String getReasonPhrase() {
+ return String.valueOf(statusCode);
+ }
+
+ @Override
+ public Family getFamily() {
+ return statusCode == 200 ? Family.SUCCESSFUL : Family.SERVER_ERROR;
+ }
+ };
+
+ Mockito.when(response.getStatus()).thenReturn(statusCode);
+ Mockito.when(response.getStatusInfo()).thenReturn(statusType);
+
+ if (statusCode == 200) {
+ final Translation translation = new Translation();
+ translation.setCode(statusCode);
+ translation.setLang(destLanguage);
+
+ final List<String> translationList = new ArrayList<>();
+ for (final String original : text) {
+ final String translated = translations.get(original);
+ translationList.add(translated == null ? original : translated);
}
- return response;
+ translation.setText(translationList);
+
+ Mockito.when(response.readEntity(Translation.class)).thenReturn(translation);
}
+
+ return response;
}).when(invocation).invoke();
return invocation;
}
@@ -216,5 +212,4 @@ public class TestYandexTranslate {
testRunner.assertAllFlowFilesTransferred(YandexTranslate.REL_TRANSLATION_FAILED, 1);
}
-
-}
+}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/ExtractImageMetadataTest.java b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/ExtractImageMetadataTest.java
index 40af4ae..8a8db9d 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/ExtractImageMetadataTest.java
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/ExtractImageMetadataTest.java
@@ -20,8 +20,8 @@ import org.apache.nifi.processor.Relationship;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -30,8 +30,8 @@ import java.nio.file.Paths;
import java.text.DecimalFormatSymbols;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class ExtractImageMetadataTest {
@@ -43,7 +43,7 @@ public class ExtractImageMetadataTest {
private TestRunner testRunner;
- @Before
+ @BeforeEach
public void init() {
testRunner = TestRunners.newTestRunner(ExtractImageMetadata.class);
}
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/TestResizeImage.java b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/TestResizeImage.java
index bb8c43a..f1c95d8 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/TestResizeImage.java
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/image/TestResizeImage.java
@@ -20,7 +20,7 @@ package org.apache.nifi.processors.image;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
@@ -29,7 +29,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Paths;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestResizeImage {
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java
index f50cfeb..3b9e181 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/src/test/java/org/apache/nifi/processors/media/TestExtractMediaMetadata.java
@@ -24,7 +24,7 @@ import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -34,8 +34,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestExtractMediaMetadata {