Fix #265: split and switch-name-value emit wrong source

Author: cboehme

src/main/java/org/culturegraph/mf/metamorph/functions/Split.java

@@ -35,7 +35,7 @@ public void receive(final String name, final String value,
 			final int entityCount) {
 		final String[] parts = delimiterPattern.split(value);
 		for (final String part : parts) {
-			getNamedValueReceiver().receive(name, part, source, recordCount,
+			getNamedValueReceiver().receive(name, part, this, recordCount,
 					entityCount);
 		}
 	}

src/main/java/org/culturegraph/mf/metamorph/functions/SwitchNameValue.java

@@ -30,7 +30,7 @@ public void receive(final String name, final String value,
 			final NamedValueSource source, final int recordCount,
 			final int entityCount) {
 
-		getNamedValueReceiver().receive(value, name, source, recordCount,
+		getNamedValueReceiver().receive(value, name, this, recordCount,
 				entityCount);
 
 	}

src/test/java/org/culturegraph/mf/metamorph/functions/SplitTest.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 Christoph Böhme
+ *
+ * Licensed under the Apache License, Version 2.0 the "License";
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.culturegraph.mf.metamorph.functions;
+
+import static org.mockito.Mockito.verify;
+
+import org.culturegraph.mf.framework.StreamReceiver;
+import org.culturegraph.mf.metamorph.InlineMorph;
+import org.culturegraph.mf.metamorph.Metamorph;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+/**
+ * Tests for class {@link Split}.
+ *
+ * @author Christoph Böhme
+ */
+public final class SplitTest {
+
+	@Rule
+	public MockitoRule mockitoRule = MockitoJUnit.rule();
+
+	@Mock
+	private StreamReceiver receiver;
+
+	private Metamorph metamorph;
+
+	@Test
+	public void issue265_shouldWorkIfLastFunctionInCombineStatement() {
+		metamorph = InlineMorph.in(this)
+				.with("<rules>")
+				.with("  <combine name='out' value='${v}'>")
+				.with("    <data source='in' name='v'>")
+				.with("      <split delimiter=' ' />")
+				.with("    </data>")
+				.with("  </combine>")
+				.with("</rules>")
+				.createConnectedTo(receiver);
+
+		metamorph.startRecord("1");
+		metamorph.literal("in", "1 2");
+		metamorph.endRecord();
+
+		verify(receiver).literal("out", "1");
+		verify(receiver).literal("out", "2");
+	}
+
+}

src/test/java/org/culturegraph/mf/metamorph/functions/SwitchNameValueTest.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017 Christoph Böhme
+ *
+ * Licensed under the Apache License, Version 2.0 the "License";
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.culturegraph.mf.metamorph.functions;
+
+import static org.mockito.Mockito.verify;
+
+import org.culturegraph.mf.framework.StreamReceiver;
+import org.culturegraph.mf.metamorph.InlineMorph;
+import org.culturegraph.mf.metamorph.Metamorph;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+/**
+ * Tests for class {@link Split}.
+ *
+ * @author Christoph Böhme
+ */
+public final class SwitchNameValueTest {
+
+	@Rule
+	public MockitoRule mockitoRule = MockitoJUnit.rule();
+
+	@Mock
+	private StreamReceiver receiver;
+
+	private Metamorph metamorph;
+
+	@Test
+	public void issue265_shouldWorkIfLastFunctionInCombineStatement() {
+		metamorph = InlineMorph.in(this)
+				.with("<rules>")
+				.with("  <combine name='out' value='val'>")
+				.with("    <data source='in'>")
+				.with("      <switch-name-value />")
+				.with("    </data>")
+				.with("  </combine>")
+				.with("</rules>")
+				.createConnectedTo(receiver);
+
+		metamorph.startRecord("1");
+		metamorph.literal("in", "val");
+		metamorph.endRecord();
+
+		verify(receiver).literal("out", "val");
+	}
+
+}