diff --git a/Sda1/Etest/SaxMemo2Html/SaxMemo2Hhtml_solution/src/test/java/de/hdm_stuttgart/de/testing/dom/ConversionTest.java b/Sda1/Etest/SaxMemo2Html/SaxMemo2Hhtml_solution/src/test/java/de/hdm_stuttgart/de/testing/dom/ConversionTest.java index 25bad0821a440d06cc36c59d02cefda00e42942c..0192d64b082e09e34d9c4f2ff224a5e3cc0a741b 100644 --- a/Sda1/Etest/SaxMemo2Html/SaxMemo2Hhtml_solution/src/test/java/de/hdm_stuttgart/de/testing/dom/ConversionTest.java +++ b/Sda1/Etest/SaxMemo2Html/SaxMemo2Hhtml_solution/src/test/java/de/hdm_stuttgart/de/testing/dom/ConversionTest.java @@ -1,6 +1,9 @@ package de.hdm_stuttgart.de.testing.dom; +import java.io.BufferedReader; +import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileReader; import java.io.IOException; import java.io.PrintStream; @@ -15,31 +18,31 @@ import de.hdm_stuttgart.mi.sda1.saxhtml.tools.ContentRedirect; import de.hdm_stuttgart.mi.sda1.saxhtml.v1.Memo2Html; /** - * Turning <memo> documents to HTML as being shown in sample document memo.xml.2.sample.html - + * Turning <memo> documents to HTML as being shown in sample document + * memo.xml.2.sample.html */ @SuppressWarnings("javadoc") public abstract class ConversionTest { - - public final String xmlInputFileName, htmlOutputFileName; + + public final String xmlInputFileName, htmlOutputFileName; final ContentRedirect saxHandler; protected String errorInitString = null; - protected Element htmlRootElement; + protected Element htmlRootElement = null; - protected ConversionTest(final String xmlInputFileName, final ContentRedirect saxHandler, final String outputExtension) { - - this.saxHandler = saxHandler; - + protected ConversionTest(final String xmlInputFileName, + final ContentRedirect saxHandler, final String outputExtension) { this.xmlInputFileName = xmlInputFileName; - this.htmlOutputFileName = xmlInputFileName + outputExtension; - + htmlOutputFileName = xmlInputFileName + outputExtension; + this.saxHandler = saxHandler; + final PrintStream out; try { out = new PrintStream(htmlOutputFileName); } catch (FileNotFoundException e1) { - errorInitString = "Unable to open file '" + htmlOutputFileName + "' for writing"; + errorInitString = "Unable to open file '" + htmlOutputFileName + + "' for writing"; return; } saxHandler.setOutputStream(out); @@ -59,13 +62,31 @@ public abstract class ConversionTest { e.printStackTrace(); } final SAXBuilder parser = new SAXBuilder(); - + try { htmlRootElement = parser.build(htmlOutputFileName).getRootElement(); } catch (JDOMException | IOException e1) { - errorInitString = "Unable to parse file '" + htmlOutputFileName + "', see stack trace for further information"; + errorInitString = "Unable to parse file '" + htmlOutputFileName + + "', see stack trace for further information"; e1.printStackTrace(); } out.close(); + printResultToStdout(); } + + private void printResultToStdout() { + try { + BufferedReader saxResult = new BufferedReader(new FileReader( + htmlOutputFileName)); + String line; + while (null != (line = saxResult.readLine())) { + System.out.println(line); + } + saxResult.close(); + } catch (IOException e) { + errorInitString = "Unable to open expected result output file '" + + htmlOutputFileName + "' :" + e.getLocalizedMessage(); + } + } + } \ No newline at end of file