You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2023/01/06 17:33:35 UTC
[nifi] branch main updated: NIFI-11019 Converted remaining nifi-scripting tests to JUnit 5
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 9252dcbc76 NIFI-11019 Converted remaining nifi-scripting tests to JUnit 5
9252dcbc76 is described below
commit 9252dcbc763865962377a190560232a32f24d1cd
Author: Nissim Shiman <ns...@yahoo.com>
AuthorDate: Wed Jan 4 16:51:29 2023 +0000
NIFI-11019 Converted remaining nifi-scripting tests to JUnit 5
This closes #6824
Signed-off-by: David Handermann <ex...@apache.org>
---
.../nifi/processors/script/TestInvokeJython.java | 13 +++++++------
.../script/TestScriptedFilterRecord.java | 9 +++++----
.../script/TestScriptedPartitionRecord.java | 22 ++++++++++++----------
.../script/TestScriptedRouterProcessor.java | 11 ++++++-----
.../script/TestScriptedValidateRecord.java | 13 +++++++------
.../engine/script/ScriptedRulesEngineTest.java | 2 +-
.../handlers/script/ScriptedActionHandlerTest.java | 6 +++---
7 files changed, 41 insertions(+), 35 deletions(-)
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java
index 0efbc5f046..9114b46460 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java
@@ -22,7 +22,6 @@ import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.MockProcessContext;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Assert;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -32,6 +31,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class TestInvokeJython extends BaseScriptTest {
/**
@@ -56,8 +57,8 @@ public class TestInvokeJython extends BaseScriptTest {
runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_invalid.py");
final Collection<ValidationResult> results = ((MockProcessContext) runner.getProcessContext()).validate();
- Assert.assertEquals(1L, results.size());
- Assert.assertEquals("Never valid.", results.iterator().next().getExplanation());
+ assertEquals(1L, results.size());
+ assertEquals("Never valid.", results.iterator().next().getExplanation());
}
/**
@@ -71,8 +72,8 @@ public class TestInvokeJython extends BaseScriptTest {
runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_invalid.py");
final Collection<ValidationResult> results = ((MockProcessContext) runner.getProcessContext()).validate();
- Assert.assertEquals(1L, results.size());
- Assert.assertEquals("Never valid.", results.iterator().next().getExplanation());
+ assertEquals(1L, results.size());
+ assertEquals("Never valid.", results.iterator().next().getExplanation());
runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_update_attribute.py");
runner.setProperty("for-attributes", "value-1");
@@ -173,7 +174,7 @@ public class TestInvokeJython extends BaseScriptTest {
two.assertAllFlowFilesTransferred("success", 1);
final List<MockFlowFile> twoResult = two.getFlowFilesForRelationship("success");
- Assert.assertEquals("test content", new String(twoResult.get(0).toByteArray(), StandardCharsets.UTF_8));
+ assertEquals("test content", new String(twoResult.get(0).toByteArray(), StandardCharsets.UTF_8));
}
/**
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedFilterRecord.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedFilterRecord.java
index 310fcfad32..ff4c414d31 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedFilterRecord.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedFilterRecord.java
@@ -19,8 +19,9 @@ package org.apache.nifi.processors.script;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestScriptedFilterRecord extends TestScriptedRouterProcessor {
private static final String SCRIPT = "return record.getValue(\"first\") == 1";
@@ -100,8 +101,8 @@ public class TestScriptedFilterRecord extends TestScriptedRouterProcessor {
private void thenMatchingFlowFileContains(final Object[]... records) {
testRunner.assertTransferCount(ScriptedFilterRecord.RELATIONSHIP_SUCCESS, 1);
final MockFlowFile resultFlowFile = testRunner.getFlowFilesForRelationship(ScriptedFilterRecord.RELATIONSHIP_SUCCESS).get(0);
- Assert.assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
- Assert.assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
+ assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
+ assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
}
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedPartitionRecord.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedPartitionRecord.java
index c8d4178589..0b56b94feb 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedPartitionRecord.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedPartitionRecord.java
@@ -19,14 +19,16 @@ package org.apache.nifi.processors.script;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class TestScriptedPartitionRecord extends TestScriptedRouterProcessor {
private static final String PARTITION_ATTRIBUTE = "partition";
private static final Object[] PARTITION_1_RECORD_1 = new Object[] {1, "lorem"};
@@ -124,18 +126,18 @@ public class TestScriptedPartitionRecord extends TestScriptedRouterProcessor {
}
private void thenNoPartitionExists() {
- Assert.assertEquals(0, testRunner.getFlowFilesForRelationship(ScriptedPartitionRecord.RELATIONSHIP_SUCCESS).size());
+ assertEquals(0, testRunner.getFlowFilesForRelationship(ScriptedPartitionRecord.RELATIONSHIP_SUCCESS).size());
}
private void thenTheFollowingPartitionsExists(final String... partitions) {
final List<MockFlowFile> outgoingFlowFiles = testRunner.getFlowFilesForRelationship(ScriptedPartitionRecord.RELATIONSHIP_SUCCESS);
- Assert.assertEquals(partitions.length, outgoingFlowFiles.size());
+ assertEquals(partitions.length, outgoingFlowFiles.size());
final Set<String> outgoingPartitions = outgoingFlowFiles.stream().map(ff -> ff.getAttribute(PARTITION_ATTRIBUTE)).collect(Collectors.toSet());
for (final String partition : partitions) {
- Assert.assertTrue(outgoingPartitions.contains(partition));
+ assertTrue(outgoingPartitions.contains(partition));
}
}
@@ -153,12 +155,12 @@ public class TestScriptedPartitionRecord extends TestScriptedRouterProcessor {
}
}
- Assert.assertEquals(1, outgoingFlowFiles.size());
+ assertEquals(1, outgoingFlowFiles.size());
final MockFlowFile resultFlowFile = outgoingFlowFiles.iterator().next();
- Assert.assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
- Assert.assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
- Assert.assertEquals(String.valueOf(index), resultFlowFile.getAttribute("fragment.index"));
- Assert.assertEquals(String.valueOf(count), resultFlowFile.getAttribute("fragment.count"));
+ assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
+ assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
+ assertEquals(String.valueOf(index), resultFlowFile.getAttribute("fragment.index"));
+ assertEquals(String.valueOf(count), resultFlowFile.getAttribute("fragment.count"));
}
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedRouterProcessor.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedRouterProcessor.java
index 89a81c4443..8e244f3ce2 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedRouterProcessor.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedRouterProcessor.java
@@ -24,11 +24,12 @@ import org.apache.nifi.serialization.record.MockRecordWriter;
import org.apache.nifi.serialization.record.RecordFieldType;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import java.util.UUID;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
abstract class TestScriptedRouterProcessor {
private static final String HEADER = "header§";
@@ -37,7 +38,7 @@ abstract class TestScriptedRouterProcessor {
protected MockRecordWriter recordWriter;
protected String incomingFlowFileContent;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
testRunner = TestRunners.newTestRunner(givenProcessorType());
@@ -77,13 +78,13 @@ abstract class TestScriptedRouterProcessor {
protected void thenIncomingFlowFileIsRoutedToOriginal() {
testRunner.assertTransferCount(getOriginalRelationship(), 1);
testRunner.assertTransferCount(getFailedRelationship(), 0);
- Assert.assertEquals(incomingFlowFileContent, testRunner.getFlowFilesForRelationship(getOriginalRelationship()).get(0).getContent());
+ assertEquals(incomingFlowFileContent, testRunner.getFlowFilesForRelationship(getOriginalRelationship()).get(0).getContent());
}
protected void thenIncomingFlowFileIsRoutedToFailed() {
testRunner.assertTransferCount(getOriginalRelationship(), 0);
testRunner.assertTransferCount(getFailedRelationship(), 1);
- Assert.assertEquals(incomingFlowFileContent, testRunner.getFlowFilesForRelationship(getFailedRelationship()).get(0).getContent());
+ assertEquals(incomingFlowFileContent, testRunner.getFlowFilesForRelationship(getFailedRelationship()).get(0).getContent());
}
/**
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedValidateRecord.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedValidateRecord.java
index f56cb77931..42287fdc61 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedValidateRecord.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestScriptedValidateRecord.java
@@ -19,8 +19,9 @@ package org.apache.nifi.processors.script;
import org.apache.nifi.processor.Processor;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestScriptedValidateRecord extends TestScriptedRouterProcessor {
private static final String SCRIPT = "return record.getValue(\"first\") == 1";
@@ -105,15 +106,15 @@ public class TestScriptedValidateRecord extends TestScriptedRouterProcessor {
private void thenValidFlowFileContains(final Object[]... records) {
testRunner.assertTransferCount(ScriptedValidateRecord.RELATIONSHIP_VALID, 1);
final MockFlowFile resultFlowFile = testRunner.getFlowFilesForRelationship(ScriptedValidateRecord.RELATIONSHIP_VALID).get(0);
- Assert.assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
- Assert.assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
+ assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
+ assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
}
private void thenInvalidFlowFileContains(final Object[]... records) {
testRunner.assertTransferCount(ScriptedValidateRecord.RELATIONSHIP_INVALID, 1);
final MockFlowFile resultFlowFile = testRunner.getFlowFilesForRelationship(ScriptedValidateRecord.RELATIONSHIP_INVALID).get(0);
- Assert.assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
- Assert.assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
+ assertEquals(givenExpectedFlowFile(records), resultFlowFile.getContent());
+ assertEquals("text/plain", resultFlowFile.getAttribute("mime.type"));
}
private void thenNoValidFlowFile() {
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java
index f6e8a93d1f..5eea79d6a5 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/engine/script/ScriptedRulesEngineTest.java
@@ -36,7 +36,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;
public class ScriptedRulesEngineTest {
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java
index d0399b3b73..3e53a2d3d9 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/rules/handlers/script/ScriptedActionHandlerTest.java
@@ -45,10 +45,10 @@ import java.util.List;
import java.util.Map;
import static junit.framework.TestCase.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;