NIFI-446: Fixed 2 unit tests that were environment-specific
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/82174e46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/82174e46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/82174e46 Branch: refs/heads/develop Commit: 82174e460c2f150d0d56f74a426e84a5b92efa1e Parents: f247e51 Author: Mark Payne <marka...@hotmail.com> Authored: Wed May 20 15:47:45 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Wed May 20 15:47:45 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/processors/standard/TestMergeContent.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/82174e46/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java index d2952d2..aad2593 100644 --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestMergeContent.java @@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard; import static org.junit.Assert.assertEquals; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -102,9 +103,9 @@ public class TestMergeContent { runner.setProperty(MergeContent.MAX_BIN_AGE, "1 sec"); runner.setProperty(MergeContent.MERGE_FORMAT, MergeContent.MERGE_FORMAT_CONCAT); runner.setProperty(MergeContent.DELIMITER_STRATEGY, MergeContent.DELIMITER_STRATEGY_FILENAME); - runner.setProperty(MergeContent.HEADER, getClass().getResource("/TestMergeContent/head").getPath()); - runner.setProperty(MergeContent.DEMARCATOR, getClass().getResource("/TestMergeContent/demarcate").getPath()); - runner.setProperty(MergeContent.FOOTER, getClass().getResource("/TestMergeContent/foot").getPath()); + runner.setProperty(MergeContent.HEADER, "src/test/resources/TestMergeContent/head"); + runner.setProperty(MergeContent.DEMARCATOR, "src/test/resources/TestMergeContent/demarcate"); + runner.setProperty(MergeContent.FOOTER, "src/test/resources/TestMergeContent/foot"); createFlowFiles(runner); runner.run(); @@ -162,7 +163,7 @@ public class TestMergeContent { Assert.assertEquals(3, results.size()); for (ValidationResult vr : results) { - Assert.assertTrue(vr.toString().contains("is invalid because File " + doesNotExistFile + " does not exist")); + Assert.assertTrue(vr.toString().contains("is invalid because File " + new File(doesNotExistFile).toString() + " does not exist")); } }
