Allow different result types in test cases.

Up to now the result section of a metamorph test case had to be
specified in cg-xml. This is now changed and any format which is
supported by a `Reader` can be used.

Author: cboehme

src/main/java/org/culturegraph/mf/test/TestCase.java

@@ -21,8 +21,6 @@
 import org.culturegraph.mf.framework.StreamPipe;
 import org.culturegraph.mf.framework.StreamReceiver;
 import org.culturegraph.mf.morph.Metamorph;
-import org.culturegraph.mf.stream.converter.xml.CGXmlHandler;
-import org.culturegraph.mf.stream.converter.xml.XmlDecoder;
 import org.culturegraph.mf.stream.reader.MultiFormatReader;
 import org.culturegraph.mf.stream.reader.Reader;
 import org.culturegraph.mf.stream.sink.EventList;
@@ -36,7 +34,7 @@
 
 /**
  * @author Christoph Böhme <[email protected]>
- * 
+ *
  */
 public final class TestCase {
 
@@ -59,13 +57,13 @@ public final class TestCase {
 
 	private final Element config;
 
-	private final Reader reader;
+	private final Reader inputReader;
 	private final StreamPipe<StreamReceiver> transformation;
 
 	@SuppressWarnings("unchecked")
 	public TestCase(final Element config) {
 		this.config = config;
-		reader = getReader();
+		inputReader = getReader(INPUT_TAG);
 		transformation = getTransformation();
 	}
 
@@ -81,13 +79,13 @@ public void run() {
 
 		final EventList resultStream = new EventList();
 		if (transformation == null) {
-			reader.setReceiver(resultStream);
+			inputReader.setReceiver(resultStream);
 		} else {
-			reader.setReceiver(transformation).setReceiver(resultStream);
+			inputReader.setReceiver(transformation).setReceiver(resultStream);
 		}
 
-		reader.process(getInputData());
-		reader.closeStream();
+		inputReader.process(getInputData());
+		inputReader.closeStream();
 
 		final StreamValidator validator = new StreamValidator(resultStream.getEvents());
 
@@ -96,16 +94,16 @@ public void run() {
 		validator.setStrictKeyOrder(Boolean.parseBoolean(result.getAttribute(STRICT_KEY_ORDER_ATTR)));
 		validator.setStrictValueOrder(Boolean.parseBoolean(result.getAttribute(STRICT_VALUE_ORDER_ATTR)));
 
-		final XmlDecoder decoder = new XmlDecoder();
-		decoder.setReceiver(new CGXmlHandler()).setReceiver(validator);
+		final Reader resultReader = getReader(RESULT_TAG);
+		resultReader.setReceiver(validator);
 
-		decoder.process(getExpectedResult());
+		resultReader.process(getExpectedResult());
 		validator.closeStream();
 	}
 
-	private Reader getReader() {
-		final Element input = (Element) config.getElementsByTagName(INPUT_TAG).item(0);
-		final String mimeType = input.getAttribute(TYPE_ATTR);
+	private Reader getReader(final String tag) {
+		final Element element = (Element) config.getElementsByTagName(tag).item(0);
+		final String mimeType = element.getAttribute(TYPE_ATTR);
 		return new MultiFormatReader(mimeType);
 	}
 
@@ -160,7 +158,7 @@ private java.io.Reader getExpectedResult() {
 	private java.io.Reader getDataFromSource(final String src) {
 		try {
 			return ResourceUtil.getReader(src);
-		} catch (FileNotFoundException e) {
+		} catch (final FileNotFoundException e) {
 			throw new TestConfigurationException("Could not find input file: " + src, e);
 		}
 	}

src/test/java/org/culturegraph/mf/test/TestCaseTest.java

@@ -0,0 +1,99 @@
+/*
+ *  Copyright 2014 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.test;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.culturegraph.mf.exceptions.ShouldNeverHappenException;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Test cases for class {@link TestCase}.
+ *
+ * @author Christoph Böhme
+ *
+ */
+public final class TestCaseTest {
+
+	@Test
+	public void shouldSupportFormetaAsInputAndResultFormat() {
+		final Document doc = getXmlDocument();
+
+		final Element inputElement = doc.createElement("input");
+		inputElement.setAttribute("type", "text/x-formeta");
+		inputElement.setTextContent("{l: v}");
+
+		final Element resultElement = doc.createElement("result");
+		resultElement.setAttribute("type", "text/x-formeta");
+		resultElement.setTextContent("{l: v}");
+
+		final Element config = doc.createElement("test-case");
+		config.appendChild(inputElement);
+		config.appendChild(resultElement);
+
+		final TestCase testCase = new TestCase(config);
+		testCase.run();
+
+		// The test was successful if run does not throw
+		// an exception.
+	}
+
+	@Test
+	public void shouldSupportCGXmlAsInputAndResultFormat() {
+		final Document doc = getXmlDocument();
+
+		final Element inputRecord = doc.createElement("record");
+		inputRecord.setAttribute("id", "1");
+
+		final Element inputElement = doc.createElement("input");
+		inputElement.setAttribute("type", "text/x-cg+xml");
+		inputElement.appendChild(inputRecord);
+
+		final Element resultRecord = doc.createElement("record");
+		resultRecord.setAttribute("id", "1");
+
+		final Element resultElement = doc.createElement("result");
+		resultElement.setAttribute("type", "text/x-cg+xml");
+		resultElement.appendChild(resultRecord);
+
+		final Element config = doc.createElement("test-case");
+		config.appendChild(inputElement);
+		config.appendChild(resultElement);
+
+		final TestCase testCase = new TestCase(config);
+		testCase.run();
+
+		// The test was successful if run does not throw
+		// an exception.
+	}
+
+	private static Document getXmlDocument() {
+		final DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+		final DocumentBuilder docBuilder;
+		try {
+			docBuilder = docBuilderFactory.newDocumentBuilder();
+		} catch(final ParserConfigurationException e) {
+			throw new ShouldNeverHappenException(e);
+		}
+
+		return docBuilder.newDocument();
+	}
+
+}