Merge pull request #116 from daveneiman/test_logging_to_different_output

Have test classes output to separate log file for test output.
harvard-lts · Sep 9, 2016 · ec09ed6 · ec09ed6
2 parents 2c6d8f0 + 6102c0e
commit ec09ed6
Show file tree

Hide file tree

Showing 20 changed files with 43 additions and 98 deletions.
diff --git a/testfiles/PDF_equations.pdf b/testfiles/PDF_equations.pdf
diff --git a/testfiles/output/PDF_equations.pdf_XmlUnitExpectedOutput.xml b/testfiles/output/PDF_equations.pdf_XmlUnitExpectedOutput.xml
diff --git a/tests/edu/harvard/hul/ois/fits/EbuCoreNormalizedRatioTest.java b/tests/edu/harvard/hul/ois/fits/EbuCoreNormalizedRatioTest.java
@@ -22,7 +22,9 @@
 
 import org.junit.Test;
 
-public class EbuCoreNormalizedRatioTest{
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
+
+public class EbuCoreNormalizedRatioTest extends AbstractLoggingTest {
 
     @Test  
 	public void testNormalAspectRatioC() throws Exception {   

diff --git a/tests/edu/harvard/hul/ois/fits/junit/AudioStdSchemaTest.java b/tests/edu/harvard/hul/ois/fits/junit/AudioStdSchemaTest.java
@@ -39,9 +39,10 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.ots.schemas.XmlContent.XmlContent;
 
-public class AudioStdSchemaTest {
+public class AudioStdSchemaTest extends AbstractLoggingTest {
 
 	/*
 	 *  Only one Fits instance is needed to run all tests.

diff --git a/tests/edu/harvard/hul/ois/fits/junit/AudioStdSchemaTestXmlUnit_NoMD5.java b/tests/edu/harvard/hul/ois/fits/junit/AudioStdSchemaTestXmlUnit_NoMD5.java
@@ -34,8 +34,9 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 
-public class AudioStdSchemaTestXmlUnit_NoMD5 {
+public class AudioStdSchemaTestXmlUnit_NoMD5 extends AbstractLoggingTest {
 
 	@Test  
 	public void testAudioMD_noMD5() throws Exception {

diff --git a/tests/edu/harvard/hul/ois/fits/junit/DocMDTest.java b/tests/edu/harvard/hul/ois/fits/junit/DocMDTest.java
@@ -32,6 +32,7 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.ots.schemas.DocumentMD.DocumentMD;
 
 /**
@@ -40,7 +41,7 @@
  * 
  * @author dan179
  */
-public class DocMDTest {
+public class DocMDTest extends AbstractLoggingTest {
 
 	/*
 	 *  Only one Fits instance is needed to run all tests.
@@ -441,7 +442,6 @@ public void testRtfWithCompanyOutput() throws Exception {
 	public void testPdf() throws Exception {
 
     	String[] inputFilenames = {"PDF_embedded_resources.pdf",
-    			"PDF_equations.pdf",
     			"HasChangeHistory.pdf",
     			"PDF_eng.pdf",
     			"HasAnnotations.pdf"};

diff --git a/tests/edu/harvard/hul/ois/fits/junit/DocMDXmlUnitTest.java b/tests/edu/harvard/hul/ois/fits/junit/DocMDXmlUnitTest.java
@@ -38,14 +38,15 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 
 /**
  * These tests compare actual FITS output with expected output on various word processing documents.
  * These tests should be run with &lt;display-tool-output&gt;false&lt;/display-tool-output&gt; in fits.xml.
  * 
  * @author dan179
  */
-public class DocMDXmlUnitTest {
+public class DocMDXmlUnitTest extends AbstractLoggingTest {
 
 	private static final String ACTUAL_OUTPUT_FILE_SUFFIX = "_XmlUnitActualOutput.xml";
 	private static final String EXPECTED_OUTPUT_FILE_SUFFIX = "_XmlUnitExpectedOutput.xml";
@@ -501,7 +502,6 @@ public void testRtfWithCompanyOutput() throws Exception {
 	public void testPdf() throws Exception {
 
     	String[] inputFilenames = {"PDF_embedded_resources.pdf",
-//    			"PDF_equations.pdf", // different "font" output when running in Java 7 vs. Java 8
     			"HasChangeHistory.pdf",
     			"PDF_eng.pdf",
     			"HasAnnotations.pdf"};

diff --git a/tests/edu/harvard/hul/ois/fits/junit/EbucoreParseChannelPositionTest.java b/tests/edu/harvard/hul/ois/fits/junit/EbucoreParseChannelPositionTest.java
@@ -34,11 +34,12 @@
 
 import org.junit.Test;
 
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.fits.tools.mediainfo.ChannelPositionParser;
 import edu.harvard.hul.ois.fits.tools.mediainfo.ChannelPositionWrapper;
 import edu.harvard.hul.ois.ots.schemas.XmlContent.XmlContentException;
 
-public class EbucoreParseChannelPositionTest {
+public class EbucoreParseChannelPositionTest extends AbstractLoggingTest {
 
 	// Taken and revised from a MediaInfo header file
 	private static final String[] DTS_ChannelPositions =

diff --git a/tests/edu/harvard/hul/ois/fits/junit/FitsBasicAudioTest.java b/tests/edu/harvard/hul/ois/fits/junit/FitsBasicAudioTest.java
@@ -24,9 +24,10 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.fits.tools.Tool;
 
-public class FitsBasicAudioTest {
+public class FitsBasicAudioTest extends AbstractLoggingTest {
 
 	@Test
 	public void testFitsAudio () throws Exception {	

diff --git a/tests/edu/harvard/hul/ois/fits/junit/FitsBasicTest.java b/tests/edu/harvard/hul/ois/fits/junit/FitsBasicTest.java
@@ -24,9 +24,10 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.fits.tools.Tool;
 
-public class FitsBasicTest {
+public class FitsBasicTest extends AbstractLoggingTest {
 
 	@Test
 	public void testFits() throws Exception {	

diff --git a/tests/edu/harvard/hul/ois/fits/junit/FitsBasicVideoTest.java b/tests/edu/harvard/hul/ois/fits/junit/FitsBasicVideoTest.java
@@ -27,9 +27,10 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.fits.tools.Tool;
 
-public class FitsBasicVideoTest {
+public class FitsBasicVideoTest extends AbstractLoggingTest {
 
 	/*
 	 *  Only one Fits instance is needed to run all tests.

diff --git a/tests/edu/harvard/hul/ois/fits/junit/FitsOutputXmlTest.java b/tests/edu/harvard/hul/ois/fits/junit/FitsOutputXmlTest.java
@@ -42,14 +42,15 @@
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsMetadataElement;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.fits.tests.IgnoreAttributeValuesDifferenceListener;
 
 /*
  * BROKEN TEST
  */
 @Ignore
 @RunWith(value=Parameterized.class)
-public class FitsOutputXmlTest {
+public class FitsOutputXmlTest extends AbstractLoggingTest {
 
     private FitsOutput expected;
     private FitsOutput actual;

diff --git a/tests/edu/harvard/hul/ois/fits/junit/MixTest.java b/tests/edu/harvard/hul/ois/fits/junit/MixTest.java
@@ -32,10 +32,11 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.ots.schemas.DocumentMD.DocumentMD;
 import edu.harvard.hul.ois.ots.schemas.MIX.Mix;
 
-public class MixTest {
+public class MixTest extends AbstractLoggingTest {
 
 	/*
 	 *  Only one Fits instance is needed to run all tests.
@@ -48,10 +49,11 @@ public static void beforeClass() throws Exception {
 		// Set up XMLUnit and FITS for entire class.
 		XMLUnit.setIgnoreWhitespace(true);
 		XMLUnit.setNormalizeWhitespace(true);
-		File fitsConfigFile = new File("testfiles/properties/fits-full-with-tool-output.xml");
-		fits = new Fits(null, fitsConfigFile);
-//		fits = new Fits();	// Use this instead to turn off tool output.
-		}
+		fits = new Fits();
+		// Use this instead to turn on tool output.
+//		File fitsConfigFile = new File("testfiles/properties/fits-full-with-tool-output.xml");
+//		fits = new Fits(null, fitsConfigFile);
+	}
 
 	@AfterClass
 	public static void afterClass() {

diff --git a/tests/edu/harvard/hul/ois/fits/junit/TextMDTest.java b/tests/edu/harvard/hul/ois/fits/junit/TextMDTest.java
@@ -29,10 +29,11 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.ots.schemas.TextMD.TextMD;
 
 
-public class TextMDTest {
+public class TextMDTest extends AbstractLoggingTest {
 
 	@Test
 	public void testTextMD() throws Exception {	

diff --git a/tests/edu/harvard/hul/ois/fits/junit/TextMDXmlUnitTest.java b/tests/edu/harvard/hul/ois/fits/junit/TextMDXmlUnitTest.java
@@ -38,9 +38,10 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 
 
-public class TextMDXmlUnitTest {
+public class TextMDXmlUnitTest extends AbstractLoggingTest {
 
 	private static final String ACTUAL_OUTPUT_FILE_SUFFIX = "_XmlUnitActualOutput.xml";
 	private static final String EXPECTED_OUTPUT_FILE_SUFFIX = "_XmlUnitExpectedOutput.xml";

diff --git a/tests/edu/harvard/hul/ois/fits/junit/VTTToolTest.java b/tests/edu/harvard/hul/ois/fits/junit/VTTToolTest.java
@@ -28,8 +28,9 @@
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
 import edu.harvard.hul.ois.fits.identity.FitsIdentity;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 
-public class VTTToolTest {
+public class VTTToolTest extends AbstractLoggingTest {
 
 	@Test  
 	public void testVttRead() throws Exception {   

diff --git a/tests/edu/harvard/hul/ois/fits/junit/VideoStdSchemaTest.java b/tests/edu/harvard/hul/ois/fits/junit/VideoStdSchemaTest.java
@@ -32,9 +32,10 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 import edu.harvard.hul.ois.ots.schemas.XmlContent.XmlContent;
 
-public class VideoStdSchemaTest{
+public class VideoStdSchemaTest extends AbstractLoggingTest {
 
 	/*
 	 *  Only one Fits instance is needed to run all tests.

diff --git a/tests/edu/harvard/hul/ois/fits/junit/VideoStdSchemaTestXmlUnit.java b/tests/edu/harvard/hul/ois/fits/junit/VideoStdSchemaTestXmlUnit.java
@@ -37,8 +37,9 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 
-public class VideoStdSchemaTestXmlUnit {
+public class VideoStdSchemaTestXmlUnit extends AbstractLoggingTest {
 
 	private static final String[] IGNORED_XML_ELEMENTS = {
 			"version",

diff --git a/tests/edu/harvard/hul/ois/fits/junit/VideoStdSchemaTestXmlUnit_NoMD5.java b/tests/edu/harvard/hul/ois/fits/junit/VideoStdSchemaTestXmlUnit_NoMD5.java
@@ -34,8 +34,9 @@
 
 import edu.harvard.hul.ois.fits.Fits;
 import edu.harvard.hul.ois.fits.FitsOutput;
+import edu.harvard.hul.ois.fits.tests.AbstractLoggingTest;
 
-public class VideoStdSchemaTestXmlUnit_NoMD5 {
+public class VideoStdSchemaTestXmlUnit_NoMD5 extends AbstractLoggingTest {
 
 	@Test  
 	public void testVideoXmlUnitFitsOutput_AVC_NO_MD5() throws Exception {

diff --git a/tests/edu/harvard/hul/ois/fits/tests/AbstractLoggingTest.java b/tests/edu/harvard/hul/ois/fits/tests/AbstractLoggingTest.java
@@ -3,15 +3,14 @@
 import java.io.File;
 
 /**
- * This base class is for initializing logging for those test classes that don't use the Fits class (which
- * has its own logging initialization) or for  those test classes that want to override the logging configuration
- * as configured in the Fits constructor. This allows for a separate logging configuration for test classes
+ * This base class is for initializing logging for test classes to set the logging configuration
+ * in the Fits constructor by means of an environment variable. This allows for a separate logging configuration for test classes
  * other than the default logging as set up within FITS.java.
  * 
  * @see edu.harvard.hul.ois.fits.Fits#Fits(String, File)
  * @author dan179
  */
-public class AbstractLoggingTest {
+public abstract class AbstractLoggingTest {
 
 	/**
 	 * Configure logging with the test logging configuration file by setting a system property.