Repository: nifi Updated Branches: refs/heads/master 4a5fb37b3 -> beb92492b
NIFI-1421 This closes #184. Added content assertion to test and removed extra space Signed-off-by: Mark Payne <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/beb92492 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/beb92492 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/beb92492 Branch: refs/heads/master Commit: beb92492bee282a0a5bdffa2e1009ccb3692c9f4 Parents: 4a5fb37 Author: joewitt <[email protected]> Authored: Sun Jan 24 22:05:34 2016 -0500 Committer: Mark Payne <[email protected]> Committed: Mon Jan 25 16:04:47 2016 -0500 ---------------------------------------------------------------------- .../nifi-standard-bundle/nifi-standard-processors/pom.xml | 2 ++ .../main/java/org/apache/nifi/processors/standard/SplitXml.java | 2 +- .../java/org/apache/nifi/processors/standard/TestSplitXml.java | 5 +++++ .../src/test/resources/TestXml/namespaceSplit1.xml | 1 + .../src/test/resources/TestXml/namespaceSplit2.xml | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/beb92492/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index 5ec2cf5..2522fee 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -293,6 +293,8 @@ language governing permissions and limitations under the License. --> <exclude>src/test/resources/TestUnpackContent/data.flowfilev2</exclude> <exclude>src/test/resources/TestUnpackContent/data.flowfilev3</exclude> <exclude>src/test/resources/TestXml/xml-bundle-1</exclude> + <exclude>src/test/resources/TestXml/namespaceSplit1.xml</exclude> + <exclude>src/test/resources/TestXml/namespaceSplit2.xml</exclude> <exclude>src/test/resources/CompressedData/SampleFile.txt.bz2</exclude> <exclude>src/test/resources/CompressedData/SampleFile.txt.gz</exclude> <exclude>src/test/resources/CompressedData/SampleFile1.txt.bz2</exclude> http://git-wip-us.apache.org/repos/asf/nifi/blob/beb92492/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java index 6d5b30a..cfe923b 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitXml.java @@ -318,7 +318,7 @@ public class SplitXml extends AbstractProcessor { sb.append(entry.getKey()); sb.append("=\""); sb.append(entry.getValue()); - sb.append("\" "); + sb.append("\""); } } http://git-wip-us.apache.org/repos/asf/nifi/blob/beb92492/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java index e0a2e09..1815b3b 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitXml.java @@ -109,6 +109,11 @@ public class TestSplitXml { parseFlowFiles(runner.getFlowFilesForRelationship(SplitXml.REL_ORIGINAL)); parseFlowFiles(runner.getFlowFilesForRelationship(SplitXml.REL_SPLIT)); + + final MockFlowFile split1 = runner.getFlowFilesForRelationship(SplitXml.REL_SPLIT).get(0); + split1.assertContentEquals(Paths.get("src/test/resources/TestXml/namespaceSplit1.xml")); + final MockFlowFile split2 = runner.getFlowFilesForRelationship(SplitXml.REL_SPLIT).get(1); + split2.assertContentEquals(Paths.get("src/test/resources/TestXml/namespaceSplit2.xml")); } public void parseFlowFiles(List<MockFlowFile> flowfiles) throws Exception, SAXException { http://git-wip-us.apache.org/repos/asf/nifi/blob/beb92492/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit1.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit1.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit1.xml new file mode 100644 index 0000000..eec3ed4 --- /dev/null +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit1.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8"?><value xmlns:foo="http://namespace/1";>Hello & Goodbye</value> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/beb92492/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit2.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit2.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit2.xml new file mode 100644 index 0000000..38bb4b2 --- /dev/null +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/resources/TestXml/namespaceSplit2.xml @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8"?><goo:value xmlns:foo="http://namespace/1"; xmlns:goo="http://namespace/2";>World</goo:value> \ No newline at end of file
