NIFI-11035 Replaced remaining JUnit 4 assertions in nifi-commons with…

… JUnit 5 - Replaced Groovy asserts with JUnit 5 assertions and Groovy shouldFail method Junit 5 with assertThrow method This closes apache#6880 Signed-off-by: David Handermann <[email protected]>
nexr · Jan 24, 2023 · 5337184 · 5337184
1 parent 84f48b5
commit 5337184
Show file tree

Hide file tree

Showing 44 changed files with 935 additions and 1,113 deletions.
diff --git a/...uage/src/test/groovy/org/apache/nifi/attribute/expression/language/QueryGroovyTest.groovy b/...uage/src/test/groovy/org/apache/nifi/attribute/expression/language/QueryGroovyTest.groovy
@@ -25,7 +25,10 @@ import org.junit.jupiter.api.Test
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-class QueryGroovyTest extends GroovyTestCase {
+import static org.junit.jupiter.api.Assertions.assertEquals
+import static org.junit.jupiter.api.Assertions.assertNotEquals
+
+class QueryGroovyTest {
     private static final Logger logger = LoggerFactory.getLogger(QueryGroovyTest.class)
 
     @BeforeAll
@@ -79,11 +82,11 @@ class QueryGroovyTest extends GroovyTestCase {
         logger.info("Replace repeating result: ${replaceRepeatingResult.value}")
 
         // Assert
-        assert replaceSingleResult.value == EXPECTED_SINGLE_RESULT
-        assert replaceSingleResult.resultType == AttributeExpression.ResultType.STRING
+        assertEquals(EXPECTED_SINGLE_RESULT, replaceSingleResult.value)
+        assertEquals(AttributeExpression.ResultType.STRING, replaceSingleResult.resultType)
 
-        assert replaceRepeatingResult.value == EXPECTED_REPEATING_RESULT
-        assert replaceRepeatingResult.resultType == AttributeExpression.ResultType.STRING
+        assertEquals(EXPECTED_REPEATING_RESULT, replaceRepeatingResult.value)
+        assertEquals(AttributeExpression.ResultType.STRING, replaceRepeatingResult.resultType)
     }
 
     @Test
@@ -119,11 +122,11 @@ class QueryGroovyTest extends GroovyTestCase {
         logger.info("Replace repeating result: ${replaceRepeatingResult.value}")
 
         // Assert
-        assert replaceSingleResult.value == EXPECTED_SINGLE_RESULT
-        assert replaceSingleResult.resultType == AttributeExpression.ResultType.STRING
+        assertEquals(EXPECTED_SINGLE_RESULT, replaceSingleResult.value)
+        assertEquals(AttributeExpression.ResultType.STRING, replaceSingleResult.resultType)
 
-        assert replaceRepeatingResult.value == EXPECTED_REPEATING_RESULT
-        assert replaceRepeatingResult.resultType == AttributeExpression.ResultType.STRING
+        assertEquals(EXPECTED_REPEATING_RESULT, replaceRepeatingResult.value)
+        assertEquals(AttributeExpression.ResultType.STRING, replaceRepeatingResult.resultType)
     }
 
     @Test
@@ -159,11 +162,11 @@ class QueryGroovyTest extends GroovyTestCase {
         logger.info("Replace repeating result: ${replaceRepeatingResult.value}")
 
         // Assert
-        assert replaceSingleResult.value == EXPECTED_SINGLE_RESULT
-        assert replaceSingleResult.resultType == AttributeExpression.ResultType.STRING
+        assertEquals(EXPECTED_SINGLE_RESULT, replaceSingleResult.value)
+        assertEquals(AttributeExpression.ResultType.STRING, replaceSingleResult.resultType)
 
-        assert replaceRepeatingResult.value == EXPECTED_REPEATING_RESULT
-        assert replaceRepeatingResult.resultType == AttributeExpression.ResultType.STRING
+        assertEquals(EXPECTED_REPEATING_RESULT, replaceRepeatingResult.value)
+        assertEquals(AttributeExpression.ResultType.STRING, replaceRepeatingResult.resultType)
     }
 
     @Test
@@ -200,10 +203,10 @@ class QueryGroovyTest extends GroovyTestCase {
         logger.info("Replace repeating result: ${replaceFirstRepeatingResult}")
 
         // Assert
-        assert replaceSingleResult != EXPECTED_SINGLE_RESULT
-        assert replaceRepeatingResult != EXPECTED_REPEATING_RESULT
+        assertNotEquals(EXPECTED_SINGLE_RESULT, replaceSingleResult)
+        assertNotEquals(EXPECTED_REPEATING_RESULT, replaceRepeatingResult)
 
-        assert replaceFirstSingleResult == EXPECTED_SINGLE_RESULT
-        assert replaceFirstRepeatingResult == EXPECTED_REPEATING_RESULT
+        assertEquals(EXPECTED_SINGLE_RESULT, replaceFirstSingleResult)
+        assertEquals(EXPECTED_REPEATING_RESULT, replaceFirstRepeatingResult)
     }
 }
diff --git a/...language/src/test/java/org/apache/nifi/attribute/expression/language/TestValueLookup.java b/...language/src/test/java/org/apache/nifi/attribute/expression/language/TestValueLookup.java
@@ -23,9 +23,9 @@
 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.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 TestValueLookup {
 

diff --git a/...ons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java b/...ons/nifi-flowfile-packager/src/test/java/org/apache/nifi/util/TestPackageUnpackageV3.java
@@ -21,12 +21,12 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestPackageUnpackageV3 {
 
@@ -35,7 +35,7 @@ public void test() throws IOException {
         final FlowFilePackager packager = new FlowFilePackagerV3();
         final FlowFileUnpackager unpackager = new FlowFileUnpackagerV3();
 
-        final byte[] data = "Hello, World!".getBytes("UTF-8");
+        final byte[] data = "Hello, World!".getBytes(StandardCharsets.UTF_8);
         final Map<String, String> map = new HashMap<>();
         map.put("abc", "cba");
 
@@ -50,7 +50,7 @@ public void test() throws IOException {
         final byte[] decoded = decodedOut.toByteArray();
 
         assertEquals(map, unpackagedAttributes);
-        assertTrue(Arrays.equals(data, decoded));
+        assertArrayEquals(data, decoded);
     }
 
 }
diff --git a/...commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java b/...commons/nifi-hl7-query-language/src/test/java/org/apache/nifi/hl7/query/TestHL7Query.java
@@ -28,15 +28,14 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
 import java.util.ArrayList;
 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.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;
 
 @SuppressWarnings("resource")
 public class TestHL7Query {
@@ -60,7 +59,7 @@ public class TestHL7Query {
     private HL7Message hypoglycemia;
 
     @BeforeEach
-    public void init() throws IOException, HL7Exception {
+    public void init() throws HL7Exception {
         this.hyperglycemia = createMessage(HYPERGLYCEMIA);
         this.hypoglycemia = createMessage(HYPOGLYCEMIA);
     }
@@ -116,7 +115,7 @@ private void verifyAssignments(final Map<String, Object> map, final String a, fi
     }
 
     @Test
-    public void testSelectMessage() throws HL7Exception, IOException {
+    public void testSelectMessage() {
         final HL7Query query = HL7Query.compile("SELECT MESSAGE");
         final HL7Message msg = hypoglycemia;
         final QueryResult result = query.evaluate(msg);
@@ -131,7 +130,7 @@ public void testSelectMessage() throws HL7Exception, IOException {
 
     @Test
     @SuppressWarnings({"unchecked", "rawtypes"})
-    public void testSelectField() throws HL7Exception, IOException {
+    public void testSelectField() {
         final HL7Query query = HL7Query.compile("SELECT PID.5");
         final HL7Message msg = hypoglycemia;
         final QueryResult result = query.evaluate(msg);
@@ -149,7 +148,7 @@ public void testSelectField() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testSelectAbnormalTestResult() throws HL7Exception, IOException {
+    public void testSelectAbnormalTestResult() {
         final String query = "DECLARE result AS REQUIRED OBX SELECT result WHERE result.7 != 'N' AND result.1 = 1";
 
         final HL7Query hl7Query = HL7Query.compile(query);
@@ -158,7 +157,7 @@ public void testSelectAbnormalTestResult() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testFieldEqualsString() throws HL7Exception, IOException {
+    public void testFieldEqualsString() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.7 = 'L'");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -169,7 +168,7 @@ public void testFieldEqualsString() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testLessThan() throws HL7Exception, IOException {
+    public void testLessThan() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.4 < 600");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -180,7 +179,7 @@ public void testLessThan() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testCompareTwoFields() throws HL7Exception, IOException {
+    public void testCompareTwoFields() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.4 < result.6.2");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -191,7 +190,7 @@ public void testCompareTwoFields() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testLessThanOrEqual() throws HL7Exception, IOException {
+    public void testLessThanOrEqual() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.4 <= 59");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -206,7 +205,7 @@ public void testLessThanOrEqual() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testGreaterThanOrEqual() throws HL7Exception, IOException {
+    public void testGreaterThanOrEqual() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.4 >= 59");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -221,7 +220,7 @@ public void testGreaterThanOrEqual() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testGreaterThan() throws HL7Exception, IOException {
+    public void testGreaterThan() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.4 > 58");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -236,15 +235,15 @@ public void testGreaterThan() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testDistinctValuesReturned() throws HL7Exception, IOException {
+    public void testDistinctValuesReturned() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result1 AS REQUIRED OBX, result2 AS REQUIRED OBX SELECT MESSAGE WHERE result1.7 = 'L' OR result2.7 != 'H'");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
         assertEquals(1, result.getHitCount());
     }
 
     @Test
-    public void testAndWithParents() throws HL7Exception, IOException {
+    public void testAndWithParents() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.7 = 'L' AND result.3.1 = 'GLU'");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -276,7 +275,7 @@ public void testAndWithParents() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testIsNull() throws HL7Exception, IOException {
+    public void testIsNull() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.999 IS NULL");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertTrue(result.isMatch());
@@ -295,7 +294,7 @@ public void testIsNull() throws HL7Exception, IOException {
     }
 
     @Test
-    public void testNotNull() throws HL7Exception, IOException {
+    public void testNotNull() {
         HL7Query hl7Query = HL7Query.compile("DECLARE result AS REQUIRED OBX SELECT MESSAGE WHERE result.999 NOT NULL");
         QueryResult result = hl7Query.evaluate(hypoglycemia);
         assertFalse(result.isMatch());
@@ -313,7 +312,7 @@ public void testNotNull() throws HL7Exception, IOException {
         assertTrue(result.isMatch());
     }
 
-    private HL7Message createMessage(final String msgText) throws HL7Exception, IOException {
+    private HL7Message createMessage(final String msgText) throws HL7Exception {
         final HapiContext hapiContext = new DefaultHapiContext();
         hapiContext.setValidationContext(ValidationContextFactory.noValidation());
 

diff --git a/...s/nifi-json-utils/src/test/groovy/org/apache/nifi/processor/TestStandardValidators.groovy b/...s/nifi-json-utils/src/test/groovy/org/apache/nifi/processor/TestStandardValidators.groovy
@@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test
 
 import static groovy.json.JsonOutput.prettyPrint
 import static groovy.json.JsonOutput.toJson
-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.mock
 
 class TestStandardValidators {

diff --git a/...rty-encryptor/src/test/java/org/apache/nifi/encrypt/KeyedCipherPropertyEncryptorTest.java b/...rty-encryptor/src/test/java/org/apache/nifi/encrypt/KeyedCipherPropertyEncryptorTest.java
@@ -30,9 +30,9 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class KeyedCipherPropertyEncryptorTest {
     private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;

diff --git a/...yptor/src/test/java/org/apache/nifi/encrypt/PasswordBasedCipherPropertyEncryptorTest.java b/...yptor/src/test/java/org/apache/nifi/encrypt/PasswordBasedCipherPropertyEncryptorTest.java
@@ -26,9 +26,9 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class PasswordBasedCipherPropertyEncryptorTest {
     private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;

diff --git a/...roperty-encryptor/src/test/java/org/apache/nifi/encrypt/PropertyEncryptorFactoryTest.java b/...roperty-encryptor/src/test/java/org/apache/nifi/encrypt/PropertyEncryptorFactoryTest.java
@@ -23,9 +23,9 @@
 
 import java.util.Properties;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class PropertyEncryptorFactoryTest {
     private static final EncryptionMethod ENCRYPTION_METHOD = EncryptionMethod.MD5_256AES;

diff --git a/...ncryptor/src/test/java/org/apache/nifi/encrypt/StandardPropertySecretKeyProviderTest.java b/...ncryptor/src/test/java/org/apache/nifi/encrypt/StandardPropertySecretKeyProviderTest.java
@@ -21,8 +21,8 @@
 
 import javax.crypto.SecretKey;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class StandardPropertySecretKeyProviderTest {
     private static final String SEED = String.class.getName();
@@ -42,7 +42,7 @@ public void testPropertyEncryptionMethodSupported() {
             final SecretKey secretKey = provider.getSecretKey(propertyEncryptionMethod, SEED);
             final int secretKeyLength = secretKey.getEncoded().length;
             final String message = String.format("Method [%s] Key Length not matched", propertyEncryptionMethod);
-            assertEquals(message, propertyEncryptionMethod.getHashLength(), secretKeyLength);
+            assertEquals(propertyEncryptionMethod.getHashLength(), secretKeyLength, message);
         }
     }
 

diff --git a/...s/nifi-record-path/src/test/java/org/apache/nifi/record/path/util/AbstractWalkerTest.java b/...s/nifi-record-path/src/test/java/org/apache/nifi/record/path/util/AbstractWalkerTest.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Abstract base class for tests that walk FieldValue hierarchies.

diff --git a/...path/src/test/java/org/apache/nifi/record/path/util/TestFieldValueLogicalPathBuilder.java b/...path/src/test/java/org/apache/nifi/record/path/util/TestFieldValueLogicalPathBuilder.java
@@ -24,8 +24,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class TestFieldValueLogicalPathBuilder extends AbstractWalkerTest {
 

diff --git a/...nifi-record-path/src/test/java/org/apache/nifi/record/path/util/TestFieldValueWalker.java b/...nifi-record-path/src/test/java/org/apache/nifi/record/path/util/TestFieldValueWalker.java
@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class TestFieldValueWalker extends AbstractWalkerTest {
 

diff --git a/...mmons/nifi-record/src/test/java/org/apache/nifi/serialization/TestSimpleRecordSchema.java b/...mmons/nifi-record/src/test/java/org/apache/nifi/serialization/TestSimpleRecordSchema.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.Set;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class TestSimpleRecordSchema {