http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java index 9e970f1..2e87441 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMonitorActivity.java @@ -31,8 +31,7 @@ public class TestMonitorActivity { @Test public void testFirstMessage() throws InterruptedException, IOException { - final TestRunner runner = TestRunners. - newTestRunner(new MonitorActivity()); + final TestRunner runner = TestRunners.newTestRunner(new MonitorActivity()); runner.setProperty(MonitorActivity.CONTINUALLY_SEND_MESSAGES, "false"); runner.setProperty(MonitorActivity.THRESHOLD, "100 millis"); @@ -66,12 +65,9 @@ public class TestMonitorActivity { runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1); runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1); - MockFlowFile restoredFlowFile = runner. - getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED). - get(0); + MockFlowFile restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0); String flowFileContent = new String(restoredFlowFile.toByteArray()); - Assert.assertTrue(Pattern. - matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); + Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); restoredFlowFile.assertAttributeNotExists("key"); restoredFlowFile.assertAttributeNotExists("key1"); @@ -96,20 +92,16 @@ public class TestMonitorActivity { runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1); runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1); - restoredFlowFile = runner. - getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED). - get(0); + restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0); flowFileContent = new String(restoredFlowFile.toByteArray()); - Assert.assertTrue(Pattern. - matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); + Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); restoredFlowFile.assertAttributeNotExists("key"); restoredFlowFile.assertAttributeNotExists("key1"); } @Test public void testFirstMessageWithInherit() throws InterruptedException, IOException { - final TestRunner runner = TestRunners. - newTestRunner(new MonitorActivity()); + final TestRunner runner = TestRunners.newTestRunner(new MonitorActivity()); runner.setProperty(MonitorActivity.CONTINUALLY_SEND_MESSAGES, "false"); runner.setProperty(MonitorActivity.THRESHOLD, "100 millis"); runner.setProperty(MonitorActivity.COPY_ATTRIBUTES, "true"); @@ -117,9 +109,7 @@ public class TestMonitorActivity { runner.enqueue(new byte[0]); runner.run(); runner.assertAllFlowFilesTransferred(MonitorActivity.REL_SUCCESS, 1); - MockFlowFile originalFlowFile = runner. - getFlowFilesForRelationship(MonitorActivity.REL_SUCCESS). - get(0); + MockFlowFile originalFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_SUCCESS).get(0); runner.clearTransferState(); Thread.sleep(1000L); @@ -147,33 +137,21 @@ public class TestMonitorActivity { runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1); runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1); - MockFlowFile restoredFlowFile = runner. - getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED). - get(0); + MockFlowFile restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0); String flowFileContent = new String(restoredFlowFile.toByteArray()); - Assert.assertTrue(Pattern. - matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); + Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); restoredFlowFile.assertAttributeEquals("key", "value"); restoredFlowFile.assertAttributeEquals("key1", "value1"); // verify the UUIDs are not the same - restoredFlowFile. - assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile. - getAttribute(CoreAttributes.UUID.key())); - restoredFlowFile. - assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile. - getAttribute(CoreAttributes.FILENAME.key())); + restoredFlowFile.assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile.getAttribute(CoreAttributes.UUID.key())); + restoredFlowFile.assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile.getAttribute(CoreAttributes.FILENAME.key())); Assert.assertTrue( - String. - format("file sizes match when they shouldn't original=%1$s restored=%2$s", - originalFlowFile.getSize(), restoredFlowFile.getSize()), - restoredFlowFile.getSize() != originalFlowFile.getSize()); - Assert.assertTrue(String. - format("lineage start dates match when they shouldn't original=%1$s restored=%2$s", - originalFlowFile.getLineageStartDate(), restoredFlowFile. - getLineageStartDate()), - restoredFlowFile.getLineageStartDate() != originalFlowFile. - getLineageStartDate()); + String.format("file sizes match when they shouldn't original=%1$s restored=%2$s", + originalFlowFile.getSize(), restoredFlowFile.getSize()), restoredFlowFile.getSize() != originalFlowFile.getSize()); + Assert.assertTrue( + String.format("lineage start dates match when they shouldn't original=%1$s restored=%2$s", + originalFlowFile.getLineageStartDate(), restoredFlowFile.getLineageStartDate()), restoredFlowFile.getLineageStartDate() != originalFlowFile.getLineageStartDate()); runner.clearTransferState(); runner.setProperty(MonitorActivity.CONTINUALLY_SEND_MESSAGES, "true"); @@ -196,30 +174,18 @@ public class TestMonitorActivity { runner.assertTransferCount(MonitorActivity.REL_ACTIVITY_RESTORED, 1); runner.assertTransferCount(MonitorActivity.REL_SUCCESS, 1); - restoredFlowFile = runner. - getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED). - get(0); + restoredFlowFile = runner.getFlowFilesForRelationship(MonitorActivity.REL_ACTIVITY_RESTORED).get(0); flowFileContent = new String(restoredFlowFile.toByteArray()); - Assert.assertTrue(Pattern. - matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); + Assert.assertTrue(Pattern.matches("Activity restored at time: (.*) after being inactive for 0 minutes", flowFileContent)); restoredFlowFile.assertAttributeEquals("key", "value"); restoredFlowFile.assertAttributeEquals("key1", "value1"); - restoredFlowFile. - assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile. - getAttribute(CoreAttributes.UUID.key())); - restoredFlowFile. - assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile. - getAttribute(CoreAttributes.FILENAME.key())); + restoredFlowFile.assertAttributeNotEquals(CoreAttributes.UUID.key(), originalFlowFile.getAttribute(CoreAttributes.UUID.key())); + restoredFlowFile.assertAttributeNotEquals(CoreAttributes.FILENAME.key(), originalFlowFile.getAttribute(CoreAttributes.FILENAME.key())); + Assert.assertTrue( + String.format("file sizes match when they shouldn't original=%1$s restored=%2$s", + originalFlowFile.getSize(), restoredFlowFile.getSize()), restoredFlowFile.getSize() != originalFlowFile.getSize()); Assert.assertTrue( - String. - format("file sizes match when they shouldn't original=%1$s restored=%2$s", - originalFlowFile.getSize(), restoredFlowFile.getSize()), - restoredFlowFile.getSize() != originalFlowFile.getSize()); - Assert.assertTrue(String. - format("lineage start dates match when they shouldn't original=%1$s restored=%2$s", - originalFlowFile.getLineageStartDate(), restoredFlowFile. - getLineageStartDate()), - restoredFlowFile.getLineageStartDate() != originalFlowFile. - getLineageStartDate()); + String.format("lineage start dates match when they shouldn't original=%1$s restored=%2$s", + originalFlowFile.getLineageStartDate(), restoredFlowFile.getLineageStartDate()), restoredFlowFile.getLineageStartDate() != originalFlowFile.getLineageStartDate()); } }
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java index f4c4367..bd35868 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPostHTTP.java @@ -65,21 +65,16 @@ public class TestPostHTTP { public void testTruststoreSSLOnly() throws Exception { final Map<String, String> sslProps = new HashMap<>(); sslProps.put(TestServer.NEED_CLIENT_AUTH, "false"); - sslProps. - put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); - sslProps. - put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); + sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); + sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS"); setup(sslProps); final SSLContextService sslContextService = new StandardSSLContextService(); runner.addControllerService("ssl-context", sslContextService); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); runner.enableControllerService(sslContextService); runner.setProperty(PostHTTP.URL, server.getSecureUrl()); @@ -94,33 +89,23 @@ public class TestPostHTTP { @Test public void testTwoWaySSL() throws Exception { final Map<String, String> sslProps = new HashMap<>(); - sslProps. - put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); - sslProps. - put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); + sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); + sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS"); - sslProps. - put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks"); - sslProps. - put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest"); + sslProps.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks"); + sslProps.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest"); sslProps.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS"); sslProps.put(TestServer.NEED_CLIENT_AUTH, "true"); setup(sslProps); final SSLContextService sslContextService = new StandardSSLContextService(); runner.addControllerService("ssl-context", sslContextService); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); - runner. - setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks"); - runner. - setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest"); - runner. - setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); + runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks"); + runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest"); + runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS"); runner.enableControllerService(sslContextService); runner.setProperty(PostHTTP.URL, server.getSecureUrl()); @@ -135,27 +120,20 @@ public class TestPostHTTP { @Test public void testOneWaySSLWhenServerConfiguredForTwoWay() throws Exception { final Map<String, String> sslProps = new HashMap<>(); - sslProps. - put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); - sslProps. - put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); + sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); + sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS"); - sslProps. - put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks"); - sslProps. - put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest"); + sslProps.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks"); + sslProps.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest"); sslProps.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS"); sslProps.put(TestServer.NEED_CLIENT_AUTH, "true"); setup(sslProps); final SSLContextService sslContextService = new StandardSSLContextService(); runner.addControllerService("ssl-context", sslContextService); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); runner.enableControllerService(sslContextService); runner.setProperty(PostHTTP.URL, server.getSecureUrl()); @@ -191,8 +169,7 @@ public class TestPostHTTP { FlowFileUnpackagerV3 unpacker = new FlowFileUnpackagerV3(); // unpack first flowfile received - Map<String, String> receivedAttrs = unpacker. - unpackageFlowFile(bais, baos); + Map<String, String> receivedAttrs = unpacker.unpackageFlowFile(bais, baos); byte[] contentReceived = baos.toByteArray(); assertEquals("Hello", new String(contentReceived)); assertEquals("cba", receivedAttrs.get("abc")); @@ -211,33 +188,23 @@ public class TestPostHTTP { @Test public void testSendAsFlowFileSecure() throws Exception { final Map<String, String> sslProps = new HashMap<>(); - sslProps. - put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); - sslProps. - put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); + sslProps.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks"); + sslProps.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest"); sslProps.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS"); - sslProps. - put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks"); - sslProps. - put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest"); + sslProps.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks"); + sslProps.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest"); sslProps.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS"); sslProps.put(TestServer.NEED_CLIENT_AUTH, "true"); setup(sslProps); final SSLContextService sslContextService = new StandardSSLContextService(); runner.addControllerService("ssl-context", sslContextService); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); - runner. - setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); - runner. - setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks"); - runner. - setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest"); - runner. - setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest"); + runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS"); + runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks"); + runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest"); + runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS"); runner.enableControllerService(sslContextService); runner.setProperty(PostHTTP.URL, server.getSecureUrl()); @@ -262,8 +229,7 @@ public class TestPostHTTP { FlowFileUnpackagerV3 unpacker = new FlowFileUnpackagerV3(); // unpack first flowfile received - Map<String, String> receivedAttrs = unpacker. - unpackageFlowFile(bais, baos); + Map<String, String> receivedAttrs = unpacker.unpackageFlowFile(bais, baos); byte[] contentReceived = baos.toByteArray(); assertEquals("Hello", new String(contentReceived)); assertEquals("cba", receivedAttrs.get("abc")); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java index 313790e..af04cbc 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutEmail.java @@ -53,28 +53,21 @@ public class TestPutEmail { final TestRunner runner = TestRunners.newTestRunner(new PutEmail()); runner.setProperty(PutEmail.HEADER_XMAILER, "TestingNiFi"); runner.setProperty(PutEmail.SMTP_HOSTNAME, "smtp-host"); - runner. - setProperty(PutEmail.SMTP_SOCKET_FACTORY, "${dynamicSocketFactory}"); + runner.setProperty(PutEmail.SMTP_SOCKET_FACTORY, "${dynamicSocketFactory}"); runner.setProperty(PutEmail.HEADER_XMAILER, "TestingNiFi"); runner.setProperty(PutEmail.FROM, "[email protected]"); runner.setProperty(PutEmail.MESSAGE, "Message Body"); runner.setProperty(PutEmail.TO, "[email protected]"); - ProcessSession session = runner.getProcessSessionFactory(). - createSession(); + ProcessSession session = runner.getProcessSessionFactory().createSession(); FlowFile ff = session.create(); - ff = session. - putAttribute(ff, "dynamicSocketFactory", "testingSocketFactory"); + ff = session.putAttribute(ff, "dynamicSocketFactory", "testingSocketFactory"); ProcessContext context = runner.getProcessContext(); - String xmailer = context.getProperty(PutEmail.HEADER_XMAILER). - evaluateAttributeExpressions(ff). - getValue(); + String xmailer = context.getProperty(PutEmail.HEADER_XMAILER).evaluateAttributeExpressions(ff).getValue(); assertEquals("X-Mailer Header", "TestingNiFi", xmailer); - String socketFactory = context.getProperty(PutEmail.SMTP_SOCKET_FACTORY). - evaluateAttributeExpressions(ff). - getValue(); + String socketFactory = context.getProperty(PutEmail.SMTP_SOCKET_FACTORY).evaluateAttributeExpressions(ff).getValue(); assertEquals("Socket Factory", "testingSocketFactory", socketFactory); final Map<String, String> attributes = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java index 4722a84..e340468 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceText.java @@ -42,9 +42,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Hlleo, World!".getBytes("UTF-8")); } @@ -59,9 +57,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("H[ell]o, World!"); } @@ -78,9 +74,7 @@ public class TestReplaceText { runner.enqueue(Paths.get("src/test/resources/hello.txt"), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); final String actual = new String(out.toByteArray(), StandardCharsets.UTF_8); System.out.println(actual); Assert.assertEquals(expected, actual); @@ -98,9 +92,7 @@ public class TestReplaceText { runner.enqueue(Paths.get("src/test/resources/hello.txt"), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); final String actual = new String(out.toByteArray(), StandardCharsets.UTF_8); Assert.assertEquals("Hell123o, World!", actual); } @@ -119,9 +111,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Hello, World!"); } @@ -139,9 +129,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("H[$1]o, World!"); } @@ -160,9 +148,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Good-bye, World!"); } @@ -181,9 +167,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Hello, World!"); } @@ -202,9 +186,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Hell$2o, World!"); } @@ -223,9 +205,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("H$do, World!"); } @@ -244,9 +224,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("H$1o, World!"); } @@ -261,9 +239,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Ho, World!"); } @@ -278,9 +254,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Hello, World!"); } @@ -295,9 +269,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("HeRRo, WorRd!"); } @@ -315,9 +287,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Good"); } @@ -353,9 +323,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("Good"); } @@ -364,8 +332,7 @@ public class TestReplaceText { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); runner.setProperty(ReplaceText.REGEX, ".*"); - runner. - setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n"); + runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n"); final Map<String, String> attributes = new HashMap<>(); attributes.put("filename", "abc.txt"); @@ -374,9 +341,7 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8); Assert.assertTrue(outContent.startsWith("abc.txt\t")); System.out.println(outContent); @@ -388,8 +353,7 @@ public class TestReplaceText { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); runner.setProperty(ReplaceText.REGEX, "(?s)(^.*)"); - runner. - setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter"); + runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter"); final Map<String, String> attributes = new HashMap<>(); attributes.put("filename", "abc.txt"); @@ -398,12 +362,9 @@ public class TestReplaceText { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8); - Assert.assertTrue(outContent. - equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\nWorld!\n\nfooter")); + Assert.assertTrue(outContent.equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\nWorld!\n\nfooter")); System.out.println(outContent); } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d29a2d68/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java index 9c19369..005c05a 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestReplaceTextLineByLine.java @@ -16,7 +16,6 @@ */ package org.apache.nifi.processors.standard; -import org.apache.nifi.processors.standard.ReplaceText; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -40,300 +39,236 @@ public class TestReplaceTextLineByLine { public void testSimple() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "odo"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "ood"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/food.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/food.txt"))); } @Test public void testBackReference() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "(DODO)"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "[$1]"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/[DODO].txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/[DODO].txt"))); } @Test public void testReplacementWithExpressionLanguageIsEscaped() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "(jo)"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "[${abc}]"); final Map<String, String> attributes = new HashMap<>(); attributes.put("abc", "$1"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu[$1]_Po[$1].txt"))); } @Test public void testRegexWithExpressionLanguage() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "${replaceKey}"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${replaceValue}"); final Map<String, String> attributes = new HashMap<>(); attributes.put("replaceKey", "Riley"); attributes.put("replaceValue", "Spider"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Spider.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Spider.txt"))); } @Test public void testRegexWithExpressionLanguageIsEscaped() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "${replaceKey}"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${replaceValue}"); final Map<String, String> attributes = new HashMap<>(); attributes.put("replaceKey", "R.*y"); attributes.put("replaceValue", "Spider"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); } @Test public void testBackReferenceWithTooLargeOfIndexIsEscaped() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "(lu)"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "$1$2"); final Map<String, String> attributes = new HashMap<>(); attributes.put("replaceKey", "R.*y"); attributes.put("replaceValue", "Spiderman"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Blu$2e_clu$2e.txt"))); } @Test public void testBackReferenceWithInvalidReferenceIsEscaped() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "(ew)"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "$d"); final Map<String, String> attributes = new HashMap<>(); attributes.put("replaceKey", "H.*o"); attributes.put("replaceValue", "Good-bye"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/D$d_h$d.txt"))); } @Test public void testEscapingDollarSign() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "(DO)"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "\\$1"); final Map<String, String> attributes = new HashMap<>(); attributes.put("replaceKey", "H.*o"); attributes.put("replaceValue", "Good-bye"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/$1$1.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/$1$1.txt"))); } @Test public void testReplaceWithEmptyString() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "(jo)"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, ""); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu_Po.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/cu_Po.txt"))); } @Test public void testWithNoMatch() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "Z"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "Morning"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); } @Test public void testWithMultipleMatches() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "l"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "R"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt"))); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/BRue_cRue_RiRey.txt"))); } @Test public void testAttributeToContent() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, ".*"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${abc}"); final Map<String, String> attributes = new HashMap<>(); attributes.put("abc", "Good"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); - out. - assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Good.txt"))); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); + out.assertContentEquals(translateNewLines(new File("src/test/resources/TestReplaceTextLineByLine/Good.txt"))); } @Test public void testAttributeToContentWindows() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, ".*"); runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${abc}"); final Map<String, String> attributes = new HashMap<>(); attributes.put("abc", "Good"); - runner. - enqueue("<<<HEADER>>>\r\n<<BODY>>\r\n<<<FOOTER>>>\r".getBytes(), attributes); + runner.enqueue("<<<HEADER>>>\r\n<<BODY>>\r\n<<<FOOTER>>>\r".getBytes(), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); out.assertContentEquals("GoodGoodGood"); } @@ -341,39 +276,31 @@ public class TestReplaceTextLineByLine { public void testProblematicCase1() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, ".*"); - runner. - setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n"); + runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "${filename}\t${now():format(\"yyyy/MM/dd'T'HHmmss'Z'\")}\t${fileSize}\n"); final Map<String, String> attributes = new HashMap<>(); attributes.put("filename", "abc.txt"); - runner.enqueue(translateNewLines(Paths. - get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); + runner.enqueue(translateNewLines(Paths.get("src/test/resources/TestReplaceTextLineByLine/testFile.txt")), attributes); runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); final String outContent = translateNewLines(new String(out.toByteArray(), StandardCharsets.UTF_8)); Assert.assertTrue(outContent.startsWith("abc.txt\t")); System.out.println(outContent); - Assert.assertTrue(outContent.endsWith("193\n") || outContent. - endsWith("203\r\n")); + Assert.assertTrue(outContent.endsWith("193\n") || outContent.endsWith("203\r\n")); } @Test public void testGetExistingContent() throws IOException { final TestRunner runner = TestRunners.newTestRunner(new ReplaceText()); runner.setValidateExpressionUsage(false); - runner. - setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); + runner.setProperty(ReplaceText.EVALUATION_MODE, ReplaceText.LINE_BY_LINE); runner.setProperty(ReplaceText.REGEX, "(?s)(^.*)"); - runner. - setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter\n"); + runner.setProperty(ReplaceText.REPLACEMENT_VALUE, "attribute header\n\n${filename}\n\ndata header\n\n$1\n\nfooter\n"); final Map<String, String> attributes = new HashMap<>(); attributes.put("filename", "abc.txt"); @@ -382,14 +309,11 @@ public class TestReplaceTextLineByLine { runner.run(); runner.assertAllFlowFilesTransferred(ReplaceText.REL_SUCCESS, 1); - final MockFlowFile out = runner. - getFlowFilesForRelationship(ReplaceText.REL_SUCCESS). - get(0); + final MockFlowFile out = runner.getFlowFilesForRelationship(ReplaceText.REL_SUCCESS).get(0); final String outContent = new String(out.toByteArray(), StandardCharsets.UTF_8); System.out.println(outContent); - Assert.assertTrue(outContent. - equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\n\n\nfooter\n" - + "attribute header\n\nabc.txt\n\ndata header\n\nWorld!\n\nfooter\n")); + Assert.assertTrue(outContent.equals("attribute header\n\nabc.txt\n\ndata header\n\nHello\n\n\nfooter\n" + + "attribute header\n\nabc.txt\n\ndata header\n\nWorld!\n\nfooter\n")); } @@ -400,15 +324,13 @@ public class TestReplaceTextLineByLine { private byte[] translateNewLines(final Path path) throws IOException { final byte[] data = Files.readAllBytes(path); final String text = new String(data, StandardCharsets.UTF_8); - return translateNewLines(text). - getBytes(StandardCharsets.UTF_8); + return translateNewLines(text).getBytes(StandardCharsets.UTF_8); } private String translateNewLines(final String text) { final String lineSeparator = System.getProperty("line.separator"); final Pattern pattern = Pattern.compile("\n", Pattern.MULTILINE); - final String translated = pattern.matcher(text). - replaceAll(lineSeparator); + final String translated = pattern.matcher(text).replaceAll(lineSeparator); return translated; } }
