Repository: nifi Updated Branches: refs/heads/master 31ec01b5f -> 675f4f544
http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/BaseScriptTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/BaseScriptTest.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/BaseScriptTest.java index eb83b48..881383e 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/BaseScriptTest.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/BaseScriptTest.java @@ -35,8 +35,8 @@ public abstract class BaseScriptTest { public final String TEST_RESOURCE_LOCATION = "target/test/resources/"; - protected TestRunner runner; + protected AccessibleScriptingComponentHelper scriptingComponent; /** * Copies all scripts to the target directory because when they are compiled they can leave unwanted .class files. @@ -49,17 +49,19 @@ public abstract class BaseScriptTest { } public void setupExecuteScript() throws Exception { - final ExecuteScript executeScript = new ExecuteScript(); + final ExecuteScript executeScript = new AccessibleExecuteScript(); // Need to do something to initialize the properties, like retrieve the list of properties assertNotNull(executeScript.getSupportedPropertyDescriptors()); runner = TestRunners.newTestRunner(executeScript); + scriptingComponent = (AccessibleScriptingComponentHelper) executeScript; } public void setupInvokeScriptProcessor() throws Exception { - final InvokeScriptedProcessor invokeScriptedProcessor = new InvokeScriptedProcessor(); + final InvokeScriptedProcessor invokeScriptedProcessor = new AccessibleInvokeScriptedProcessor(); // Need to do something to initialize the properties, like retrieve the list of properties assertNotNull(invokeScriptedProcessor.getSupportedPropertyDescriptors()); runner = TestRunners.newTestRunner(invokeScriptedProcessor); + scriptingComponent = (AccessibleScriptingComponentHelper) invokeScriptedProcessor; } public String getFileContentsAsString(String path) { @@ -69,4 +71,18 @@ public abstract class BaseScriptTest { return null; } } + + class AccessibleExecuteScript extends ExecuteScript implements AccessibleScriptingComponentHelper { + @Override + public ScriptingComponentHelper getScriptingComponentHelper() { + return this.scriptingComponentHelper; + } + } + + class AccessibleInvokeScriptedProcessor extends InvokeScriptedProcessor implements AccessibleScriptingComponentHelper { + @Override + public ScriptingComponentHelper getScriptingComponentHelper() { + return this.scriptingComponentHelper; + } + } } http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteGroovy.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteGroovy.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteGroovy.java index 1b7ec86..adaf955 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteGroovy.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteGroovy.java @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; public class TestExecuteGroovy extends BaseScriptTest { - public final String TEST_CSV_DATA = "gender,title,first,last\n" + private final String TEST_CSV_DATA = "gender,title,first,last\n" + "female,miss,marlene,shaw\n" + "male,mr,todd,graham"; @@ -46,9 +46,9 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testReadFlowFileContentAndStoreInFlowFileAttributeWithScriptFile() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_onTrigger.groovy"); - runner.setProperty(ExecuteScript.MODULES, "target/test/resources/groovy"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_onTrigger.groovy"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/groovy"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); @@ -67,9 +67,9 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testNoIncomingFlowFile() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_onTrigger.groovy"); - runner.setProperty(ExecuteScript.MODULES, "target/test/resources/groovy"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_onTrigger.groovy"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/groovy"); runner.assertValid(); runner.run(); @@ -86,9 +86,9 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testInvalidConfiguration() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, TEST_RESOURCE_LOCATION); - runner.setProperty(ExecuteScript.SCRIPT_BODY, "body"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, TEST_RESOURCE_LOCATION); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, "body"); runner.assertNotValid(); } @@ -101,9 +101,9 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testCreateNewFlowFileWithScriptFile() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_onTrigger_newFlowFile.groovy"); - runner.setProperty(ExecuteScript.MODULES, TEST_RESOURCE_LOCATION + "groovy"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_onTrigger_newFlowFile.groovy"); + runner.setProperty(ScriptingComponentUtils.MODULES, TEST_RESOURCE_LOCATION + "groovy"); runner.assertValid(); runner.enqueue(TEST_CSV_DATA.getBytes(StandardCharsets.UTF_8)); @@ -124,8 +124,8 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testCreateNewFlowFileWithNoInputFile() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString(TEST_RESOURCE_LOCATION + "groovy/testCreateNewFlowFileWithNoInputFile.groovy") ); @@ -145,8 +145,8 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testDynamicProperties() throws Exception { runner.setValidateExpressionUsage(true); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_dynamicProperties.groovy"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, TEST_RESOURCE_LOCATION + "groovy/test_dynamicProperties.groovy"); runner.setProperty("myProp", "${myAttr}"); runner.assertValid(); @@ -169,9 +169,9 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testChangeFlowFileWithScriptFile() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, "target/test/resources/groovy/test_onTrigger_changeContent.groovy"); - runner.setProperty(ExecuteScript.MODULES, "target/test/resources/groovy"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/groovy/test_onTrigger_changeContent.groovy"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/groovy"); runner.assertValid(); runner.enqueue(TEST_CSV_DATA.getBytes(StandardCharsets.UTF_8)); @@ -193,11 +193,11 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testReadFlowFileContentAndStoreInFlowFileAttributeWithScriptBody() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "groovy/testReadFlowFileContentAndStoreInFlowFileAttributeWithScriptBody.groovy") ); - runner.setProperty(ExecuteScript.MODULES, TEST_RESOURCE_LOCATION + "groovy"); + runner.setProperty(ScriptingComponentUtils.MODULES, TEST_RESOURCE_LOCATION + "groovy"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); @@ -217,8 +217,8 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testReadFlowFileContentAndStoreInFlowFileAttributeWithScriptBodyNoModules() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "groovy/testReadFlowFileContentAndStoreInFlowFileAttributeWithScriptBodyNoModules.groovy") ); runner.assertValid(); @@ -238,8 +238,8 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test(expected = AssertionError.class) public void testScriptNoTransfer() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "groovy/testScriptNoTransfer.groovy") ); @@ -257,8 +257,8 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test public void testReadFlowFileContentAndStoreInFlowFileCustomAttribute() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "groovy/testReadFlowFileContentAndStoreInFlowFileCustomAttribute.groovy") ); runner.setProperty("testprop", "test content"); @@ -281,8 +281,8 @@ public class TestExecuteGroovy extends BaseScriptTest { @Test(expected = AssertionError.class) public void testScriptException() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, "throw new Exception()"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, "throw new Exception()"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJRuby.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJRuby.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJRuby.java index 90e8f85..64a0524 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJRuby.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJRuby.java @@ -43,9 +43,9 @@ public class TestExecuteJRuby extends BaseScriptTest { public void testReadFlowFileContentAndStoreInFlowFileAttribute() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new ExecuteScript()); runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "ruby"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, "target/test/resources/jruby/test_onTrigger.rb"); - runner.setProperty(ExecuteScript.MODULES, "target/test/resources/jruby"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "ruby"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jruby/test_onTrigger.rb"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/jruby"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJavascript.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJavascript.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJavascript.java index 3f50348..cdfdb2e 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJavascript.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJavascript.java @@ -42,9 +42,9 @@ public class TestExecuteJavascript extends BaseScriptTest { public void testReadFlowFileContentAndStoreInFlowFileAttribute() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new ExecuteScript()); runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "ECMAScript"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, "target/test/resources/javascript/test_onTrigger.js"); - runner.setProperty(ExecuteScript.MODULES, "target/test/resources/javascript"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "ECMAScript"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/javascript/test_onTrigger.js"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/javascript"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJython.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJython.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJython.java index e1938e3..412f243 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJython.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteJython.java @@ -24,7 +24,7 @@ import java.nio.charset.StandardCharsets; import java.util.List; /** - * Created by mburgess on 1/25/16. + * Unit tests for ExecuteScript with Jython. */ public class TestExecuteJython extends BaseScriptTest { @@ -41,8 +41,8 @@ public class TestExecuteJython extends BaseScriptTest { @Test public void testReadFlowFileContentAndStoreInFlowFileAttributeWithScriptBody() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "python"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, "from org.apache.nifi.processors.script import ExecuteScript\n" + "flowFile = session.get()\n" + "flowFile = session.putAttribute(flowFile, \"from-content\", \"test content\")\n" @@ -65,8 +65,8 @@ public class TestExecuteJython extends BaseScriptTest { @Test(expected = AssertionError.class) public void testScriptNoTransfer() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "python"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, "flowFile = session.putAttribute(flowFile, \"from-content\", \"test content\")\n"); runner.assertValid(); http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteLua.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteLua.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteLua.java index e0415de..65bd0dd 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteLua.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestExecuteLua.java @@ -43,9 +43,9 @@ public class TestExecuteLua extends BaseScriptTest { public void testReadFlowFileContentAndStoreInFlowFileAttribute() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new ExecuteScript()); runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "lua"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, "target/test/resources/lua/test_onTrigger.lua"); - runner.setProperty(ExecuteScript.MODULES, "target/test/resources/lua"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "lua"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/lua/test_onTrigger.lua"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/lua"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeGroovy.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeGroovy.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeGroovy.java index 5f5359d..1fb8ac5 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeGroovy.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeGroovy.java @@ -50,9 +50,9 @@ public class TestInvokeGroovy extends BaseScriptTest { @Test public void testReadFlowFileContentAndStoreInFlowFileAttribute() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/groovy/test_reader.groovy"); - runner.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/groovy"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/groovy/test_reader.groovy"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/groovy"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); @@ -77,9 +77,9 @@ public class TestInvokeGroovy extends BaseScriptTest { processor.initialize(initContext); - context.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "Groovy"); - context.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/groovy/test_reader.groovy"); - context.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/groovy"); + context.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + context.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/groovy/test_reader.groovy"); + context.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/groovy"); // State Manger is unused, and a null reference is specified processor.customValidate(new MockValidationContext(context)); processor.setup(context); @@ -111,8 +111,8 @@ public class TestInvokeGroovy extends BaseScriptTest { processor.initialize(initContext); - context.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "Groovy"); - context.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/groovy/test_reader.groovy"); + context.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + context.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/groovy/test_reader.groovy"); // State Manger is unused, and a null reference is specified processor.customValidate(new MockValidationContext(context)); processor.setup(context); @@ -140,8 +140,8 @@ public class TestInvokeGroovy extends BaseScriptTest { public void testInvokeScriptCausesException() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new InvokeScriptedProcessor()); runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "groovy/testInvokeScriptCausesException.groovy") ); runner.assertValid(); @@ -158,8 +158,8 @@ public class TestInvokeGroovy extends BaseScriptTest { @Test public void testScriptRoutesToFailure() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "Groovy"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "Groovy"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "groovy/testScriptRoutesToFailure.groovy") ); runner.assertValid(); http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJavascript.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJavascript.java b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJavascript.java index 4c39b11..5db00ff 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJavascript.java +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJavascript.java @@ -52,9 +52,9 @@ public class TestInvokeJavascript extends BaseScriptTest { @Test public void testReadFlowFileContentAndStoreInFlowFileAttribute() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "ECMAScript"); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/javascript/test_reader.js"); - runner.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/javascript"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "ECMAScript"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/javascript/test_reader.js"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/javascript"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); @@ -80,9 +80,9 @@ public class TestInvokeJavascript extends BaseScriptTest { processor.initialize(initContext); - context.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "ECMAScript"); - context.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/javascript/test_reader.js"); - context.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/javascript"); + context.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "ECMAScript"); + context.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/javascript/test_reader.js"); + context.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/javascript"); // State Manger is unused, and a null reference is specified processor.customValidate(new MockValidationContext(context)); processor.setup(context); @@ -115,9 +115,9 @@ public class TestInvokeJavascript extends BaseScriptTest { processor.initialize(initContext); - context.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "ECMAScript"); - context.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/javascript/test_reader.js"); - context.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/javascript"); + context.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "ECMAScript"); + context.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/javascript/test_reader.js"); + context.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/javascript"); // State Manger is unused, and a null reference is specified processor.customValidate(new MockValidationContext(context)); @@ -146,8 +146,8 @@ public class TestInvokeJavascript extends BaseScriptTest { public void testInvokeScriptCausesException() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new InvokeScriptedProcessor()); runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "ECMAScript"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "ECMAScript"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "javascript/testInvokeScriptCausesException.js") ); runner.assertValid(); @@ -164,8 +164,8 @@ public class TestInvokeJavascript extends BaseScriptTest { @Test public void testScriptRoutesToFailure() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "ECMAScript"); - runner.setProperty(ExecuteScript.SCRIPT_BODY, getFileContentsAsString( + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "ECMAScript"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, getFileContentsAsString( TEST_RESOURCE_LOCATION + "javascript/testScriptRoutesToFailure.js") ); runner.assertValid(); http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/java/org/apache/nifi/processors/script/TestInvokeJython.java ---------------------------------------------------------------------- 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 b45c322..5033927 100755 --- 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 @@ -52,8 +52,8 @@ public class TestInvokeJython extends BaseScriptTest { public void testAlwaysInvalid() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new InvokeScriptedProcessor()); runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "python"); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/jython/test_invalid.py"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + 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()); @@ -72,8 +72,8 @@ public class TestInvokeJython extends BaseScriptTest { public void testUpdateAttributeFromProcessorPropertyAndFlowFileAttribute() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new InvokeScriptedProcessor()); runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "python"); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/jython/test_update_attribute.py"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_update_attribute.py"); runner.setProperty("for-attributes", "value-1"); final Map<String, String> attributes = new HashMap<>(); @@ -102,9 +102,9 @@ public class TestInvokeJython extends BaseScriptTest { public void testReadFlowFileContentAndStoreInFlowFileAttribute() throws Exception { final TestRunner runner = TestRunners.newTestRunner(new InvokeScriptedProcessor()); runner.setValidateExpressionUsage(false); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "python"); - runner.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/jython/test_reader.py"); - runner.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/jython"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_reader.py"); + runner.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/jython"); runner.assertValid(); runner.enqueue("test content".getBytes(StandardCharsets.UTF_8)); @@ -124,9 +124,9 @@ public class TestInvokeJython extends BaseScriptTest { public void testCompressor() throws Exception { final TestRunner one = TestRunners.newTestRunner(new InvokeScriptedProcessor()); one.setValidateExpressionUsage(false); - one.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "python"); - one.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/jython/test_compress.py"); - one.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/jython"); + one.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + one.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_compress.py"); + one.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/jython"); one.setProperty("mode", "compress"); one.assertValid(); @@ -138,9 +138,9 @@ public class TestInvokeJython extends BaseScriptTest { final TestRunner two = TestRunners.newTestRunner(new InvokeScriptedProcessor()); two.setValidateExpressionUsage(false); - two.setProperty(InvokeScriptedProcessor.SCRIPT_ENGINE, "python"); - two.setProperty(InvokeScriptedProcessor.MODULES, "target/test/resources/jython"); - two.setProperty(InvokeScriptedProcessor.SCRIPT_FILE, "target/test/resources/jython/test_compress.py"); + two.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + two.setProperty(ScriptingComponentUtils.MODULES, "target/test/resources/jython"); + two.setProperty(ScriptingComponentUtils.SCRIPT_FILE, "target/test/resources/jython/test_compress.py"); two.setProperty("mode", "decompress"); two.assertValid(); @@ -160,9 +160,9 @@ public class TestInvokeJython extends BaseScriptTest { @Test public void testInvalidConfiguration() throws Exception { runner.setValidateExpressionUsage(false); - runner.setProperty(ExecuteScript.SCRIPT_ENGINE, "python"); - runner.setProperty(ExecuteScript.SCRIPT_FILE, TEST_RESOURCE_LOCATION); - runner.setProperty(ExecuteScript.SCRIPT_BODY, "body"); + runner.setProperty(scriptingComponent.getScriptingComponentHelper().SCRIPT_ENGINE, "python"); + runner.setProperty(ScriptingComponentUtils.SCRIPT_FILE, TEST_RESOURCE_LOCATION); + runner.setProperty(ScriptingComponentUtils.SCRIPT_BODY, "body"); runner.assertNotValid(); } http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_provenance_events.groovy ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_provenance_events.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_provenance_events.groovy new file mode 100644 index 0000000..582245e --- /dev/null +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_provenance_events.groovy @@ -0,0 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +def events = context.eventAccess.getProvenanceEvents(1,5) +events.eachWithIndex { event, i -> + log.info("Event[$i] ID = ${event.eventId}") +} +x = events.size() +e = events[0] + + http://git-wip-us.apache.org/repos/asf/nifi/blob/675f4f54/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_vm_stats.groovy ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_vm_stats.groovy b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_vm_stats.groovy new file mode 100644 index 0000000..3f0d91e --- /dev/null +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/test/resources/groovy/test_log_vm_stats.groovy @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +x = [ + 'uptime' : vmMetrics.uptime(), + 'heapUsed' : vmMetrics.heapUsed(), + 'heapUsage' : vmMetrics.heapUsage(), + 'nonHeapUsage' : vmMetrics.nonHeapUsage(), + 'threadCount' : vmMetrics.threadCount(), + 'daemonThreadCount' : vmMetrics.daemonThreadCount(), + 'fileDescriptorUsage': vmMetrics.fileDescriptorUsage() +] + +
