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/TestCompressContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java index f5fea2c..699db39 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestCompressContent.java @@ -30,133 +30,100 @@ public class TestCompressContent { @Test public void testBzip2DecompressConcatenated() throws Exception { - final TestRunner runner = TestRunners. - newTestRunner(CompressContent.class); + final TestRunner runner = TestRunners.newTestRunner(CompressContent.class); runner.setProperty(CompressContent.MODE, "decompress"); runner.setProperty(CompressContent.COMPRESSION_FORMAT, "bzip2"); runner.setProperty(CompressContent.UPDATE_FILENAME, "false"); - runner.enqueue(Paths. - get("src/test/resources/CompressedData/SampleFileConcat.txt.bz2")); + runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFileConcat.txt.bz2")); runner.run(); runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1); - MockFlowFile flowFile = runner. - getFlowFilesForRelationship(CompressContent.REL_SUCCESS). - get(0); - flowFile.assertContentEquals(Paths. - get("src/test/resources/CompressedData/SampleFileConcat.txt")); + MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0); + flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFileConcat.txt")); flowFile.assertAttributeEquals("filename", "SampleFileConcat.txt.bz2"); // not updating filename } @Test public void testBzip2Decompress() throws Exception { - final TestRunner runner = TestRunners. - newTestRunner(CompressContent.class); + final TestRunner runner = TestRunners.newTestRunner(CompressContent.class); runner.setProperty(CompressContent.MODE, "decompress"); runner.setProperty(CompressContent.COMPRESSION_FORMAT, "bzip2"); runner.setProperty(CompressContent.UPDATE_FILENAME, "true"); - runner.enqueue(Paths. - get("src/test/resources/CompressedData/SampleFile.txt.bz2")); + runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile.txt.bz2")); runner.run(); runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1); - MockFlowFile flowFile = runner. - getFlowFilesForRelationship(CompressContent.REL_SUCCESS). - get(0); - flowFile.assertContentEquals(Paths. - get("src/test/resources/CompressedData/SampleFile.txt")); + MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0); + flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt")); flowFile.assertAttributeEquals("filename", "SampleFile.txt"); runner.clearTransferState(); - runner.enqueue(Paths. - get("src/test/resources/CompressedData/SampleFile1.txt.bz2")); + runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile1.txt.bz2")); runner.run(); runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1); - flowFile = runner. - getFlowFilesForRelationship(CompressContent.REL_SUCCESS). - get(0); - flowFile.assertContentEquals(Paths. - get("src/test/resources/CompressedData/SampleFile.txt")); + flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0); + flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt")); flowFile.assertAttributeEquals("filename", "SampleFile1.txt"); } @Test public void testGzipDecompress() throws Exception { - final TestRunner runner = TestRunners. - newTestRunner(CompressContent.class); + final TestRunner runner = TestRunners.newTestRunner(CompressContent.class); runner.setProperty(CompressContent.MODE, "decompress"); runner.setProperty(CompressContent.COMPRESSION_FORMAT, "gzip"); - assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true"). - isValid()); + assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").isValid()); - runner.enqueue(Paths. - get("src/test/resources/CompressedData/SampleFile.txt.gz")); + runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile.txt.gz")); runner.run(); runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1); - MockFlowFile flowFile = runner. - getFlowFilesForRelationship(CompressContent.REL_SUCCESS). - get(0); - flowFile.assertContentEquals(Paths. - get("src/test/resources/CompressedData/SampleFile.txt")); + MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0); + flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt")); flowFile.assertAttributeEquals("filename", "SampleFile.txt"); runner.clearTransferState(); - runner.enqueue(Paths. - get("src/test/resources/CompressedData/SampleFile1.txt.gz")); + runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile1.txt.gz")); runner.run(); runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1); - flowFile = runner. - getFlowFilesForRelationship(CompressContent.REL_SUCCESS). - get(0); - flowFile.assertContentEquals(Paths. - get("src/test/resources/CompressedData/SampleFile.txt")); + flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0); + flowFile.assertContentEquals(Paths.get("src/test/resources/CompressedData/SampleFile.txt")); flowFile.assertAttributeEquals("filename", "SampleFile1.txt"); } @Test public void testFilenameUpdatedOnCompress() throws IOException { - final TestRunner runner = TestRunners. - newTestRunner(CompressContent.class); + final TestRunner runner = TestRunners.newTestRunner(CompressContent.class); runner.setProperty(CompressContent.MODE, "compress"); runner.setProperty(CompressContent.COMPRESSION_FORMAT, "gzip"); - assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true"). - isValid()); + assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").isValid()); - runner.enqueue(Paths. - get("src/test/resources/CompressedData/SampleFile.txt")); + runner.enqueue(Paths.get("src/test/resources/CompressedData/SampleFile.txt")); runner.run(); runner.assertAllFlowFilesTransferred(CompressContent.REL_SUCCESS, 1); - MockFlowFile flowFile = runner. - getFlowFilesForRelationship(CompressContent.REL_SUCCESS). - get(0); + MockFlowFile flowFile = runner.getFlowFilesForRelationship(CompressContent.REL_SUCCESS).get(0); flowFile.assertAttributeEquals("filename", "SampleFile.txt.gz"); } @Test public void testDecompressFailure() throws IOException { - final TestRunner runner = TestRunners. - newTestRunner(CompressContent.class); + final TestRunner runner = TestRunners.newTestRunner(CompressContent.class); runner.setProperty(CompressContent.MODE, "decompress"); runner.setProperty(CompressContent.COMPRESSION_FORMAT, "gzip"); byte[] data = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; runner.enqueue(data); - assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true"). - isValid()); + assertTrue(runner.setProperty(CompressContent.UPDATE_FILENAME, "true").isValid()); runner.run(); runner.assertQueueEmpty(); runner.assertAllFlowFilesTransferred(CompressContent.REL_FAILURE, 1); - runner.getFlowFilesForRelationship(CompressContent.REL_FAILURE). - get(0). - assertContentEquals(data); + runner.getFlowFilesForRelationship(CompressContent.REL_FAILURE).get(0).assertContentEquals(data); } }
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/TestControlRate.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java index dcec7b3..7729056 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestControlRate.java @@ -29,8 +29,7 @@ public class TestControlRate { @Test public void testViaAttribute() throws InterruptedException { final TestRunner runner = TestRunners.newTestRunner(new ControlRate()); - runner. - setProperty(ControlRate.RATE_CONTROL_CRITERIA, ControlRate.ATTRIBUTE_RATE); + runner.setProperty(ControlRate.RATE_CONTROL_CRITERIA, ControlRate.ATTRIBUTE_RATE); runner.setProperty(ControlRate.RATE_CONTROL_ATTRIBUTE_NAME, "count"); runner.setProperty(ControlRate.MAX_RATE, "20000"); runner.setProperty(ControlRate.TIME_PERIOD, "1 sec"); 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/TestConvertCharacterSet.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java index f303019..1b057d9 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestConvertCharacterSet.java @@ -29,21 +29,16 @@ public class TestConvertCharacterSet { @Test public void test() throws IOException { - final TestRunner runner = TestRunners. - newTestRunner(new ConvertCharacterSet()); + final TestRunner runner = TestRunners.newTestRunner(new ConvertCharacterSet()); runner.setProperty(ConvertCharacterSet.INPUT_CHARSET, "ASCII"); runner.setProperty(ConvertCharacterSet.OUTPUT_CHARSET, "UTF-32"); - runner.enqueue(Paths. - get("src/test/resources/CharacterSetConversionSamples/Original.txt")); + runner.enqueue(Paths.get("src/test/resources/CharacterSetConversionSamples/Original.txt")); runner.run(); runner.assertAllFlowFilesTransferred(ConvertCharacterSet.REL_SUCCESS, 1); - final MockFlowFile output = runner. - getFlowFilesForRelationship(ConvertCharacterSet.REL_SUCCESS). - get(0); - output. - assertContentEquals(new File("src/test/resources/CharacterSetConversionSamples/Converted2.txt")); + final MockFlowFile output = runner.getFlowFilesForRelationship(ConvertCharacterSet.REL_SUCCESS).get(0); + output.assertContentEquals(new File("src/test/resources/CharacterSetConversionSamples/Converted2.txt")); } } 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/TestDetectDuplicate.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java index ef69a00..e8434f0 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDetectDuplicate.java @@ -50,10 +50,8 @@ public class TestDetectDuplicate { System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info"); System.setProperty("org.slf4j.simpleLogger.showDateTime", "true"); System.setProperty("org.slf4j.simpleLogger.log.nifi.io.nio", "debug"); - System. - setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.DetectDuplicate", "debug"); - System. - setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestDetectDuplicate", "debug"); + System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.DetectDuplicate", "debug"); + System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard.TestDetectDuplicate", "debug"); LOGGER = LoggerFactory.getLogger(TestListenUDP.class); } @@ -62,12 +60,10 @@ public class TestDetectDuplicate { TestRunner runner = TestRunners.newTestRunner(DetectDuplicate.class); final DistributedMapCacheClientImpl client = createClient(); final Map<String, String> clientProperties = new HashMap<>(); - clientProperties. - put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost"); + clientProperties.put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost"); runner.addControllerService("client", client, clientProperties); runner.setProperty(DetectDuplicate.DISTRIBUTED_CACHE_SERVICE, "client"); - runner. - setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file"); + runner.setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file"); runner.setProperty(DetectDuplicate.AGE_OFF_DURATION, "48 hours"); Map<String, String> props = new HashMap<>(); props.put("hash.value", "1000"); @@ -75,8 +71,7 @@ public class TestDetectDuplicate { runner.enableControllerService(client); runner.run(); - runner. - assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1); + runner.assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1); runner.clearTransferState(); client.exists = true; runner.enqueue(new byte[]{}, props); @@ -92,12 +87,10 @@ public class TestDetectDuplicate { TestRunner runner = TestRunners.newTestRunner(DetectDuplicate.class); final DistributedMapCacheClientImpl client = createClient(); final Map<String, String> clientProperties = new HashMap<>(); - clientProperties. - put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost"); + clientProperties.put(DistributedMapCacheClientService.HOSTNAME.getName(), "localhost"); runner.addControllerService("client", client, clientProperties); runner.setProperty(DetectDuplicate.DISTRIBUTED_CACHE_SERVICE, "client"); - runner. - setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file"); + runner.setProperty(DetectDuplicate.FLOWFILE_DESCRIPTION, "The original flow file"); runner.setProperty(DetectDuplicate.AGE_OFF_DURATION, "2 secs"); runner.enableControllerService(client); @@ -106,15 +99,13 @@ public class TestDetectDuplicate { runner.enqueue(new byte[]{}, props); runner.run(); - runner. - assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1); + runner.assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1); runner.clearTransferState(); client.exists = true; Thread.sleep(3000); runner.enqueue(new byte[]{}, props); runner.run(); - runner. - assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1); + runner.assertAllFlowFilesTransferred(DetectDuplicate.REL_NON_DUPLICATE, 1); runner.assertTransferCount(DetectDuplicate.REL_DUPLICATE, 0); runner.assertTransferCount(DetectDuplicate.REL_FAILURE, 0); } @@ -163,8 +154,7 @@ public class TestDetectDuplicate { } @Override - public <K, V> V getAndPutIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer, - Deserializer<V> valueDeserializer) throws IOException { + public <K, V> V getAndPutIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer, Deserializer<V> valueDeserializer) throws IOException { if (exists) { return (V) cacheValue; } @@ -212,8 +202,7 @@ public class TestDetectDuplicate { } if (child.exists()) { - throw new IOException("Could not delete " + dataFile. - getAbsolutePath()); + throw new IOException("Could not delete " + dataFile.getAbsolutePath()); } } } 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/TestDistributeLoad.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java index dfe52bf..ac2efec 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDistributeLoad.java @@ -16,7 +16,6 @@ */ package org.apache.nifi.processors.standard; -import org.apache.nifi.processors.standard.DistributeLoad; import org.apache.nifi.util.TestRunner; import org.apache.nifi.util.TestRunners; @@ -36,8 +35,7 @@ public class TestDistributeLoad { @Test public void testDefaultRoundRobin() { - final TestRunner testRunner = TestRunners. - newTestRunner(new DistributeLoad()); + final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad()); testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS, "100"); for (int i = 0; i < 101; i++) { @@ -53,8 +51,7 @@ public class TestDistributeLoad { @Test public void testWeightedRoundRobin() { - final TestRunner testRunner = TestRunners. - newTestRunner(new DistributeLoad()); + final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad()); testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS, "100"); testRunner.setProperty("1", "5"); @@ -74,8 +71,7 @@ public class TestDistributeLoad { @Test public void testValidationOnAddedProperties() { - final TestRunner testRunner = TestRunners. - newTestRunner(new DistributeLoad()); + final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad()); testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS, "100"); testRunner.setProperty("1", "5"); @@ -121,13 +117,10 @@ public class TestDistributeLoad { @Test public void testNextAvailable() { - final TestRunner testRunner = TestRunners. - newTestRunner(new DistributeLoad()); + final TestRunner testRunner = TestRunners.newTestRunner(new DistributeLoad()); - testRunner. - setProperty(DistributeLoad.NUM_RELATIONSHIPS.getName(), "100"); - testRunner. - setProperty(DistributeLoad.DISTRIBUTION_STRATEGY.getName(), DistributeLoad.STRATEGY_NEXT_AVAILABLE); + testRunner.setProperty(DistributeLoad.NUM_RELATIONSHIPS.getName(), "100"); + testRunner.setProperty(DistributeLoad.DISTRIBUTION_STRATEGY.getName(), DistributeLoad.STRATEGY_NEXT_AVAILABLE); for (int i = 0; i < 99; i++) { testRunner.enqueue(new byte[0]); 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/TestEncodeContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java index 5f6437a..fec411d 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncodeContent.java @@ -30,12 +30,10 @@ public class TestEncodeContent { @Test public void testBase64RoundTrip() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncodeContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent()); testRunner.setProperty(EncodeContent.MODE, EncodeContent.ENCODE_MODE); - testRunner. - setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING); + testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING); testRunner.enqueue(Paths.get("src/test/resources/hello.txt")); testRunner.clearTransferState(); @@ -43,9 +41,7 @@ public class TestEncodeContent { testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1); - MockFlowFile flowFile = testRunner. - getFlowFilesForRelationship(EncodeContent.REL_SUCCESS). - get(0); + MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0); testRunner.assertQueueEmpty(); testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE); @@ -54,20 +50,16 @@ public class TestEncodeContent { testRunner.run(); testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1); - flowFile = testRunner. - getFlowFilesForRelationship(EncodeContent.REL_SUCCESS). - get(0); + flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0); flowFile.assertContentEquals(new File("src/test/resources/hello.txt")); } @Test public void testFailDecodeNotBase64() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncodeContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent()); testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE); - testRunner. - setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING); + testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING); testRunner.enqueue(Paths.get("src/test/resources/hello.txt")); testRunner.clearTransferState(); @@ -78,12 +70,10 @@ public class TestEncodeContent { @Test public void testFailDecodeNotBase64ButIsAMultipleOfFourBytes() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncodeContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent()); testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE); - testRunner. - setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING); + testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE64_ENCODING); testRunner.enqueue("four@@@@multiple".getBytes()); testRunner.clearTransferState(); @@ -94,12 +84,10 @@ public class TestEncodeContent { @Test public void testBase32RoundTrip() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncodeContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent()); testRunner.setProperty(EncodeContent.MODE, EncodeContent.ENCODE_MODE); - testRunner. - setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING); + testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING); testRunner.enqueue(Paths.get("src/test/resources/hello.txt")); testRunner.clearTransferState(); @@ -107,9 +95,7 @@ public class TestEncodeContent { testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1); - MockFlowFile flowFile = testRunner. - getFlowFilesForRelationship(EncodeContent.REL_SUCCESS). - get(0); + MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0); testRunner.assertQueueEmpty(); testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE); @@ -118,20 +104,16 @@ public class TestEncodeContent { testRunner.run(); testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1); - flowFile = testRunner. - getFlowFilesForRelationship(EncodeContent.REL_SUCCESS). - get(0); + flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0); flowFile.assertContentEquals(new File("src/test/resources/hello.txt")); } @Test public void testFailDecodeNotBase32() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncodeContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent()); testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE); - testRunner. - setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING); + testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.BASE32_ENCODING); testRunner.enqueue(Paths.get("src/test/resources/hello.txt")); testRunner.clearTransferState(); @@ -142,12 +124,10 @@ public class TestEncodeContent { @Test public void testHexRoundTrip() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncodeContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent()); testRunner.setProperty(EncodeContent.MODE, EncodeContent.ENCODE_MODE); - testRunner. - setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING); + testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING); testRunner.enqueue(Paths.get("src/test/resources/hello.txt")); testRunner.clearTransferState(); @@ -155,9 +135,7 @@ public class TestEncodeContent { testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1); - MockFlowFile flowFile = testRunner. - getFlowFilesForRelationship(EncodeContent.REL_SUCCESS). - get(0); + MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0); testRunner.assertQueueEmpty(); testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE); @@ -166,20 +144,16 @@ public class TestEncodeContent { testRunner.run(); testRunner.assertAllFlowFilesTransferred(EncodeContent.REL_SUCCESS, 1); - flowFile = testRunner. - getFlowFilesForRelationship(EncodeContent.REL_SUCCESS). - get(0); + flowFile = testRunner.getFlowFilesForRelationship(EncodeContent.REL_SUCCESS).get(0); flowFile.assertContentEquals(new File("src/test/resources/hello.txt")); } @Test public void testFailDecodeNotHex() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncodeContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncodeContent()); testRunner.setProperty(EncodeContent.MODE, EncodeContent.DECODE_MODE); - testRunner. - setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING); + testRunner.setProperty(EncodeContent.ENCODING, EncodeContent.HEX_ENCODING); testRunner.enqueue(Paths.get("src/test/resources/hello.txt")); testRunner.clearTransferState(); 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/TestEncryptContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java index 1ec1fc9..7340e0f 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEncryptContent.java @@ -16,7 +16,6 @@ */ package org.apache.nifi.processors.standard; -import org.apache.nifi.processors.standard.EncryptContent; import java.io.File; import java.io.IOException; import java.nio.file.Paths; @@ -32,44 +31,33 @@ public class TestEncryptContent { @Test public void testRoundTrip() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EncryptContent()); + final TestRunner testRunner = TestRunners.newTestRunner(new EncryptContent()); testRunner.setProperty(EncryptContent.PASSWORD, "Hello, World!"); for (final EncryptionMethod method : EncryptionMethod.values()) { if (method.isUnlimitedStrength()) { continue; // cannot test unlimited strength in unit tests because it's not enabled by the JVM by default. } - testRunner.setProperty(EncryptContent.ENCRYPTION_ALGORITHM, method. - name()); - testRunner. - setProperty(EncryptContent.MODE, EncryptContent.ENCRYPT_MODE); + testRunner.setProperty(EncryptContent.ENCRYPTION_ALGORITHM, method.name()); + testRunner.setProperty(EncryptContent.MODE, EncryptContent.ENCRYPT_MODE); testRunner.enqueue(Paths.get("src/test/resources/hello.txt")); testRunner.clearTransferState(); testRunner.run(); - testRunner. - assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1); + testRunner.assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1); - MockFlowFile flowFile = testRunner. - getFlowFilesForRelationship(EncryptContent.REL_SUCCESS). - get(0); + MockFlowFile flowFile = testRunner.getFlowFilesForRelationship(EncryptContent.REL_SUCCESS).get(0); testRunner.assertQueueEmpty(); - testRunner. - setProperty(EncryptContent.MODE, EncryptContent.DECRYPT_MODE); + testRunner.setProperty(EncryptContent.MODE, EncryptContent.DECRYPT_MODE); testRunner.enqueue(flowFile); testRunner.clearTransferState(); testRunner.run(); - testRunner. - assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1); + testRunner.assertAllFlowFilesTransferred(EncryptContent.REL_SUCCESS, 1); - flowFile = testRunner. - getFlowFilesForRelationship(EncryptContent.REL_SUCCESS). - get(0); - flowFile. - assertContentEquals(new File("src/test/resources/hello.txt")); + flowFile = testRunner.getFlowFilesForRelationship(EncryptContent.REL_SUCCESS).get(0); + flowFile.assertContentEquals(new File("src/test/resources/hello.txt")); } } 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/TestEvaluateJsonPath.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java index 25dfc1b..69d47c8 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateJsonPath.java @@ -38,77 +38,59 @@ import static org.junit.Assert.assertEquals; public class TestEvaluateJsonPath { - private static final Path JSON_SNIPPET = Paths. - get("src/test/resources/TestJson/json-sample.json"); - private static final Path XML_SNIPPET = Paths. - get("src/test/resources/TestXml/xml-snippet.xml"); + private static final Path JSON_SNIPPET = Paths.get("src/test/resources/TestJson/json-sample.json"); + private static final Path XML_SNIPPET = Paths.get("src/test/resources/TestXml/xml-snippet.xml"); @Test(expected = AssertionError.class) public void testInvalidJsonPath() { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); testRunner.setProperty("invalid.jsonPath", "$.."); - Assert. - fail("An improper JsonPath expression was not detected as being invalid."); + Assert.fail("An improper JsonPath expression was not detected as being invalid."); } @Test public void testInvalidJsonDocument() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); testRunner.enqueue(XML_SNIPPET); testRunner.run(); - testRunner. - assertAllFlowFilesTransferred(EvaluateJsonPath.REL_FAILURE, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(EvaluateJsonPath.REL_FAILURE). - get(0); + testRunner.assertAllFlowFilesTransferred(EvaluateJsonPath.REL_FAILURE, 1); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateJsonPath.REL_FAILURE).get(0); } @Test(expected = AssertionError.class) public void testInvalidConfiguration_destinationContent_twoPaths() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); testRunner.setProperty("JsonPath1", "$[0]._id"); testRunner.setProperty("JsonPath2", "$[0].name"); testRunner.enqueue(JSON_SNIPPET); testRunner.run(); - Assert. - fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content."); + Assert.fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content."); } @Test(expected = AssertionError.class) public void testInvalidConfiguration_invalidJsonPath_space() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); testRunner.setProperty("JsonPath1", "$[0]. _id"); testRunner.enqueue(JSON_SNIPPET); testRunner.run(); - Assert. - fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content."); + Assert.fail("Processor incorrectly ran with an invalid configuration of multiple paths specified as attributes for a destination of content."); } @Test public void testConfiguration_destinationAttributes_twoPaths() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); testRunner.setProperty("JsonPath1", "$[0]._id"); testRunner.setProperty("JsonPath2", "$[0].name"); @@ -120,10 +102,8 @@ public class TestEvaluateJsonPath { public void testExtractPath_destinationAttribute() throws Exception { String jsonPathAttrKey = "JsonPath"; - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); testRunner.setProperty(jsonPathAttrKey, "$[0]._id"); testRunner.enqueue(JSON_SNIPPET); @@ -132,22 +112,15 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(expectedRel). - get(0); - Assert. - assertEquals("Transferred flow file did not have the correct result", "54df94072d5dbf7dc6340cc5", out. - getAttribute(jsonPathAttrKey)); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0); + Assert.assertEquals("Transferred flow file did not have the correct result", "54df94072d5dbf7dc6340cc5", out.getAttribute(jsonPathAttrKey)); } @Test public void testExtractPath_destinationAttributes_twoPaths() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); - testRunner. - setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON); String jsonPathIdAttrKey = "evaluatejson.id"; String jsonPathNameAttrKey = "evaluatejson.name"; @@ -161,23 +134,15 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(expectedRel). - get(0); - Assert. - assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out. - getAttribute(jsonPathIdAttrKey)); - Assert. - assertEquals("Transferred flow file did not have the correct result for name attribute", "{\"first\":\"Shaffer\",\"last\":\"Pearson\"}", out. - getAttribute(jsonPathNameAttrKey)); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0); + Assert.assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out.getAttribute(jsonPathIdAttrKey)); + Assert.assertEquals("Transferred flow file did not have the correct result for name attribute", "{\"first\":\"Shaffer\",\"last\":\"Pearson\"}", out.getAttribute(jsonPathNameAttrKey)); } @Test public void testExtractPath_destinationAttributes_twoPaths_notFound() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); String jsonPathIdAttrKey = "evaluatejson.id"; String jsonPathNameAttrKey = "evaluatejson.name"; @@ -191,23 +156,15 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(expectedRel). - get(0); - Assert. - assertEquals("Transferred flow file did not have the correct result for id attribute", "", out. - getAttribute(jsonPathIdAttrKey)); - Assert. - assertEquals("Transferred flow file did not have the correct result for name attribute", "", out. - getAttribute(jsonPathNameAttrKey)); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0); + Assert.assertEquals("Transferred flow file did not have the correct result for id attribute", "", out.getAttribute(jsonPathIdAttrKey)); + Assert.assertEquals("Transferred flow file did not have the correct result for name attribute", "", out.getAttribute(jsonPathNameAttrKey)); } @Test public void testExtractPath_destinationAttributes_twoPaths_oneFound() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); String jsonPathIdAttrKey = "evaluatejson.id"; String jsonPathNameAttrKey = "evaluatejson.name"; @@ -221,25 +178,17 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(expectedRel). - get(0); - Assert. - assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out. - getAttribute(jsonPathIdAttrKey)); - Assert. - assertEquals("Transferred flow file did not have the correct result for name attribute", StringUtils.EMPTY, out. - getAttribute(jsonPathNameAttrKey)); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(expectedRel).get(0); + Assert.assertEquals("Transferred flow file did not have the correct result for id attribute", "54df94072d5dbf7dc6340cc5", out.getAttribute(jsonPathIdAttrKey)); + Assert.assertEquals("Transferred flow file did not have the correct result for name attribute", StringUtils.EMPTY, out.getAttribute(jsonPathNameAttrKey)); } @Test public void testExtractPath_destinationContent() throws Exception { String jsonPathAttrKey = "JsonPath"; - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); testRunner.setProperty(jsonPathAttrKey, "$[0]._id"); testRunner.enqueue(JSON_SNIPPET); @@ -248,19 +197,15 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - testRunner.getFlowFilesForRelationship(expectedRel). - get(0). - assertContentEquals("54df94072d5dbf7dc6340cc5"); + testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals("54df94072d5dbf7dc6340cc5"); } @Test public void testExtractPath_destinationContent_indefiniteResult() throws Exception { String jsonPathAttrKey = "friends.indefinite.id.list"; - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); testRunner.setProperty(jsonPathAttrKey, "$[0].friends.[*].id"); testRunner.enqueue(JSON_SNIPPET); @@ -269,19 +214,15 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - testRunner.getFlowFilesForRelationship(expectedRel). - get(0). - assertContentEquals("[0,1,2]"); + testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals("[0,1,2]"); } @Test public void testExtractPath_destinationContent_indefiniteResult_operators() throws Exception { String jsonPathAttrKey = "friends.indefinite.id.list"; - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); testRunner.setProperty(jsonPathAttrKey, "$[0].friends[?(@.id < 3)].id"); testRunner.enqueue(JSON_SNIPPET); @@ -290,17 +231,13 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - testRunner.getFlowFilesForRelationship(expectedRel). - get(0). - assertContentEquals("[0,1,2]"); + testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals("[0,1,2]"); } @Test public void testRouteUnmatched_destinationContent_noMatch() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); testRunner.setProperty("jsonPath", "$[0].nonexistent.key"); testRunner.enqueue(JSON_SNIPPET); @@ -309,21 +246,16 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_NO_MATCH; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - testRunner.getFlowFilesForRelationship(expectedRel). - get(0). - assertContentEquals(JSON_SNIPPET); + testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals(JSON_SNIPPET); } @Test public void testRouteFailure_returnTypeScalar_resultArray() throws Exception { String jsonPathAttrKey = "friends.indefinite.id.list"; - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_SCALAR); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_SCALAR); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_CONTENT); testRunner.setProperty(jsonPathAttrKey, "$[0].friends[?(@.id < 3)].id"); testRunner.enqueue(JSON_SNIPPET); @@ -332,34 +264,26 @@ public class TestEvaluateJsonPath { Relationship expectedRel = EvaluateJsonPath.REL_FAILURE; testRunner.assertAllFlowFilesTransferred(expectedRel, 1); - testRunner.getFlowFilesForRelationship(expectedRel). - get(0). - assertContentEquals(JSON_SNIPPET); + testRunner.getFlowFilesForRelationship(expectedRel).get(0).assertContentEquals(JSON_SNIPPET); } @Test public void testNullInput() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); testRunner.setProperty("stringField", "$.stringField"); testRunner.setProperty("missingField", "$.missingField"); testRunner.setProperty("nullField", "$.nullField"); - ProcessSession session = testRunner.getProcessSessionFactory(). - createSession(); + ProcessSession session = testRunner.getProcessSessionFactory().createSession(); FlowFile ff = session.create(); ff = session.write(ff, new OutputStreamCallback() { @Override public void process(OutputStream out) throws IOException { try (OutputStream outputStream = new BufferedOutputStream(out)) { - outputStream. - write("{\"stringField\": \"String Value\", \"nullField\": null}". - getBytes(StandardCharsets.UTF_8)); + outputStream.write("{\"stringField\": \"String Value\", \"nullField\": null}".getBytes(StandardCharsets.UTF_8)); } } }); @@ -369,9 +293,7 @@ public class TestEvaluateJsonPath { testRunner.assertTransferCount(EvaluateJsonPath.REL_MATCH, 1); - FlowFile output = testRunner. - getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH). - get(0); + FlowFile output = testRunner.getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH).get(0); String validFieldValue = output.getAttribute("stringField"); assertEquals("String Value", validFieldValue); @@ -385,29 +307,22 @@ public class TestEvaluateJsonPath { @Test public void testNullInput_nullStringRepresentation() throws Exception { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateJsonPath()); - testRunner. - setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON); - testRunner. - setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); - testRunner. - setProperty(EvaluateJsonPath.NULL_VALUE_DEFAULT_REPRESENTATION, AbstractJsonPathProcessor.NULL_STRING_OPTION); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateJsonPath()); + testRunner.setProperty(EvaluateJsonPath.RETURN_TYPE, EvaluateJsonPath.RETURN_TYPE_JSON); + testRunner.setProperty(EvaluateJsonPath.DESTINATION, EvaluateJsonPath.DESTINATION_ATTRIBUTE); + testRunner.setProperty(EvaluateJsonPath.NULL_VALUE_DEFAULT_REPRESENTATION, AbstractJsonPathProcessor.NULL_STRING_OPTION); testRunner.setProperty("stringField", "$.stringField"); testRunner.setProperty("missingField", "$.missingField"); testRunner.setProperty("nullField", "$.nullField"); - ProcessSession session = testRunner.getProcessSessionFactory(). - createSession(); + ProcessSession session = testRunner.getProcessSessionFactory().createSession(); FlowFile ff = session.create(); ff = session.write(ff, new OutputStreamCallback() { @Override public void process(OutputStream out) throws IOException { try (OutputStream outputStream = new BufferedOutputStream(out)) { - outputStream. - write("{\"stringField\": \"String Value\", \"nullField\": null}". - getBytes(StandardCharsets.UTF_8)); + outputStream.write("{\"stringField\": \"String Value\", \"nullField\": null}".getBytes(StandardCharsets.UTF_8)); } } }); @@ -417,9 +332,7 @@ public class TestEvaluateJsonPath { testRunner.assertTransferCount(EvaluateJsonPath.REL_MATCH, 1); - FlowFile output = testRunner. - getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH). - get(0); + FlowFile output = testRunner.getFlowFilesForRelationship(EvaluateJsonPath.REL_MATCH).get(0); String validFieldValue = output.getAttribute("stringField"); assertEquals("String Value", validFieldValue); 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/TestEvaluateXPath.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java index b88b9f9..95e475f 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestEvaluateXPath.java @@ -16,7 +16,6 @@ */ package org.apache.nifi.processors.standard; -import org.apache.nifi.processors.standard.EvaluateXPath; import static org.junit.Assert.assertTrue; import java.io.IOException; @@ -33,81 +32,60 @@ import org.junit.Test; public class TestEvaluateXPath { - private static final Path XML_SNIPPET = Paths. - get("src/test/resources/TestXml/xml-snippet.xml"); + private static final Path XML_SNIPPET = Paths.get("src/test/resources/TestXml/xml-snippet.xml"); @Test public void testAsAttribute() throws XPathFactoryConfigurationException, IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE); testRunner.setProperty("xpath.result1", "/"); - testRunner. - setProperty("xpath.result2", "/*:bundle/node/subNode/value/text()"); + testRunner.setProperty("xpath.result2", "/*:bundle/node/subNode/value/text()"); testRunner.enqueue(XML_SNIPPET); testRunner.run(); testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(EvaluateXPath.REL_MATCH). - get(0); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0); out.assertAttributeEquals("xpath.result2", "Hello"); - assertTrue(out.getAttribute("xpath.result1"). - contains("Hello")); + assertTrue(out.getAttribute("xpath.result1").contains("Hello")); } @Test public void testCheckIfElementExists() throws XPathFactoryConfigurationException, IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE); testRunner.setProperty("xpath.result1", "/"); - testRunner. - setProperty("xpath.result.exist.1", "boolean(/*:bundle/node)"); - testRunner. - setProperty("xpath.result.exist.2", "boolean(/*:bundle/node2)"); + testRunner.setProperty("xpath.result.exist.1", "boolean(/*:bundle/node)"); + testRunner.setProperty("xpath.result.exist.2", "boolean(/*:bundle/node2)"); testRunner.enqueue(XML_SNIPPET); testRunner.run(); testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(EvaluateXPath.REL_MATCH). - get(0); - assertTrue(out.getAttribute("xpath.result1"). - contains("Hello")); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0); + assertTrue(out.getAttribute("xpath.result1").contains("Hello")); out.assertAttributeEquals("xpath.result.exist.1", "true"); out.assertAttributeEquals("xpath.result.exist.2", "false"); } @Test public void testUnmatched() throws XPathFactoryConfigurationException, IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); testRunner.setProperty("xpath.result.exist.2", "/*:bundle/node2"); testRunner.enqueue(XML_SNIPPET); testRunner.run(); testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_NO_MATCH, 1); - testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_NO_MATCH). - get(0). - assertContentEquals(XML_SNIPPET); + testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_NO_MATCH).get(0).assertContentEquals(XML_SNIPPET); } @Test(expected = java.lang.AssertionError.class) public void testMultipleXPathForContent() throws IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); - testRunner. - setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_AUTO); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); + testRunner.setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_AUTO); testRunner.setProperty("some.property.1", "/*:bundle/node/subNode[1]"); testRunner.setProperty("some.property.2", "/*:bundle/node/subNode[2]"); @@ -117,19 +95,15 @@ public class TestEvaluateXPath { @Test public void testWriteToContent() throws XPathFactoryConfigurationException, IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); testRunner.setProperty("some.property", "/*:bundle/node/subNode[1]"); testRunner.enqueue(XML_SNIPPET); testRunner.run(); testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(EvaluateXPath.REL_MATCH). - get(0); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0); final byte[] outData = testRunner.getContentAsByteArray(out); final String outXml = new String(outData, "UTF-8"); assertTrue(outXml.contains("subNode")); @@ -138,10 +112,8 @@ public class TestEvaluateXPath { @Test public void testFailureIfContentMatchesMultipleNodes() throws XPathFactoryConfigurationException, IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); testRunner.setProperty("some.property", "/*:bundle/node/subNode"); testRunner.enqueue(XML_SNIPPET); @@ -152,45 +124,33 @@ public class TestEvaluateXPath { @Test public void testWriteStringToContent() throws XPathFactoryConfigurationException, IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); - testRunner. - setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_STRING); - testRunner. - setProperty("some.property", "/*:bundle/node/subNode[1]/value/text()"); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_CONTENT); + testRunner.setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_STRING); + testRunner.setProperty("some.property", "/*:bundle/node/subNode[1]/value/text()"); testRunner.enqueue(XML_SNIPPET); testRunner.run(); testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(EvaluateXPath.REL_MATCH). - get(0); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0); final byte[] outData = testRunner.getContentAsByteArray(out); final String outXml = new String(outData, "UTF-8"); - assertTrue(outXml.trim(). - equals("Hello")); + assertTrue(outXml.trim().equals("Hello")); } @Test public void testWriteNodeSetToAttribute() throws XPathFactoryConfigurationException, IOException { - final TestRunner testRunner = TestRunners. - newTestRunner(new EvaluateXPath()); - testRunner. - setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE); - testRunner. - setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_NODESET); + final TestRunner testRunner = TestRunners.newTestRunner(new EvaluateXPath()); + testRunner.setProperty(EvaluateXPath.DESTINATION, EvaluateXPath.DESTINATION_ATTRIBUTE); + testRunner.setProperty(EvaluateXPath.RETURN_TYPE, EvaluateXPath.RETURN_TYPE_NODESET); testRunner.setProperty("some.property", "/*:bundle/node/subNode[1]"); testRunner.enqueue(XML_SNIPPET); testRunner.run(); testRunner.assertAllFlowFilesTransferred(EvaluateXPath.REL_MATCH, 1); - final MockFlowFile out = testRunner. - getFlowFilesForRelationship(EvaluateXPath.REL_MATCH). - get(0); + final MockFlowFile out = testRunner.getFlowFilesForRelationship(EvaluateXPath.REL_MATCH).get(0); final String outXml = out.getAttribute("some.property"); assertTrue(outXml.contains("subNode")); assertTrue(outXml.contains("Hello"));