You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ch...@apache.org on 2023/02/02 12:28:06 UTC
[nifi] branch main updated: NIFI-11108 Further changes to upgrade from JUnit 4 to JUnit 5.
This is an automated email from the ASF dual-hosted git repository.
chriss 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 e86786433a NIFI-11108 Further changes to upgrade from JUnit 4 to JUnit 5.
e86786433a is described below
commit e86786433a8e5a8bb727a4b49244c3d96885793d
Author: dan-s1 <ds...@gmail.com>
AuthorDate: Wed Feb 1 22:39:00 2023 +0000
NIFI-11108 Further changes to upgrade from JUnit 4 to JUnit 5.
Signed-off-by: Chris Sampson <ch...@gmail.com>
This closes #6919
---
.../controllerservices/TestAccumuloService.java | 2 +-
.../nifi/jasn1/util/JASN1ReadRecordTester.java | 2 +-
.../org/apache/nifi/jasn1/util/RecordTestUtil.java | 6 +--
.../org/apache/nifi/atlas/emulator/Lineage.java | 17 +++---
.../analyzer/AbstractTestAwsS3Directory.java | 4 +-
.../TestSecretsManagerParameterValueProvider.java | 28 +++++-----
.../record/TestAbstractKinesisRecordProcessor.java | 4 +-
.../nifi/processors/aws/s3/AbstractS3IT.java | 2 +-
.../nifi/processors/aws/s3/TestFetchS3Object.java | 10 ++--
.../azure/storage/ITAzureBlobStorageE2E.java | 4 +-
.../azure/storage/ITMoveAzureDataLakeStorage.java | 4 +-
.../ssl/BinaryLogSSLSocketFactoryTest.java | 2 +-
...tractPaginatedJsonQueryElasticsearchTest.groovy | 4 +-
.../elasticsearch/SearchElasticsearchTest.groovy | 4 +-
.../processors/evtx/MalformedChunkHandlerTest.java | 2 +-
.../processors/evtx/XmlBxmlNodeVisitorTest.java | 4 +-
.../processors/evtx/parser/BinaryReaderTest.java | 4 +-
.../processors/evtx/parser/ChunkHeaderTest.java | 6 +--
.../processors/evtx/parser/FileHeaderTest.java | 2 +-
.../nifi/processors/evtx/parser/RecordTest.java | 4 +-
.../evtx/parser/bxml/AttributeNodeTest.java | 4 +-
.../evtx/parser/bxml/CDataSectionNodeTest.java | 2 +-
.../parser/bxml/CloseEmptyElementNodeTest.java | 2 +-
.../parser/bxml/CloseStartElementNodeTest.java | 2 +-
.../bxml/ConditionalSubstitutionNodeTest.java | 2 +-
.../evtx/parser/bxml/EndOfStreamNodeTest.java | 2 +-
.../evtx/parser/bxml/EntityReferenceNodeTest.java | 2 +-
.../evtx/parser/bxml/NameStringNodeTest.java | 2 +-
.../parser/bxml/NormalSubstitutionNodeTest.java | 2 +-
.../evtx/parser/bxml/OpenStartElementNodeTest.java | 4 +-
.../bxml/ProcessingInstructionDataNodeTest.java | 2 +-
.../bxml/ProcessingInstructionTargetNodeTest.java | 2 +-
.../processors/evtx/parser/bxml/RootNodeTest.java | 4 +-
.../evtx/parser/bxml/StreamStartNodeTest.java | 2 +-
.../evtx/parser/bxml/TemplateInstanceNodeTest.java | 6 +--
.../evtx/parser/bxml/TemplateNodeTest.java | 4 +-
.../processors/evtx/parser/bxml/ValueNodeTest.java | 4 +-
.../evtx/parser/bxml/value/BinaryTypeNodeTest.java | 2 +-
.../evtx/parser/bxml/value/Hex32TypeNodeTest.java | 2 +-
.../evtx/parser/bxml/value/Hex64TypeNodeTest.java | 2 +-
.../evtx/parser/bxml/value/NullTypeNodeTest.java | 2 +-
.../evtx/parser/bxml/value/SIDTypeNodeTest.java | 2 +-
.../parser/bxml/value/SignedByteTypeNodeTest.java | 2 +-
.../parser/bxml/value/SignedDWordTypeNodeTest.java | 2 +-
.../parser/bxml/value/SignedQWordTypeNodeTest.java | 2 +-
.../parser/bxml/value/SignedWordTypeNodeTest.java | 2 +-
.../evtx/parser/bxml/value/SizeTypeNodeTest.java | 2 +-
.../evtx/parser/bxml/value/StringTypeNodeTest.java | 2 +-
.../parser/bxml/value/SystemtimeTypeNodeTest.java | 2 +-
.../bxml/value/UnsignedByteTypeNodeTest.java | 2 +-
.../bxml/value/UnsignedDWordTypeNodeTest.java | 2 +-
.../bxml/value/UnsignedQWordTypeNodeTest.java | 2 +-
.../bxml/value/UnsignedWordTypeNodeTest.java | 2 +-
.../bxml/value/WStringArrayTypeNodeTest.java | 2 +-
.../parser/bxml/value/WStringTypeNodeTest.java | 2 +-
.../nifi/util/db/TestJdbcCommonConvertToAvro.java | 26 ++++-----
.../processor/util/listen/EventBatcherTest.java | 8 +--
.../nifi-listed-entity/pom.xml | 4 +-
.../util/list/ListProcessorTestWatcher.java | 25 +++------
.../util/list/TestAbstractListProcessor.java | 36 ++++++-------
.../util/pattern/TestExceptionHandler.java | 32 +++++-------
.../util/pattern/TestRollbackOnFailure.java | 43 +++++----------
.../gcp/bigquery/AbstractBigQueryIT.java | 2 +-
.../factory/CredentialsFactoryTest.java | 20 +++----
.../service/GCPCredentialsServiceTest.java | 12 ++---
.../nifi/processors/gcp/storage/AbstractGCSIT.java | 2 +-
.../processors/gcp/storage/DeleteGCSObjectIT.java | 4 +-
.../processors/gcp/storage/FetchGCSObjectIT.java | 4 +-
.../processors/gcp/storage/ListGCSBucketIT.java | 2 +-
.../processors/gcp/storage/PutGCSObjectIT.java | 2 +-
.../gcp/storage/StorageAttributesTest.java | 4 +-
.../nifi/processors/gcp/storage/UtilTest.java | 10 ++--
.../nifi/processors/graph/ExecuteGraphQueryIT.java | 2 +-
.../graph/ExecuteGraphQueryRecordTest.java | 4 +-
.../processors/graph/TestExecuteGraphQuery.java | 6 +--
.../InMemoryJanusGraphClientServiceTest.groovy | 2 +-
.../apache/nifi/graph/ITNeo4JCypher3Executor.java | 4 +-
.../nifi/graph/ITNeo4JCypherExecutorNoSSL.java | 4 +-
.../apache/nifi/graph/GremlinClientServiceIT.java | 18 +++----
.../nifi/graph/OpenCypherClientServiceIT.java | 4 +-
.../TestHashiCorpVaultParameterValueProvider.java | 18 +++----
.../java/org/apache/nifi/hbase/HBaseTestUtil.java | 2 +-
.../nifi/dbcp/hive/HiveConnectionPoolTest.java | 2 +-
.../apache/nifi/processors/hive/TestPutHiveQL.java | 16 +++---
.../nifi/dbcp/hive/Hive3ConnectionPoolTest.java | 2 +-
.../processors/hive/TestPutHive3Streaming.java | 29 +++++-----
.../nifi/processors/hive/TestSelectHive_1_1QL.java | 4 +-
.../processors/iceberg/util/IcebergTestUtils.java | 6 +--
.../jms/cf/JMSConnectionFactoryProviderTest.java | 21 ++++----
.../repository/TestRocksDBFlowFileRepository.java | 61 +++++++++-------------
.../repository/TestRocksDBMetronome.java | 10 ++--
.../nifi/spring/SpringContextFactoryTests.java | 8 +--
.../nifi/processors/standard/TestListFile.java | 19 ++-----
.../nifi/dbcp/TestDBCPConnectionPoolLookup.java | 19 +++----
.../nifi/lookup/TestRestLookupService.groovy | 6 +--
.../nifi/lookup/rest/handlers/VerbTest.groovy | 7 +--
.../lookup/configuration2/XXEValidatorTest.java | 6 +--
.../apache/nifi/proxy/TestProxyConfiguration.java | 2 +-
.../test/java/org/apache/nifi/cef/TestCEFUtil.java | 8 +--
.../nifi/websocket/TestWebSocketMessageRouter.java | 26 ++++-----
.../websocket/TestWebSocketMessageRouters.java | 17 +++---
101 files changed, 350 insertions(+), 418 deletions(-)
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/test/java/org/apache/nifi/accumulo/controllerservices/TestAccumuloService.java b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/test/java/org/apache/nifi/accumulo/controllerservices/TestAccumuloService.java
index 2b903aab58..1d0dc3af06 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/test/java/org/apache/nifi/accumulo/controllerservices/TestAccumuloService.java
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/src/test/java/org/apache/nifi/accumulo/controllerservices/TestAccumuloService.java
@@ -30,7 +30,7 @@ import org.mockito.MockitoAnnotations;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.when;
public class TestAccumuloService {
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/JASN1ReadRecordTester.java b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/JASN1ReadRecordTester.java
index c7b064972c..bf74cbee71 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/JASN1ReadRecordTester.java
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/JASN1ReadRecordTester.java
@@ -34,7 +34,7 @@ import java.util.Map;
import java.util.function.Function;
import static org.apache.nifi.jasn1.util.RecordTestUtil.assertRecordsEqual;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public interface JASN1ReadRecordTester {
default void testReadRecord(String dataFile, BerType berObject, Map<String, Object> expectedValues, RecordSchema expectedSchema) throws IOException, MalformedRecordException {
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/RecordTestUtil.java b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/RecordTestUtil.java
index 60ed484804..4e2c6d42b2 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/RecordTestUtil.java
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/src/test/java/org/apache/nifi/jasn1/util/RecordTestUtil.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RecordTestUtil {
public static Object convertValue(Object value) {
@@ -88,7 +88,7 @@ public class RecordTestUtil {
assertListsEqual(prefix, (List) value1, (List) value2);
assertListsEqual(prefix, (List) value2, (List) value1);
} else {
- assertEquals(prefix, value1, value2);
+ assertEquals(value1, value2, prefix);
}
}
@@ -121,7 +121,7 @@ public class RecordTestUtil {
assertValuesEqual(prefix + "[" + index + "]", item1, item2);
}
} else {
- assertEquals(prefix, list1, list2);
+ assertEquals(list1, list2, prefix);
}
}
}
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/Lineage.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/Lineage.java
index 06b2a62dd5..60cdfc93e1 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/Lineage.java
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/emulator/Lineage.java
@@ -16,17 +16,16 @@
*/
package org.apache.nifi.atlas.emulator;
-import org.junit.Assert;
-
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.stream.IntStream;
import static org.apache.nifi.atlas.NiFiTypes.TYPE_NIFI_FLOW_PATH;
-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.junit.jupiter.api.Assertions.fail;
public class Lineage {
@@ -59,7 +58,7 @@ public class Lineage {
final String qname = toFullQname(type, _qname);
return nodes.stream().filter(n -> type.equals(n.getType()) && qname.equals(n.getQualifiedName()))
.findFirst().orElseGet(() -> {
- Assert.fail(String.format("Node was not found for %s::%s", type, qname));
+ fail(String.format("Node was not found for %s::%s", type, qname));
return null;
});
}
@@ -95,9 +94,9 @@ public class Lineage {
public void assertLink(String sType, String sName, String sQname, String tType, String tName, String tQname) {
int si = getNodeIndex(sType, sQname);
- assertTrue(String.format("Source node was not found for %s::%s", sType, sQname), si > -1);
+ assertTrue(si > -1, String.format("Source node was not found for %s::%s", sType, sQname));
int ti = getNodeIndex(tType, tQname);
- assertTrue(String.format("Target node was not found for %s::%s", tType, tQname), ti > -1);
+ assertTrue(ti > -1, String.format("Target node was not found for %s::%s", tType, tQname));
assertNotNull(findNode(sType, sName, sQname));
assertNotNull(findNode(tType, tName, tQname));
@@ -112,7 +111,7 @@ public class Lineage {
};
final String msg = String.format("Link from %s::%s to %s::%s was not found", sType, sQname, tType, tQname);
try {
- assertTrue(msg, exactMatch.call() || valiationMatch.call());
+ assertTrue(exactMatch.call() || valiationMatch.call(), msg);
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/AbstractTestAwsS3Directory.java b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/AbstractTestAwsS3Directory.java
index 5e0db8326a..99c9766f03 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/AbstractTestAwsS3Directory.java
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/test/java/org/apache/nifi/atlas/provenance/analyzer/AbstractTestAwsS3Directory.java
@@ -25,8 +25,8 @@ import org.apache.nifi.provenance.ProvenanceEventRecord;
import org.apache.nifi.provenance.ProvenanceEventType;
import org.mockito.Mockito;
-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.when;
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/src/test/java/org/apache/nifi/stateless/parameter/TestSecretsManagerParameterValueProvider.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/src/test/java/org/apache/nifi/stateless/parameter/TestSecretsManagerParameterValueProvider.java
index c76fa86ca2..cdea97c45d 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/src/test/java/org/apache/nifi/stateless/parameter/TestSecretsManagerParameterValueProvider.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/src/test/java/org/apache/nifi/stateless/parameter/TestSecretsManagerParameterValueProvider.java
@@ -26,29 +26,28 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class TestSecretsManagerParameterValueProvider {
private static final String CONTEXT = "context";
private static final String PARAMETER = "param";
@@ -66,14 +65,14 @@ public class TestSecretsManagerParameterValueProvider {
@Mock
private AWSSecretsManager secretsManager;
- @Before
+ @BeforeEach
public void init() throws IOException {
- doReturn(secretsManager).when(provider).configureClient(eq(CONFIG_FILE));
- doReturn(secretsManager).when(provider).configureClient(isNull());
+ doReturn(secretsManager).when(provider).configureClient(CONFIG_FILE);
}
@Test
- public void testIsParameterDefined() throws JsonProcessingException {
+ public void testIsParameterDefined() throws IOException {
+ doReturn(secretsManager).when(provider).configureClient(isNull());
mockGetSecretValue();
provider.init(createContext(CONFIG_FILE));
@@ -84,7 +83,8 @@ public class TestSecretsManagerParameterValueProvider {
}
@Test
- public void testGetParameterValue() throws JsonProcessingException {
+ public void testGetParameterValue() throws IOException {
+ doReturn(secretsManager).when(provider).configureClient(isNull());
mockGetSecretValue();
runGetParameterValueTest(CONFIG_FILE);
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestAbstractKinesisRecordProcessor.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestAbstractKinesisRecordProcessor.java
index 26facdd914..84128ecdc4 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestAbstractKinesisRecordProcessor.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/kinesis/stream/record/TestAbstractKinesisRecordProcessor.java
@@ -48,8 +48,8 @@ import java.util.concurrent.atomic.AtomicLong;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
index bd4cf836b4..6e40816837 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/AbstractS3IT.java
@@ -52,7 +52,7 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Base class for S3 Integration Tests. Establishes a bucket and helper methods for creating test scenarios
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java
index 26a010ac80..4a37c18f45 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestFetchS3Object.java
@@ -46,10 +46,10 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+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.when;
@@ -362,7 +362,7 @@ public class TestFetchS3Object {
public void testGetPropertyDescriptors() {
FetchS3Object processor = new FetchS3Object();
List<PropertyDescriptor> pd = processor.getSupportedPropertyDescriptors();
- assertEquals("size should be eq", 23, pd.size());
+ assertEquals(23, pd.size(), "size should be eq");
assertTrue(pd.contains(FetchS3Object.ACCESS_KEY));
assertTrue(pd.contains(FetchS3Object.AWS_CREDENTIALS_PROVIDER_SERVICE));
assertTrue(pd.contains(FetchS3Object.BUCKET));
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITAzureBlobStorageE2E.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITAzureBlobStorageE2E.java
index ce1600ba4b..37c30a7ca9 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITAzureBlobStorageE2E.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITAzureBlobStorageE2E.java
@@ -39,8 +39,8 @@ import java.util.Properties;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
public class ITAzureBlobStorageE2E {
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITMoveAzureDataLakeStorage.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITMoveAzureDataLakeStorage.java
index 69ed942d3e..15cf2b2550 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITMoveAzureDataLakeStorage.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITMoveAzureDataLakeStorage.java
@@ -43,8 +43,8 @@ import static org.apache.nifi.processors.azure.storage.utils.ADLSAttributes.ATTR
import static org.apache.nifi.processors.azure.storage.utils.ADLSAttributes.ATTR_NAME_PRIMARY_URI;
import static org.apache.nifi.processors.azure.storage.utils.ADLSAttributes.ATTR_NAME_SOURCE_DIRECTORY;
import static org.apache.nifi.processors.azure.storage.utils.ADLSAttributes.ATTR_NAME_SOURCE_FILESYSTEM;
-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 ITMoveAzureDataLakeStorage extends AbstractAzureDataLakeStorageIT {
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/java/org/apache/nifi/cdc/mysql/processors/ssl/BinaryLogSSLSocketFactoryTest.java b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/java/org/apache/nifi/cdc/mysql/processors/ssl/BinaryLogSSLSocketFactoryTest.java
index 07181ebb84..1ff66d502d 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/java/org/apache/nifi/cdc/mysql/processors/ssl/BinaryLogSSLSocketFactoryTest.java
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/test/java/org/apache/nifi/cdc/mysql/processors/ssl/BinaryLogSSLSocketFactoryTest.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.mock;
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearchTest.groovy b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearchTest.groovy
index 4db5bccb79..0712a732ed 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearchTest.groovy
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/AbstractPaginatedJsonQueryElasticsearchTest.groovy
@@ -25,14 +25,14 @@ import org.apache.nifi.processors.elasticsearch.api.SearchResultsFormat
import org.apache.nifi.provenance.ProvenanceEventType
import org.apache.nifi.util.MockFlowFile
import org.apache.nifi.util.TestRunner
-import org.junit.Test
+import org.junit.jupiter.api.Test
import static groovy.json.JsonOutput.prettyPrint
import static groovy.json.JsonOutput.toJson
import static org.hamcrest.CoreMatchers.equalTo
import static org.hamcrest.CoreMatchers.is
import static org.hamcrest.MatcherAssert.assertThat
-import static org.junit.Assert.assertThrows
+import static org.junit.jupiter.api.Assertions.assertThrows
abstract class AbstractPaginatedJsonQueryElasticsearchTest extends AbstractJsonQueryElasticsearchTest<AbstractPaginatedJsonQueryElasticsearch> {
abstract boolean isInput()
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
index e3bbbff42e..39093148c2 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/test/groovy/org/apache/nifi/processors/elasticsearch/SearchElasticsearchTest.groovy
@@ -23,7 +23,7 @@ import org.apache.nifi.processors.elasticsearch.api.PaginationType
import org.apache.nifi.processors.elasticsearch.api.ResultOutputStrategy
import org.apache.nifi.state.MockStateManager
import org.apache.nifi.util.TestRunner
-import org.junit.Test
+import org.junit.jupiter.api.Test
import java.time.Instant
@@ -31,7 +31,7 @@ import static groovy.json.JsonOutput.prettyPrint
import static groovy.json.JsonOutput.toJson
import static org.hamcrest.CoreMatchers.is
import static org.hamcrest.MatcherAssert.assertThat
-import static org.junit.Assert.fail
+import static org.junit.jupiter.api.Assertions.fail
class SearchElasticsearchTest extends AbstractPaginatedJsonQueryElasticsearchTest {
AbstractPaginatedJsonQueryElasticsearch getProcessor() {
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/MalformedChunkHandlerTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/MalformedChunkHandlerTest.java
index 8a5f061844..0b3a4c3f91 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/MalformedChunkHandlerTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/MalformedChunkHandlerTest.java
@@ -30,7 +30,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import java.io.ByteArrayOutputStream;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/XmlBxmlNodeVisitorTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/XmlBxmlNodeVisitorTest.java
index 23c8fe6bcc..67c3c033e6 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/XmlBxmlNodeVisitorTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/XmlBxmlNodeVisitorTest.java
@@ -46,8 +46,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.inOrder;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/BinaryReaderTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/BinaryReaderTest.java
index 595af3b9ba..b5a794a4dc 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/BinaryReaderTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/BinaryReaderTest.java
@@ -29,8 +29,8 @@ import java.util.Arrays;
import java.util.Base64;
import java.util.Date;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class BinaryReaderTest {
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/ChunkHeaderTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/ChunkHeaderTest.java
index ab71c95bb6..7376852445 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/ChunkHeaderTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/ChunkHeaderTest.java
@@ -39,9 +39,9 @@ import java.util.Random;
import java.util.TreeMap;
import java.util.zip.CRC32;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
public class ChunkHeaderTest {
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/FileHeaderTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/FileHeaderTest.java
index 52cb74b025..caca25553e 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/FileHeaderTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/FileHeaderTest.java
@@ -27,7 +27,7 @@ import java.io.IOException;
import java.util.Random;
import java.util.zip.CRC32;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
public class FileHeaderTest {
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/RecordTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/RecordTest.java
index 13fc5281ae..e03ea2022f 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/RecordTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/RecordTest.java
@@ -30,8 +30,8 @@ import java.io.IOException;
import java.util.Date;
import java.util.List;
-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;
@ExtendWith(MockitoExtension.class)
public class RecordTest {
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/AttributeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/AttributeNodeTest.java
index 3811271ec2..342b388de0 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/AttributeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/AttributeNodeTest.java
@@ -26,8 +26,8 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.List;
-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.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CDataSectionNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CDataSectionNodeTest.java
index 38184d9b58..2484efed91 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CDataSectionNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CDataSectionNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseEmptyElementNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseEmptyElementNodeTest.java
index 696b8e07cb..ca0f581272 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseEmptyElementNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseEmptyElementNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseStartElementNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseStartElementNodeTest.java
index 5ff52b6d6e..c38051c18a 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseStartElementNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/CloseStartElementNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ConditionalSubstitutionNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ConditionalSubstitutionNodeTest.java
index 18ecfbcc6b..e73fe68d3e 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ConditionalSubstitutionNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ConditionalSubstitutionNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EndOfStreamNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EndOfStreamNodeTest.java
index e4bece313a..dc8fa73ace 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EndOfStreamNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EndOfStreamNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EntityReferenceNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EntityReferenceNodeTest.java
index 795af79921..ba1f6d3693 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EntityReferenceNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/EntityReferenceNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NameStringNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NameStringNodeTest.java
index eb29b31699..e838ec622c 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NameStringNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NameStringNodeTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NormalSubstitutionNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NormalSubstitutionNodeTest.java
index 7c03570579..e9132e6dcf 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NormalSubstitutionNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/NormalSubstitutionNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/OpenStartElementNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/OpenStartElementNodeTest.java
index a072413c5b..4d1337d211 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/OpenStartElementNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/OpenStartElementNodeTest.java
@@ -26,8 +26,8 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.List;
-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.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionDataNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionDataNodeTest.java
index a311c6a080..b209453e3b 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionDataNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionDataNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionTargetNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionTargetNodeTest.java
index 9f199c25a9..1cdffd9ed0 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionTargetNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ProcessingInstructionTargetNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/RootNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/RootNodeTest.java
index db4ee84670..f415402ded 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/RootNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/RootNodeTest.java
@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.List;
-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.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/StreamStartNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/StreamStartNodeTest.java
index 36e0c86f29..ef85d238f5 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/StreamStartNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/StreamStartNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateInstanceNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateInstanceNodeTest.java
index f6c0621655..b3ef7d7c96 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateInstanceNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateInstanceNodeTest.java
@@ -25,9 +25,9 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateNodeTest.java
index 7c4eeefd08..cd5273a077 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/TemplateNodeTest.java
@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-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.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ValueNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ValueNodeTest.java
index 54927c07d6..7b15361fbc 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ValueNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/ValueNodeTest.java
@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.List;
-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.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/BinaryTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/BinaryTypeNodeTest.java
index b51c838477..b38882de12 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/BinaryTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/BinaryTypeNodeTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Base64;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
public class BinaryTypeNodeTest extends BxmlNodeTestBase {
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNodeTest.java
index 3b9425bae1..0797540dc2 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex32TypeNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class Hex32TypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex64TypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex64TypeNodeTest.java
index 7836528b73..fc8e8e554e 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex64TypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/Hex64TypeNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class Hex64TypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/NullTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/NullTypeNodeTest.java
index 975984755a..07ee4cc765 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/NullTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/NullTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class NullTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SIDTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SIDTypeNodeTest.java
index f29fabdd31..ab08b0f327 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SIDTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SIDTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SIDTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedByteTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedByteTypeNodeTest.java
index a1b37f72e9..6f78c45e45 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedByteTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedByteTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SignedByteTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNodeTest.java
index 5c3d0cda13..4acd0ff46a 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedDWordTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SignedDWordTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedQWordTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedQWordTypeNodeTest.java
index 5c0cebe1cf..a4a3f1ce5c 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedQWordTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedQWordTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SignedQWordTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedWordTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedWordTypeNodeTest.java
index 55a3ac5c05..6bccd97078 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedWordTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SignedWordTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SignedWordTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SizeTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SizeTypeNodeTest.java
index 7763ffdf6f..d19bb4971e 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SizeTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SizeTypeNodeTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SizeTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/StringTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/StringTypeNodeTest.java
index 26b9ba4772..31a5887533 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/StringTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/StringTypeNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class StringTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SystemtimeTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SystemtimeTypeNodeTest.java
index bdb7512019..0a0d706206 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SystemtimeTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/SystemtimeTypeNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Calendar;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SystemtimeTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedByteTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedByteTypeNodeTest.java
index c25b128869..fa6ab78f51 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedByteTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedByteTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UnsignedByteTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedDWordTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedDWordTypeNodeTest.java
index 13b9525d62..073cb90037 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedDWordTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedDWordTypeNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UnsignedDWordTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedQWordTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedQWordTypeNodeTest.java
index b22acf303c..bac520fb0e 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedQWordTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedQWordTypeNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UnsignedQWordTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedWordTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedWordTypeNodeTest.java
index d57511eb9c..d587f0d316 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedWordTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/UnsignedWordTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UnsignedWordTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNodeTest.java
index 01afc37182..1f61f98356 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringArrayTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class WStringArrayTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringTypeNodeTest.java b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringTypeNodeTest.java
index e1951943e2..54d2098e21 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringTypeNodeTest.java
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/src/test/java/org/apache/nifi/processors/evtx/parser/bxml/value/WStringTypeNodeTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class WStringTypeNodeTest extends BxmlNodeTestBase {
@Test
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommonConvertToAvro.java b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommonConvertToAvro.java
index e6f9743719..de78a5a8d5 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommonConvertToAvro.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommonConvertToAvro.java
@@ -20,9 +20,8 @@ import org.apache.avro.file.DataFileStream;
import org.apache.avro.generic.GenericDatumReader;
import org.apache.avro.generic.GenericRecord;
import org.apache.avro.io.DatumReader;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.Mockito;
import java.io.IOException;
@@ -31,20 +30,19 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import static java.sql.Types.BIGINT;
import static java.sql.Types.INTEGER;
import static java.sql.Types.SMALLINT;
import static java.sql.Types.TINYINT;
-import static java.sql.Types.BIGINT;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@RunWith(Parameterized.class)
public class TestJdbcCommonConvertToAvro {
private final static boolean SIGNED = true;
@@ -54,8 +52,7 @@ public class TestJdbcCommonConvertToAvro {
return IntStream.rangeClosed(start, end).toArray();
}
- @Parameterized.Parameters(name = "{index}: {0}")
- public static Collection<TestParams> data() {
+ public static Stream<TestParams> data() {
Map<Integer, int[]> typeWithPrecisionRange = new HashMap<>();
typeWithPrecisionRange.put(TINYINT, range(1,3));
typeWithPrecisionRange.put(SMALLINT, range(1,5));
@@ -77,13 +74,9 @@ public class TestJdbcCommonConvertToAvro {
&&
param.signed == UNSIGNED
);
-
- return params;
+ return params.stream();
}
- @Parameterized.Parameter
- public TestParams testParams;
-
static class TestParams {
int sqlType;
int precision;
@@ -121,8 +114,9 @@ public class TestJdbcCommonConvertToAvro {
}
}
- @Test
- public void testConvertToAvroStreamForNumbers() throws SQLException, IOException {
+ @ParameterizedTest
+ @MethodSource("data")
+ public void testConvertToAvroStreamForNumbers(TestParams testParams) throws SQLException, IOException {
final ResultSetMetaData metadata = mock(ResultSetMetaData.class);
when(metadata.getColumnCount()).thenReturn(1);
when(metadata.getColumnType(1)).thenReturn(testParams.sqlType);
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/src/test/java/org/apache/nifi/processor/util/listen/EventBatcherTest.java b/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/src/test/java/org/apache/nifi/processor/util/listen/EventBatcherTest.java
index 28cc26dd1a..c39cd73cd1 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/src/test/java/org/apache/nifi/processor/util/listen/EventBatcherTest.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/src/test/java/org/apache/nifi/processor/util/listen/EventBatcherTest.java
@@ -28,8 +28,8 @@ import org.apache.nifi.processor.util.listen.event.StandardNetworkEventFactory;
import org.apache.nifi.remote.io.socket.NetworkUtils;
import org.apache.nifi.util.MockProcessSession;
import org.apache.nifi.util.SharedSessionState;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
import org.mockito.Mockito;
import java.net.InetSocketAddress;
@@ -39,7 +39,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicLong;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
public class EventBatcherTest {
@@ -55,7 +55,7 @@ public class EventBatcherTest {
MockProcessSession session;
StandardNetworkEventFactory eventFactory;
- @Before
+ @BeforeEach
public void setUp() {
processor = new SimpleProcessor();
events = new LinkedBlockingQueue<>();
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
index 1508b3816b..ee4773563b 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
@@ -51,8 +51,8 @@
</dependency>
<dependency>
<!-- Dependency marked as provided, not test, because ListProcessorTestWatcher uses TestWatcher -->
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListProcessorTestWatcher.java b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListProcessorTestWatcher.java
index dcb53e0f42..f76846f3e1 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListProcessorTestWatcher.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/ListProcessorTestWatcher.java
@@ -18,8 +18,9 @@ package org.apache.nifi.processor.util.list;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestWatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +35,7 @@ import java.util.stream.Collectors;
* This class provides a way to dump list-able entities, processor state and transferred FlowFiles into 'success' relationship,
* which is useful to debug test issues especially at automation test environment such as Travis that is difficult to debug.
*/
-public class ListProcessorTestWatcher extends TestWatcher {
+public class ListProcessorTestWatcher implements TestWatcher, BeforeEachCallback {
private static final Logger logger = LoggerFactory.getLogger(ListProcessorTestWatcher.class);
private static final Consumer<String> logStateDump = logger::info;
@@ -104,25 +105,15 @@ public class ListProcessorTestWatcher extends TestWatcher {
}
@Override
- protected void starting(Description description) {
+ public void beforeEach(ExtensionContext extensionContext) {
startedAtMillis = System.currentTimeMillis();
}
- /**
- * Throw additional AssertionError with stateDump as its message.
- */
@Override
- protected void failed(Throwable e, Description description) {
- if (!(e instanceof AssertionError)) {
+ public void testFailed(ExtensionContext context, Throwable cause) {
+ if (!(cause instanceof AssertionError)) {
return;
}
-
- final StringBuilder msg = new StringBuilder("State dump:\n");
- dumpState(s -> msg.append(s).append("\n"),
- stateMapProvider.provide(),
- entitiesProvider.provide(),
- successFlowFilesProvider.provide(),
- startedAtMillis);
- throw new AssertionError(msg);
+ dumpState(startedAtMillis);
}
}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/test/java/org/apache/nifi/processor/util/list/TestAbstractListProcessor.java b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/test/java/org/apache/nifi/processor/util/list/TestAbstractListProcessor.java
index 61fd67b3a8..3c7204c8ec 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/test/java/org/apache/nifi/processor/util/list/TestAbstractListProcessor.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/test/java/org/apache/nifi/processor/util/list/TestAbstractListProcessor.java
@@ -49,16 +49,16 @@ import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.glassfish.jersey.internal.guava.Predicates;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestWatcher;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.io.TempDir;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -73,8 +73,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestAbstractListProcessor {
@@ -92,9 +93,10 @@ public class TestAbstractListProcessor {
private ConcreteListProcessor proc;
private TestRunner runner;
-
- @Rule
- public TestWatcher dumpState = new ListProcessorTestWatcher(
+ @TempDir
+ private Path testFolder;
+ @RegisterExtension
+ private final ListProcessorTestWatcher dumpState = new ListProcessorTestWatcher(
() -> {
try {
return runner.getStateManager().getState(Scope.LOCAL).toMap();
@@ -106,15 +108,12 @@ public class TestAbstractListProcessor {
() -> runner.getFlowFilesForRelationship(AbstractListProcessor.REL_SUCCESS).stream().map(m -> (FlowFile) m).collect(Collectors.toList())
);
- @Before
+ @BeforeEach
public void setup() {
proc = new ConcreteListProcessor();
runner = TestRunners.newTestRunner(proc);
}
- @Rule
- public final TemporaryFolder testFolder = new TemporaryFolder();
-
@Test
public void testStateMigratedWhenPrimaryNodeSwitch() throws IOException {
// add a few entities
@@ -137,7 +136,6 @@ public class TestAbstractListProcessor {
secondProc.addEntity(String.valueOf(i), String.valueOf(i), 88888L);
}
secondProc.addEntity("10", "10", 99999999L);
-
// Create new runner for the second processor and update its state to match that of the last TestRunner.
final StateMap stateMap = runner.getStateManager().getState(Scope.CLUSTER);
runner = TestRunners.newTestRunner(secondProc);
@@ -191,7 +189,7 @@ public class TestAbstractListProcessor {
public void testStateMigratedFromLocalFile() throws Exception {
// Create a file that we will populate with the desired state
- File persistenceFile = testFolder.newFile(proc.persistenceFilename);
+ File persistenceFile = testFolder.resolve(proc.persistenceFilename).toFile();
// Override the processor's internal persistence file
proc.persistenceFile = persistenceFile;
@@ -207,7 +205,7 @@ public class TestAbstractListProcessor {
runner.run();
// Verify the local persistence file is removed
- assertTrue("Failed to remove persistence file", !persistenceFile.exists());
+ assertFalse(persistenceFile.exists(), "Failed to remove persistence file");
// Verify the state manager now maintains the associated state
final Map<String, String> expectedState = new HashMap<>();
@@ -461,8 +459,8 @@ public class TestAbstractListProcessor {
assertEquals(1, results.size());
final ConfigVerificationResult result = results.get(0);
assertEquals(expectedOutcome, result.getOutcome());
- assertTrue(String.format("Expected verification result to match pattern [%s]. Actual explanation was: %s", expectedExplanationRegex, result.getExplanation()),
- result.getExplanation().matches(expectedExplanationRegex));
+ assertTrue(result.getExplanation().matches(expectedExplanationRegex),
+ String.format("Expected verification result to match pattern [%s]. Actual explanation was: %s", expectedExplanationRegex, result.getExplanation()));
}
static class DistributedCache extends AbstractControllerService implements DistributedMapCacheClient {
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestExceptionHandler.java b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestExceptionHandler.java
index 6cf9b4bcdd..e069021e58 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestExceptionHandler.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestExceptionHandler.java
@@ -26,9 +26,11 @@ import java.util.Arrays;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
public class TestExceptionHandler {
@@ -84,13 +86,10 @@ public class TestExceptionHandler {
assertEquals(4, r.get().intValue());
// If no exception mapping is specified, any Exception thrown is wrapped by ProcessException.
- try {
- final Integer nullInput = null;
- handler.execute(context, nullInput, i -> r.set(p.divide(i, 2)));
- fail("Exception should be thrown because input is null.");
- } catch (ProcessException e) {
- assertTrue(e.getCause() instanceof NullPointerException);
- }
+ final Integer nullInput = null;
+ ProcessException pe = assertThrows(ProcessException.class, () -> handler.execute(context, nullInput, i -> r.set(p.divide(i, 2))),
+ "Exception should be thrown because input is null.");
+ assertTrue(pe.getCause() instanceof NullPointerException);
}
// Reusable Exception mapping function.
@@ -126,18 +125,16 @@ public class TestExceptionHandler {
// Null pointer exception.
final Integer input = null;
- handler.execute(context, input, i -> {
+ assertFalse(handler.execute(context, input, i -> {
p.divide(i, 2);
fail("Shouldn't reach here.");
- });
+ }));
// Divide by zero.
- handler.execute(context, 0, i -> {
+ assertFalse(handler.execute(context, 0, i -> {
p.divide(2, i);
fail("Shouldn't reach here.");
- });
-
-
+ }));
}
static <C> ExceptionHandler.OnError<C, Integer> createInputErrorHandler() {
@@ -196,7 +193,6 @@ public class TestExceptionHandler {
assertEquals(input[2], r.get());
}
- assertEquals("Successful inputs", 2, context.count);
+ assertEquals(2, context.count, "Successful inputs");
}
-
}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestRollbackOnFailure.java b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestRollbackOnFailure.java
index 078b567fa8..c3e6880cc0 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestRollbackOnFailure.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/src/test/java/org/apache/nifi/processor/util/pattern/TestRollbackOnFailure.java
@@ -29,8 +29,9 @@ import java.util.List;
import static org.apache.nifi.processor.util.pattern.TestExceptionHandler.createArrayInputErrorHandler;
import static org.apache.nifi.processor.util.pattern.TestExceptionHandler.exceptionMapping;
-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.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class TestRollbackOnFailure {
@@ -76,13 +77,9 @@ public class TestRollbackOnFailure {
Integer[][] inputs = new Integer[][]{{null, 2, 999}, {4, 2, 2}, {2, 0, 999}, {10, 2, 999}, {8, 2, 4}};
final List<Integer> results = new ArrayList<>();
- try {
- processInputs(context, inputs, results);
- } catch (ProcessException e) {
- fail("ProcessException should NOT be thrown");
- }
-
- assertEquals("Successful inputs", 2, context.getProcessedCount());
+ assertDoesNotThrow(() -> processInputs(context, inputs, results),
+ "ProcessException should NOT be thrown");
+ assertEquals( 2, context.getProcessedCount(), "Successful inputs");
}
@Test
@@ -94,14 +91,8 @@ public class TestRollbackOnFailure {
Integer[][] inputs = new Integer[][]{{null, 2, 999}, {4, 2, 2}, {2, 0, 999}, {10, 2, 999}, {8, 2, 4}};
final List<Integer> results = new ArrayList<>();
- try {
- processInputs(context, inputs, results);
- fail("ProcessException should be thrown");
- } catch (ProcessException e) {
- logger.info("Exception was thrown as expected.");
- }
-
- assertEquals("Successful inputs", 0, context.getProcessedCount());
+ assertThrows(ProcessException.class, () -> processInputs(context, inputs, results));
+ assertEquals( 0, context.getProcessedCount(), "Successful inputs");
}
@Test
@@ -114,13 +105,9 @@ public class TestRollbackOnFailure {
Integer[][] inputs = new Integer[][]{{4, 2, 2}, {2, 0, 999}, {null, 2, 999}, {10, 2, 999}, {8, 2, 4}};
final List<Integer> results = new ArrayList<>();
- try {
- processInputs(context, inputs, results);
- } catch (ProcessException e) {
- fail("ProcessException should NOT be thrown");
- }
-
- assertEquals("Successful inputs", 2, context.getProcessedCount());
+ assertDoesNotThrow(() -> processInputs(context, inputs, results),
+ "ProcessException should NOT be thrown");
+ assertEquals( 2, context.getProcessedCount(), "Successful inputs");
}
@Test
@@ -133,12 +120,6 @@ public class TestRollbackOnFailure {
Integer[][] inputs = new Integer[][]{{4, 2, 2}, {2, 0, 999}, {null, 2, 999}, {10, 2, 999}, {8, 2, 4}};
final List<Integer> results = new ArrayList<>();
- try {
- processInputs(context, inputs, results);
- fail("ProcessException should be thrown");
- } catch (ProcessException e) {
- logger.info("Exception was thrown as expected.");
- }
-
+ assertThrows(ProcessException.class, () -> processInputs(context, inputs, results));
}
}
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryIT.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryIT.java
index ed49e12a75..c81d49c01e 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryIT.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryIT.java
@@ -38,7 +38,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public abstract class AbstractBigQueryIT {
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialsFactoryTest.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialsFactoryTest.java
index c198188a6a..d2107d1b12 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialsFactoryTest.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/factory/CredentialsFactoryTest.java
@@ -33,9 +33,9 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Map;
-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;
/**
* Tests of the validation and credentials provider capabilities of CredentialsFactory.
@@ -48,7 +48,7 @@ public class CredentialsFactoryTest {
@Test
public void testCredentialPropertyDescriptorClassCannotBeInvoked() throws Exception {
Constructor constructor = CredentialPropertyDescriptors.class.getDeclaredConstructor();
- assertTrue("Constructor of CredentialPropertyDescriptors should be private", Modifier.isPrivate(constructor.getModifiers()));
+ assertTrue(Modifier.isPrivate(constructor.getModifiers()), "Constructor of CredentialPropertyDescriptors should be private");
constructor.setAccessible(true);
constructor.newInstance();
}
@@ -98,8 +98,8 @@ public class CredentialsFactoryTest {
final GoogleCredentials credentials = factory.getGoogleCredentials(properties, TRANSPORT_FACTORY);
assertNotNull(credentials);
- assertEquals("credentials class should be equal", ServiceAccountCredentials.class,
- credentials.getClass());
+ assertEquals(ServiceAccountCredentials.class, credentials.getClass(),
+ "credentials class should be equal");
}
@@ -126,8 +126,8 @@ public class CredentialsFactoryTest {
final GoogleCredentials credentials = factory.getGoogleCredentials(properties, TRANSPORT_FACTORY);
assertNotNull(credentials);
- assertEquals("credentials class should be equal", ServiceAccountCredentials.class,
- credentials.getClass());
+ assertEquals(ServiceAccountCredentials.class, credentials.getClass(),
+ "credentials class should be equal");
}
@Test
@@ -141,7 +141,7 @@ public class CredentialsFactoryTest {
final GoogleCredentials credentials = factory.getGoogleCredentials(properties, TRANSPORT_FACTORY);
assertNotNull(credentials);
- assertEquals("credentials class should be equal", ComputeEngineCredentials.class,
- credentials.getClass());
+ assertEquals(ComputeEngineCredentials.class, credentials.getClass(),
+ "credentials class should be equal");
}
}
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsServiceTest.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsServiceTest.java
index ef251ec2dc..95ed29fe8a 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsServiceTest.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/credentials/service/GCPCredentialsServiceTest.java
@@ -30,8 +30,8 @@ import static org.apache.nifi.processors.gcp.credentials.factory.CredentialPrope
import static org.apache.nifi.processors.gcp.credentials.factory.CredentialPropertyDescriptors.SERVICE_ACCOUNT_JSON_FILE;
import static org.apache.nifi.processors.gcp.credentials.factory.CredentialPropertyDescriptors.USE_APPLICATION_DEFAULT_CREDENTIALS;
import static org.apache.nifi.processors.gcp.credentials.factory.CredentialPropertyDescriptors.USE_COMPUTE_ENGINE_CREDENTIALS;
-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;
public class GCPCredentialsServiceTest {
@@ -98,8 +98,8 @@ public class GCPCredentialsServiceTest {
final GoogleCredentials credentials = service.getGoogleCredentials();
assertNotNull(credentials);
- assertEquals("Credentials class should be equal", ServiceAccountCredentials.class,
- credentials.getClass());
+ assertEquals(ServiceAccountCredentials.class, credentials.getClass(),
+ "Credentials class should be equal");
}
@Test
@@ -149,7 +149,7 @@ public class GCPCredentialsServiceTest {
final GoogleCredentials credentials = service.getGoogleCredentials();
assertNotNull(credentials);
- assertEquals("Credentials class should be equal", ServiceAccountCredentials.class,
- credentials.getClass());
+ assertEquals(ServiceAccountCredentials.class, credentials.getClass(),
+ "Credentials class should be equal");
}
}
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/AbstractGCSIT.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/AbstractGCSIT.java
index e76af49bc5..c50b365429 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/AbstractGCSIT.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/AbstractGCSIT.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.BeforeAll;
import java.util.Arrays;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Base class for GCS Integration Tests. Establishes a bucket and helper methods for creating test scenarios.
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/DeleteGCSObjectIT.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/DeleteGCSObjectIT.java
index 02db5ee910..8bddfb478f 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/DeleteGCSObjectIT.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/DeleteGCSObjectIT.java
@@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test;
import java.util.Collections;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Integration tests for {@link DeleteGCSObject} which actually use Google Cloud resources.
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java
index fa8f1c5deb..96cd081da3 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/FetchGCSObjectIT.java
@@ -26,8 +26,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-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;
/**
* Integration tests for {@link FetchGCSObject} which actually use Google Cloud resources.
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/ListGCSBucketIT.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/ListGCSBucketIT.java
index 333d1fc937..c55dc6c78b 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/ListGCSBucketIT.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/ListGCSBucketIT.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
/**
* Integration tests for {@link ListGCSBucket} which actually use Google Cloud resources.
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectIT.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectIT.java
index 96a4004680..77d68688ca 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectIT.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/PutGCSObjectIT.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import java.util.Map;
import static org.apache.nifi.processors.gcp.storage.StorageAttributes.ENCRYPTION_ALGORITHM_ATTR;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Integration tests for {@link PutGCSObject} which actually use Google Cloud resources.
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/StorageAttributesTest.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/StorageAttributesTest.java
index e86407353e..c8be5ebef3 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/StorageAttributesTest.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/StorageAttributesTest.java
@@ -21,13 +21,13 @@ import org.junit.jupiter.api.Test;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class StorageAttributesTest {
@Test
public void testStorageAttributeClassCannotBeInvoked() throws Exception {
Constructor constructor = StorageAttributes.class.getDeclaredConstructor();
- assertTrue("Constructor of StorageAttributes should be private", Modifier.isPrivate(constructor.getModifiers()));
+ assertTrue(Modifier.isPrivate(constructor.getModifiers()),"Constructor of StorageAttributes should be private");
constructor.setAccessible(true);
constructor.newInstance();
}
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/UtilTest.java b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/UtilTest.java
index 14279ad0dd..d9da3fa8d5 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/UtilTest.java
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/storage/UtilTest.java
@@ -18,16 +18,16 @@ package org.apache.nifi.processors.gcp.storage;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Tests the Util class static methods.
*/
public class UtilTest {
@Test
- public void testContentDispositionParsing() throws Exception {
+ public void testContentDispositionParsing() {
final String contentDisposition = "attachment; filename=\"plans.pdf\"";
final Util.ParsedContentDisposition parsed = Util.parseContentDisposition(contentDisposition);
@@ -40,7 +40,7 @@ public class UtilTest {
}
@Test
- public void testContentDispositionParsingBadParse() throws Exception {
+ public void testContentDispositionParsingBadParse() {
final String contentDisposition = "bad-header";
assertNull(Util.parseContentDisposition(contentDisposition));
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryIT.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryIT.java
index 769fd4a45f..2557cca0ee 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryIT.java
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryIT.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ExecuteGraphQueryIT {
TestRunner runner;
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java
index 668da174e2..f8a99e3570 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/ExecuteGraphQueryRecordTest.java
@@ -37,8 +37,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
-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 ExecuteGraphQueryRecordTest {
private TestRunner runner;
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/TestExecuteGraphQuery.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/TestExecuteGraphQuery.java
index 85be6282b9..a3a9aa1fe7 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/TestExecuteGraphQuery.java
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/src/test/java/org/apache/nifi/processors/graph/TestExecuteGraphQuery.java
@@ -28,9 +28,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-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;
/**
* Cypher unit tests.
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/test/groovy/org/apache/nifi/graph/InMemoryJanusGraphClientServiceTest.groovy b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/test/groovy/org/apache/nifi/graph/InMemoryJanusGraphClientServiceTest.groovy
index e3682953ee..fdf37e7b33 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/test/groovy/org/apache/nifi/graph/InMemoryJanusGraphClientServiceTest.groovy
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/src/test/groovy/org/apache/nifi/graph/InMemoryJanusGraphClientServiceTest.groovy
@@ -22,7 +22,7 @@ import org.apache.nifi.processor.ProcessContext
import org.apache.nifi.processor.ProcessSession
import org.apache.nifi.processor.exception.ProcessException
import org.apache.nifi.util.TestRunners
-import org.junit.Test
+import org.junit.jupiter.api.Test
class InMemoryJanusGraphClientServiceTest {
@Test
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypher3Executor.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypher3Executor.java
index ba6ef88827..f3164238a0 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypher3Executor.java
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-3-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypher3Executor.java
@@ -37,7 +37,7 @@ 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;
/**
* Neo4J Cypher integration tests.
@@ -72,7 +72,7 @@ public class ITNeo4JCypher3Executor {
StatementResult result = executeSession("match (n) return n");
- assertEquals("nodes should be equal", 0, result.list().size());
+ assertEquals(0, result.list().size(), "nodes should be equal");
}
protected StatementResult executeSession(String statement) {
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypherExecutorNoSSL.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypherExecutorNoSSL.java
index 6f9318a5ba..51f842345b 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypherExecutorNoSSL.java
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service/src/test/java/org/apache/nifi/graph/ITNeo4JCypherExecutorNoSSL.java
@@ -38,7 +38,7 @@ 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;
/**
* Neo4J Cypher integration tests.
@@ -73,7 +73,7 @@ public class ITNeo4JCypherExecutorNoSSL {
List<Record> result = executeSession("match (n) return n");
- assertEquals("nodes should be equal", 0, result.size());
+ assertEquals(0, result.size(), "nodes should be equal");
}
protected List<Record> executeSession(String statement) {
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/GremlinClientServiceIT.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/GremlinClientServiceIT.java
index ce447651b5..15e8a87e83 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/GremlinClientServiceIT.java
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/GremlinClientServiceIT.java
@@ -21,15 +21,15 @@ import org.apache.commons.io.IOUtils;
import org.apache.nifi.util.NoOpProcessor;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/*
* As of JanusGraph 0.3.X these tests can be a little inconsistent for a few runs at first.
*/
@@ -37,7 +37,7 @@ public class GremlinClientServiceIT {
private TestRunner runner;
private TestableGremlinClientService clientService;
- @Before
+ @BeforeEach
public void setup() throws Exception {
clientService = new TestableGremlinClientService();
runner = TestRunners.newTestRunner(NoOpProcessor.class);
@@ -49,10 +49,10 @@ public class GremlinClientServiceIT {
String setup = IOUtils.toString(getClass().getResourceAsStream("/setup.gremlin"), "UTF-8");
clientService.getClient().submit(setup);
- Assert.assertEquals("gremlin://localhost:8182/gremlin", clientService.getTransitUrl());
+ assertEquals("gremlin://localhost:8182/gremlin", clientService.getTransitUrl());
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
String teardown = IOUtils.toString(getClass().getResourceAsStream("/teardown.gremlin"), "UTF-8");
clientService.getClient().submit(teardown);
@@ -64,7 +64,7 @@ public class GremlinClientServiceIT {
AtomicInteger integer = new AtomicInteger();
Map<String, String> result = clientService.executeQuery(gremlin, new HashMap<>(), (record, isMore) -> integer.incrementAndGet());
- Assert.assertEquals(2, integer.get());
+ assertEquals(2, integer.get());
}
@Test
@@ -72,6 +72,6 @@ public class GremlinClientServiceIT {
String gremlin = "g.V().hasLabel('dog').count()";
AtomicInteger integer = new AtomicInteger();
Map<String, String> result = clientService.executeQuery(gremlin, new HashMap<>(), (record, isMore) -> integer.incrementAndGet());
- Assert.assertEquals(1, integer.get());
+ assertEquals(1, integer.get());
}
}
diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/OpenCypherClientServiceIT.java b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/OpenCypherClientServiceIT.java
index b5ff23b343..f3174b4a9c 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/OpenCypherClientServiceIT.java
+++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services/src/test/java/org/apache/nifi/graph/OpenCypherClientServiceIT.java
@@ -33,8 +33,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-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;
/*
* To run this, setup JanusGraph using just the BerkeleyJE configuration for the server.
diff --git a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-value-provider/src/test/java/org/apache/nifi/stateless/parameter/TestHashiCorpVaultParameterValueProvider.java b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-value-provider/src/test/java/org/apache/nifi/stateless/parameter/TestHashiCorpVaultParameterValueProvider.java
index 389a92d3ca..0de29ebaba 100644
--- a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-value-provider/src/test/java/org/apache/nifi/stateless/parameter/TestHashiCorpVaultParameterValueProvider.java
+++ b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-parameter-value-provider/src/test/java/org/apache/nifi/stateless/parameter/TestHashiCorpVaultParameterValueProvider.java
@@ -20,12 +20,12 @@ import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.vault.hashicorp.HashiCorpVaultCommunicationService;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import java.util.Collections;
import java.util.HashMap;
@@ -33,13 +33,13 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class TestHashiCorpVaultParameterValueProvider {
private static final String PATH = "kv";
@@ -51,7 +51,7 @@ public class TestHashiCorpVaultParameterValueProvider {
private HashiCorpVaultParameterValueProvider parameterProvider;
- @Before
+ @BeforeEach
public void init() {
final HashiCorpVaultParameterValueProvider realParameterProvider = new HashiCorpVaultParameterValueProvider();
parameterProvider = Mockito.spy(realParameterProvider);
diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/HBaseTestUtil.java b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/HBaseTestUtil.java
index fa598d0220..ac07b331ea 100644
--- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/HBaseTestUtil.java
+++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/src/test/java/org/apache/nifi/hbase/HBaseTestUtil.java
@@ -17,7 +17,7 @@
*/
package org.apache.nifi.hbase;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java
index ce631e3c68..77c72a5e2b 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/dbcp/hive/HiveConnectionPoolTest.java
@@ -43,7 +43,7 @@ import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHiveQL.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHiveQL.java
index 79f00f42f6..e9eb29f487 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHiveQL.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHiveQL.java
@@ -42,10 +42,10 @@ import java.sql.Types;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@DisabledOnOs(OS.WINDOWS)
public class TestPutHiveQL {
@@ -490,8 +490,8 @@ public class TestPutHiveQL {
try (final Statement stmt = conn.createStatement()) {
final ResultSet rs = stmt.executeQuery("SELECT * FROM PERSONS");
assertTrue(rs.next());
- assertEquals("Record ID mismatch", 1, rs.getInt(1));
- assertEquals("Record NAME mismatch", "George", rs.getString(2));
+ assertEquals( 1, rs.getInt(1), "Record ID mismatch");
+ assertEquals("George", rs.getString(2), "Record NAME mismatch");
}
}
}
@@ -538,8 +538,8 @@ public class TestPutHiveQL {
try (final Statement stmt = conn.createStatement()) {
final ResultSet rs = stmt.executeQuery("SELECT * FROM PERSONS");
assertTrue(rs.next());
- assertEquals("Record ID mismatch", 1, rs.getInt(1));
- assertEquals("Record NAME mismatch", "George\\;", rs.getString(2));
+ assertEquals(1, rs.getInt(1), "Record ID mismatch");
+ assertEquals( "George\\;", rs.getString(2), "Record NAME mismatch");
}
}
}
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPoolTest.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPoolTest.java
index 5df8fa91ae..ad008e4700 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPoolTest.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/dbcp/hive/Hive3ConnectionPoolTest.java
@@ -43,7 +43,7 @@ import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHive3Streaming.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHive3Streaming.java
index 3dee87ef8b..e1faae3831 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHive3Streaming.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/hive/TestPutHive3Streaming.java
@@ -73,7 +73,6 @@ import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.apache.nifi.util.hive.HiveConfigurator;
import org.apache.nifi.util.hive.HiveOptions;
-import org.junit.Assert;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnJre;
@@ -106,12 +105,12 @@ import java.util.function.BiFunction;
import static org.apache.nifi.processors.hive.AbstractHive3QLProcessor.ATTR_OUTPUT_TABLES;
import static org.apache.nifi.processors.hive.PutHive3Streaming.HIVE_STREAMING_RECORD_COUNT_ATTR;
import static org.apache.nifi.processors.hive.PutHive3Streaming.KERBEROS_CREDENTIALS_SERVICE;
-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.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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
@@ -397,7 +396,7 @@ public class TestPutHive3Streaming {
runner.setProperty(PutHive3Streaming.ROLLBACK_ON_FAILURE, "true");
runner.enqueue("I am not an Avro record".getBytes());
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_FAILURE, 0);
@@ -428,7 +427,7 @@ public class TestPutHive3Streaming {
runner.setProperty(PutHive3Streaming.ROLLBACK_ON_FAILURE, "true");
runner.enqueue(new byte[0]);
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_FAILURE, 0);
@@ -496,7 +495,7 @@ public class TestPutHive3Streaming {
processor.setGenerateWriteFailure(true);
runner.enqueue(new byte[0]);
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_SUCCESS, 0);
@@ -544,7 +543,7 @@ public class TestPutHive3Streaming {
runner.setProperty(PutHive3Streaming.TABLE_NAME, "users");
runner.enqueue(new byte[0]);
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_RETRY, 0);
@@ -564,7 +563,7 @@ public class TestPutHive3Streaming {
runner.setProperty(PutHive3Streaming.ROLLBACK_ON_FAILURE, "true");
runner.enqueue(new byte[0]);
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_RETRY, 0);
@@ -613,7 +612,7 @@ public class TestPutHive3Streaming {
};
runner.enqueue(createAvroRecord(Arrays.asList(user1, user2)));
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_FAILURE, 0);
@@ -658,7 +657,7 @@ public class TestPutHive3Streaming {
};
runner.enqueue(createAvroRecord(Collections.singletonList(user1)));
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_SUCCESS, 0);
@@ -693,7 +692,7 @@ public class TestPutHive3Streaming {
runner.setProperty(PutHive3Streaming.ROLLBACK_ON_FAILURE, "true");
runner.enqueue(new byte[0]);
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_FAILURE, 0);
@@ -732,7 +731,7 @@ public class TestPutHive3Streaming {
runner.setProperty(PutHive3Streaming.ROLLBACK_ON_FAILURE, "true");
runner.enqueue(new byte[0]);
- AssertionError e = Assert.assertThrows(AssertionError.class, () -> runner.run());
+ AssertionError e = assertThrows(AssertionError.class, () -> runner.run());
assertTrue(e.getCause() instanceof ProcessException);
runner.assertTransferCount(PutHive3Streaming.REL_FAILURE, 0);
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHive_1_1QL.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHive_1_1QL.java
index 6ef9175f33..46e77b9712 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHive_1_1QL.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/src/test/java/org/apache/nifi/processors/hive/TestSelectHive_1_1QL.java
@@ -59,8 +59,8 @@ import static org.apache.nifi.util.hive.HiveJdbcCommon.AVRO;
import static org.apache.nifi.util.hive.HiveJdbcCommon.CSV;
import static org.apache.nifi.util.hive.HiveJdbcCommon.CSV_MIME_TYPE;
import static org.apache.nifi.util.hive.HiveJdbcCommon.MIME_TYPE_AVRO_BINARY;
-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 TestSelectHive_1_1QL {
diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/util/IcebergTestUtils.java b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/util/IcebergTestUtils.java
index a70e368033..ceb2a486c9 100644
--- a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/util/IcebergTestUtils.java
+++ b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-processors/src/test/java/org/apache/nifi/processors/iceberg/util/IcebergTestUtils.java
@@ -36,8 +36,8 @@ import java.util.Comparator;
import java.util.List;
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;
public class IcebergTestUtils {
@@ -96,7 +96,7 @@ public class IcebergTestUtils {
public static void validatePartitionFolders(String tableLocation, List<String> partitionPaths) {
for (String partitionPath : partitionPaths) {
Path path = Paths.get(tableLocation + "/data/" + partitionPath);
- assertTrue("The expected path doesn't exists: " + path, Files.exists(path));
+ assertTrue(Files.exists(path),"The expected path doesn't exists: " + path);
}
}
diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java
index 725ed013a1..76855edc95 100644
--- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java
+++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/test/java/org/apache/nifi/jms/cf/JMSConnectionFactoryProviderTest.java
@@ -25,9 +25,8 @@ import org.apache.nifi.util.MockComponentLog;
import org.apache.nifi.util.MockConfigurationContext;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +34,9 @@ import javax.net.ssl.SSLContext;
import java.net.URISyntaxException;
import java.util.Collections;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -79,7 +80,7 @@ public class JMSConnectionFactoryProviderTest {
private String dummyResource;
private String allDummyResources;
- @Before
+ @BeforeEach
public void prepareTest() throws URISyntaxException {
dummyResource = this.getClass().getResource("/" + DUMMY_JAR_1).toURI().toString();
allDummyResources = this.getClass().getResource("/" + DUMMY_JAR_1).toURI().toString() + "," +
@@ -137,12 +138,12 @@ public class JMSConnectionFactoryProviderTest {
runner.assertValid(cfProvider);
ClassLoader loader = runner.getClass().getClassLoader();
- Assert.assertNotNull(loader.getResource(DUMMY_CONF));
- Assert.assertNotNull(loader.getResource(DUMMY_JAR_1));
- Assert.assertNotNull(loader.getResource(DUMMY_JAR_2));
+ assertNotNull(loader.getResource(DUMMY_CONF));
+ assertNotNull(loader.getResource(DUMMY_JAR_1));
+ assertNotNull(loader.getResource(DUMMY_JAR_2));
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void validateGetConnectionFactoryFailureIfServiceNotConfigured() {
JMSConnectionFactoryProvider cfProvider = new JMSConnectionFactoryProvider() {
@Override
@@ -151,7 +152,7 @@ public class JMSConnectionFactoryProviderTest {
}
};
cfProvider.onEnabled(new MockConfigurationContext(Collections.emptyMap(), null));
- cfProvider.getConnectionFactory();
+ assertThrows(IllegalStateException.class, cfProvider::getConnectionFactory);
}
@Test
diff --git a/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBFlowFileRepository.java b/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBFlowFileRepository.java
index dfadb7df21..af32f0371f 100644
--- a/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBFlowFileRepository.java
+++ b/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBFlowFileRepository.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.controller.repository;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.nifi.connectable.Connectable;
import org.apache.nifi.connectable.Connection;
import org.apache.nifi.controller.queue.FlowFileQueue;
@@ -32,19 +31,17 @@ import org.apache.nifi.controller.swap.StandardSwapContents;
import org.apache.nifi.controller.swap.StandardSwapSummary;
import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.util.file.FileUtils;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.io.TempDir;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -63,16 +60,18 @@ import java.util.concurrent.ConcurrentSkipListSet;
import java.util.function.Function;
import java.util.stream.Collectors;
-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.Assert.fail;
+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.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.when;
+@DisabledOnOs(OS.WINDOWS)
public class TestRocksDBFlowFileRepository {
private static final Logger logger = LoggerFactory.getLogger(TestRocksDBFlowFileRepository.class);
@@ -80,27 +79,17 @@ public class TestRocksDBFlowFileRepository {
private final Map<String, String> additionalProperties = new HashMap<>();
private String nifiPropertiesPath;
- @Rule
- public TestName testName = new TestName();
+ @TempDir
+ public Path temporaryFolder;
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @BeforeEach
+ public void before(TestInfo testInfo) throws IOException {
+ additionalProperties.put(NiFiProperties.FLOWFILE_REPOSITORY_DIRECTORY, temporaryFolder.toString());
+ Path properties = Files.createFile(temporaryFolder.resolve(testInfo.getDisplayName() + ".properties"));
+ Files.copy(Paths.get("src/test/resources/conf/nifi.properties"), properties, StandardCopyOption.REPLACE_EXISTING);
+ nifiPropertiesPath = properties.toString();
- @BeforeClass
- public static void setupClass() {
- Assume.assumeTrue("Test only runs on *nix", !SystemUtils.IS_OS_WINDOWS);
- }
-
- @Before
- public void before() throws IOException {
- File testRepoDir = temporaryFolder.newFolder(testName.getMethodName());
- additionalProperties.put(NiFiProperties.FLOWFILE_REPOSITORY_DIRECTORY, testRepoDir.getAbsolutePath());
-
- File properties = temporaryFolder.newFile();
- Files.copy(Paths.get("src/test/resources/conf/nifi.properties"), properties.toPath(), StandardCopyOption.REPLACE_EXISTING);
- nifiPropertiesPath = properties.getAbsolutePath();
-
- logger.info("Running test: {}", testName.getMethodName());
+ logger.info("Running test: {}", testInfo.getDisplayName());
}
@Test
@@ -427,7 +416,7 @@ public class TestRocksDBFlowFileRepository {
}
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void testUnknownVersion() throws Exception {
final NiFiProperties niFiProperties = NiFiProperties.createBasicNiFiProperties(nifiPropertiesPath, additionalProperties);
@@ -437,7 +426,7 @@ public class TestRocksDBFlowFileRepository {
db.putConfiguration(RocksDBFlowFileRepository.REPOSITORY_VERSION_KEY, "UNKNOWN".getBytes(StandardCharsets.UTF_8));
}
try (final RocksDBFlowFileRepository repo = new RocksDBFlowFileRepository(NiFiProperties.createBasicNiFiProperties(nifiPropertiesPath, additionalProperties))) {
- repo.initialize(new StandardResourceClaimManager());
+ assertThrows(IllegalStateException.class, () -> repo.initialize(new StandardResourceClaimManager()));
}
}
diff --git a/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBMetronome.java b/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBMetronome.java
index 7e41491498..446d537026 100644
--- a/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBMetronome.java
+++ b/nifi-nar-bundles/nifi-rocksdb-bundle/nifi-rocksdb-repository/src/test/java/org/apache/nifi/controller/repository/TestRocksDBMetronome.java
@@ -38,11 +38,11 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
@DisabledOnOs(OS.WINDOWS)
diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextFactoryTests.java b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextFactoryTests.java
index ca29470e5a..c9883906e1 100644
--- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextFactoryTests.java
+++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/src/test/java/org/apache/nifi/spring/SpringContextFactoryTests.java
@@ -16,10 +16,10 @@
*/
package org.apache.nifi.spring;
-import static org.junit.Assert.assertEquals;
-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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.HashMap;
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
index 6fba4bf4a5..014e6880c6 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
@@ -35,7 +35,7 @@ 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 org.junit.runner.Description;
+import org.junit.jupiter.api.extension.RegisterExtension;
import java.io.File;
import java.io.FileOutputStream;
@@ -83,7 +83,8 @@ public class TestListFile {
private Long age0millis, age1millis, age2millis, age3millis, age4millis, age5millis;
private String age0, age1, age2, age3, age4, age5;
- public ListProcessorTestWatcher dumpState = new ListProcessorTestWatcher(
+ @RegisterExtension
+ private final ListProcessorTestWatcher dumpState = new ListProcessorTestWatcher(
() -> {
try {
return runner.getStateManager().getState(Scope.LOCAL).toMap();
@@ -94,18 +95,7 @@ public class TestListFile {
() -> listFiles(testDir).stream()
.map(f -> new FileInfo.Builder().filename(f.getName()).lastModifiedTime(f.lastModified()).build()).collect(Collectors.toList()),
() -> runner.getFlowFilesForRelationship(AbstractListProcessor.REL_SUCCESS).stream().map(m -> (FlowFile) m).collect(Collectors.toList())
- ) {
- @Override
- protected void finished(Description description) {
- try {
- // In order to refer files in testDir, we want to execute this rule before tearDown, because tearDown removes files.
- // And @After is always executed before @Rule.
- tearDown();
- } catch (Exception e) {
- throw new RuntimeException("Failed to tearDown.", e);
- }
- }
- };
+ );
@BeforeAll
public static void setupClass() throws Exception {
@@ -172,7 +162,6 @@ public class TestListFile {
dumpState.dumpState(startedAtMillis);
}
-
@Test
public void testGetPath() {
runner.setProperty(ListFile.DIRECTORY, "/dir/test1");
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/test/java/org/apache/nifi/dbcp/TestDBCPConnectionPoolLookup.java b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/test/java/org/apache/nifi/dbcp/TestDBCPConnectionPoolLookup.java
index 3a3b8c9def..43230c8c3e 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/test/java/org/apache/nifi/dbcp/TestDBCPConnectionPoolLookup.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/test/java/org/apache/nifi/dbcp/TestDBCPConnectionPoolLookup.java
@@ -24,8 +24,8 @@ import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.NoOpProcessor;
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.sql.Connection;
import java.util.Collections;
@@ -34,6 +34,7 @@ import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+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;
@@ -49,7 +50,7 @@ public class TestDBCPConnectionPoolLookup {
private DBCPService dbcpLookupService;
private TestRunner runner;
- @Before
+ @BeforeEach
public void setup() throws InitializationException {
connectionA = mock(MockConnection.class);
when(connectionA.getName()).thenReturn("A");
@@ -106,22 +107,22 @@ public class TestDBCPConnectionPoolLookup {
assertEquals(connectionB.getName(), mockConnection.getName());
}
- @Test(expected = UnsupportedOperationException.class)
+ @Test
public void testLookupWithoutAttributes() {
- dbcpLookupService.getConnection();
+ assertThrows(UnsupportedOperationException.class, () -> dbcpLookupService.getConnection());
}
- @Test(expected = ProcessException.class)
+ @Test
public void testLookupMissingDatabaseNameAttribute() {
final Map<String,String> attributes = new HashMap<>();
- dbcpLookupService.getConnection(attributes);
+ assertThrows(ProcessException.class, () -> dbcpLookupService.getConnection(attributes));
}
- @Test(expected = ProcessException.class)
+ @Test
public void testLookupWithDatabaseNameThatDoesNotExist() {
final Map<String,String> attributes = new HashMap<>();
attributes.put(DBCPConnectionPoolLookup.DATABASE_NAME_ATTRIBUTE, "DOES-NOT-EXIST");
- dbcpLookupService.getConnection(attributes);
+ assertThrows(ProcessException.class, () -> dbcpLookupService.getConnection(attributes));
}
@Test
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
index 56b329fcbd..2184f3d72f 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/TestRestLookupService.groovy
@@ -31,8 +31,8 @@ import org.apache.nifi.serialization.record.RecordFieldType
import org.apache.nifi.serialization.record.RecordSchema
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 groovy.json.JsonOutput.toJson
import static org.junit.jupiter.api.Assertions.assertEquals
@@ -46,7 +46,7 @@ class TestRestLookupService {
static final String JSON_TYPE = "application/json"
- @Before
+ @BeforeEach
void setup() {
recordReader = new MockRecordParser()
lookupService = new MockRestLookupService()
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/rest/handlers/VerbTest.groovy b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/rest/handlers/VerbTest.groovy
index ad6f232f3b..821274b86c 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/rest/handlers/VerbTest.groovy
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/groovy/org/apache/nifi/lookup/rest/handlers/VerbTest.groovy
@@ -18,7 +18,6 @@
package org.apache.nifi.lookup.rest.handlers
import org.apache.nifi.util.StringUtils
-import org.junit.Assert
import org.slf4j.Logger
import org.slf4j.LoggerFactory
@@ -28,6 +27,8 @@ import javax.servlet.http.HttpServletResponse
import static groovy.json.JsonOutput.prettyPrint
import static groovy.json.JsonOutput.toJson
+import static org.junit.jupiter.api.Assertions.assertFalse
+import static org.junit.jupiter.api.Assertions.assertNotNull
class VerbTest extends HttpServlet {
Logger logger = LoggerFactory.getLogger(VerbTest.class)
@@ -62,8 +63,8 @@ class VerbTest extends HttpServlet {
boolean bodyRequired = !StringUtils.isBlank(needsBody)
String body = request.inputStream.text
if (bodyRequired) {
- Assert.assertNotNull(body)
- Assert.assertFalse(StringUtils.isBlank(body))
+ assertNotNull(body)
+ assertFalse(StringUtils.isBlank(body))
}
}
}
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/configuration2/XXEValidatorTest.java b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/configuration2/XXEValidatorTest.java
index a8aea1ce96..f39a8c9fdf 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/configuration2/XXEValidatorTest.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/test/java/org/apache/nifi/lookup/configuration2/XXEValidatorTest.java
@@ -21,9 +21,9 @@ import org.apache.nifi.components.ValidationResult;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
public class XXEValidatorTest {
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-api/src/test/java/org/apache/nifi/proxy/TestProxyConfiguration.java b/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-api/src/test/java/org/apache/nifi/proxy/TestProxyConfiguration.java
index 2cd4fb249f..ed603b7d55 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-api/src/test/java/org/apache/nifi/proxy/TestProxyConfiguration.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-api/src/test/java/org/apache/nifi/proxy/TestProxyConfiguration.java
@@ -26,7 +26,7 @@ import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.net.Proxy;
import java.util.ArrayList;
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/cef/TestCEFUtil.java b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/cef/TestCEFUtil.java
index 31382023ce..b6d32a0618 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/cef/TestCEFUtil.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/cef/TestCEFUtil.java
@@ -19,7 +19,6 @@ package org.apache.nifi.cef;
import org.apache.nifi.serialization.record.Record;
import org.apache.nifi.serialization.record.RecordField;
import org.apache.nifi.serialization.record.RecordFieldType;
-import org.junit.Assert;
import java.sql.Timestamp;
import java.text.ParseException;
@@ -30,6 +29,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class TestCEFUtil {
static final String RAW_FIELD = "raw";
static final String RAW_VALUE = "Oct 12 04:16:11 localhost CEF:0|Company|Product|1.2.3|audit-login|Successful login|3|";
@@ -122,7 +123,8 @@ public class TestCEFUtil {
* Record internally keeps the unknown fields even if they are marked for dropping. Thus direct comparison will not work as expected
*/
static void assertFieldsAre(final Record record, final Map<String, Object> expectedValues) {
- Assert.assertEquals(expectedValues.size(), record.getValues().length);
- expectedValues.entrySet().forEach(field -> Assert.assertEquals("Field " + field.getKey() + " is incorrect" , field.getValue(), record.getValue(field.getKey())));
+ assertEquals(expectedValues.size(), record.getValues().length);
+ expectedValues.entrySet().forEach(field -> assertEquals(field.getValue(), record.getValue(field.getKey()),
+ "Field " + field.getKey() + " is incorrect"));
}
}
diff --git a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouter.java b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouter.java
index f06ef7cc92..da4da7ae88 100644
--- a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouter.java
+++ b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouter.java
@@ -17,12 +17,12 @@
package org.apache.nifi.websocket;
import org.apache.nifi.processor.Processor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -42,11 +42,8 @@ public class TestWebSocketMessageRouter {
when(processor1.getIdentifier()).thenReturn("processor-2");
router.registerProcessor(processor1);
- try {
- router.registerProcessor(processor2);
- fail("Should fail since a processor is already registered.");
- } catch (WebSocketConfigurationException e) {
- }
+ assertThrows(WebSocketConfigurationException.class, () -> router.registerProcessor(processor2),
+ "Should fail since a processor is already registered.");
assertTrue(router.isProcessorRegistered(processor1));
assertFalse(router.isProcessorRegistered(processor2));
@@ -77,11 +74,8 @@ public class TestWebSocketMessageRouter {
router.captureSession(session);
router.sendMessage("session-1", sender -> sender.sendString("message"));
- try {
- router.sendMessage("session-2", sender -> sender.sendString("message"));
- fail("Should fail because there's no session with id session-2.");
- } catch (IllegalStateException e) {
- }
+ assertThrows(IllegalStateException.class,
+ () -> router.sendMessage("session-2", sender -> sender.sendString("message")),
+ "Should fail because there's no session with id session-2.");
}
-
}
diff --git a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouters.java b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouters.java
index eb911c78eb..3563612443 100644
--- a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouters.java
+++ b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-api/src/test/java/org/apache/nifi/websocket/TestWebSocketMessageRouters.java
@@ -17,12 +17,12 @@
package org.apache.nifi.websocket;
import org.apache.nifi.processor.Processor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+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;
@@ -33,11 +33,8 @@ public class TestWebSocketMessageRouters {
public void testRegisterProcessor() throws Exception {
final String endpointId = "endpoint-id";
final WebSocketMessageRouters routers = new WebSocketMessageRouters();
- try {
- routers.getRouterOrFail(endpointId);
- fail("Should fail because no route exists with the endpointId.");
- } catch (WebSocketConfigurationException e) {
- }
+ assertThrows(WebSocketConfigurationException.class, () -> routers.getRouterOrFail(endpointId),
+ "Should fail because no route exists with the endpointId.");
final Processor processor1 = mock(Processor.class);
when(processor1.getIdentifier()).thenReturn("processor-1");