X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FConversionTest.java;h=d932782e29756657ab29117fb0427c693267d145;hb=c2f96f372ee98b3745ad0c7f1dbb1a81ad7c4a7d;hp=d2e8f4352ff324bc387a37ce841539ed221e6633;hpb=f7460e4c44772dfb5fc5a421e33b4fba7eae94d3;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/test/ConversionTest.java b/src/be/nikiroo/fanfix/test/ConversionTest.java
index d2e8f43..d932782 100644
--- a/src/be/nikiroo/fanfix/test/ConversionTest.java
+++ b/src/be/nikiroo/fanfix/test/ConversionTest.java
@@ -6,7 +6,10 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -24,10 +27,20 @@ class ConversionTest extends TestLauncher {
 	private File testFile;
 	private File expectedDir;
 	private File resultDir;
+	private List<BasicOutput.OutputType> realTypes;
+	private Map<String, List<String>> skipCompare;
 
 	public ConversionTest(String[] args) {
 		super("Conversion", args);
 
+		// Special mode SYSOUT is not a file type (System.out)
+		realTypes = new ArrayList<BasicOutput.OutputType>();
+		for (BasicOutput.OutputType type : BasicOutput.OutputType.values()) {
+			if (!BasicOutput.OutputType.SYSOUT.equals(type)) {
+				realTypes.add(type);
+			}
+		}
+
 		addTest(new TestCase("Read the test file") {
 			@Override
 			public void test() throws Exception {
@@ -48,11 +61,8 @@ class ConversionTest extends TestLauncher {
 			}
 		});
 
-		for (BasicOutput.OutputType type : BasicOutput.OutputType.values()) {
-			// NOT for special mode SYSOUT
-			if (!BasicOutput.OutputType.SYSOUT.equals(type)) {
-				addTest(getTestFor(type));
-			}
+		for (BasicOutput.OutputType type : realTypes) {
+			addTest(getTestFor(type));
 		}
 	}
 
@@ -63,6 +73,15 @@ class ConversionTest extends TestLauncher {
 		resultDir = new File("test/result/");
 
 		tempFiles = new TempFiles("Fanfix-ConversionTest");
+
+		skipCompare = new HashMap<String, List<String>>();
+		skipCompare.put("epb.ncx",
+				Arrays.asList("		<meta name=\"dtb:uid\" content="));
+		skipCompare.put("epb.opf", Arrays.asList("      <dc:subject>",
+				"      <dc:identifier id=\"BookId\" opf:scheme=\"URI\">"));
+		skipCompare.put(".info",
+				Arrays.asList("CREATION_DATE=", "SUBJECT=", "URL=", "UUID="));
+		skipCompare.put("URL", Arrays.asList("file:/"));
 	}
 
 	@Override
@@ -79,17 +98,19 @@ class ConversionTest extends TestLauncher {
 						+ type.getDefaultExtension(false));
 
 				// Check conversion:
-				compareFiles(this, expectedDir, resultDir, type);
+				compareFiles(this, expectedDir, resultDir, type, null);
+
+				// LATEX not supported as input
+				if (BasicOutput.OutputType.LATEX.equals(type)) {
+					return;
+				}
 
 				// Cross-checks:
-				for (BasicOutput.OutputType type : BasicOutput.OutputType
-						.values()) {
-					// NOT for special mode SYSOUT
-					if (!BasicOutput.OutputType.SYSOUT.equals(type)) {
-						File crossDir = tempFiles.createTempDir("cross-result");
-						generate(this, target, crossDir, type);
-						compareFiles(this, crossDir, resultDir, type);
-					}
+				for (BasicOutput.OutputType crossType : realTypes) {
+					File crossDir = tempFiles.createTempDir("cross-result");
+					generate(this, target, crossDir, crossType);
+					compareFiles(this, resultDir, crossDir, crossType,
+							crossType);
 				}
 			}
 		};
@@ -144,8 +165,8 @@ class ConversionTest extends TestLauncher {
 	}
 
 	private void compareFiles(TestCase testCase, File expectedDir,
-			File resultDir, final BasicOutput.OutputType typeToCompare)
-			throws Exception {
+			File resultDir, final BasicOutput.OutputType typeToCompare,
+			final BasicOutput.OutputType sourceType) throws Exception {
 
 		FilenameFilter filter = null;
 		if (typeToCompare != null) {
@@ -177,7 +198,7 @@ class ConversionTest extends TestLauncher {
 					expected.isDirectory(), result.isDirectory());
 
 			if (expected.isDirectory()) {
-				compareFiles(testCase, expected, result, null);
+				compareFiles(testCase, expected, result, null, sourceType);
 				continue;
 			}
 
@@ -189,7 +210,7 @@ class ConversionTest extends TestLauncher {
 						+ "[zip-content]");
 				unzip(expected, tmpExpected);
 				unzip(result, tmpResult);
-				compareFiles(testCase, tmpExpected, tmpResult, null);
+				compareFiles(testCase, tmpExpected, tmpResult, null, sourceType);
 			} else {
 				List<String> expectedLines = Arrays.asList(IOUtils
 						.readSmallFile(expected).split("\n"));
@@ -205,20 +226,32 @@ class ConversionTest extends TestLauncher {
 				for (int j = 0; j < expectedLines.size(); j++) {
 					String expectedLine = expectedLines.get(j);
 					String resultLine = resultLines.get(j);
-					if (name.endsWith(".info")
-							&& expectedLine.startsWith("CREATION_DATE=")
-							&& resultLine.startsWith("CREATION_DATE=")) {
-						// TODO: check the format?
+
+					boolean skip = false;
+					for (Entry<String, List<String>> skipThose : skipCompare
+							.entrySet()) {
+						for (String skipStart : skipThose.getValue()) {
+							if (name.endsWith(skipThose.getKey())
+									&& expectedLine.startsWith(skipStart)
+									&& resultLine.startsWith(skipStart)) {
+								skip = true;
+							}
+						}
+					}
+
+					if (skip) {
 						continue;
 					}
-					testCase.assertEquals("Line " + (j + 1)
-							+ " is not the same in file " + name, expectedLine,
-							resultLine);
+
+					testCase.assertEquals("Line " + (j + 1) + " (" + sourceType
+							+ ") is not the same in file " + name,
+							expectedLine, resultLine);
 				}
 			}
 		}
 	}
 
+	// TODO: remove and use IOUtils when updated
 	private static void unzip(File zipFile, File targetDirectory)
 			throws IOException {
 		if (targetDirectory.exists() && targetDirectory.isFile()) {