X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FConversionTest.java;h=d730b3b5efecc85f8a1b581c0ae16dc719e66187;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=371c05aa25060a45cbb63e727a8c76b33d126c50;hpb=dabc4b957b52302c39cb6d07c6c91a1f91195d5a;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/test/ConversionTest.java b/src/be/nikiroo/fanfix/test/ConversionTest.java
index 371c05a..d730b3b 100644
--- a/src/be/nikiroo/fanfix/test/ConversionTest.java
+++ b/src/be/nikiroo/fanfix/test/ConversionTest.java
@@ -23,10 +23,11 @@ class ConversionTest extends TestLauncher {
 	private String resultDir;
 	private List<BasicOutput.OutputType> realTypes;
 	private Map<String, List<String>> skipCompare;
+	private Map<String, List<String>> skipCompareCross;
 
-	public ConversionTest(final String testUri, final String expectedDir,
-			final String resultDir, String[] args) {
-		super("Conversion", args);
+	public ConversionTest(String testName, final String testUri,
+			final String expectedDir, final String resultDir, String[] args) {
+		super("Conversion - " + testName, args);
 
 		this.testUri = testUri;
 		this.expectedDir = expectedDir;
@@ -40,14 +41,16 @@ class ConversionTest extends TestLauncher {
 			}
 		}
 
-		addTest(new TestCase("Read the test file") {
-			@Override
-			public void test() throws Exception {
-				assertEquals("The test file \"" + testUri
-						+ "\" cannot be found", true,
-						new File(testUri).exists());
-			}
-		});
+		if (!testUri.startsWith("http://") && !testUri.startsWith("https://")) {
+			addTest(new TestCase("Read the test file") {
+				@Override
+				public void test() throws Exception {
+					assertEquals("The test file \"" + testUri
+							+ "\" cannot be found", true,
+							new File(testUri).exists());
+				}
+			});
+		}
 
 		addTest(new TestCase("Assure directories exist") {
 			@Override
@@ -71,13 +74,28 @@ class ConversionTest extends TestLauncher {
 	@Override
 	protected void start() throws Exception {
 		skipCompare = new HashMap<String, List<String>>();
-		skipCompare.put("epb.ncx",
-				Arrays.asList("		<meta name=\"dtb:uid\" content="));
+		skipCompareCross = new HashMap<String, List<String>>();
+
+		skipCompare.put("epb.ncx", Arrays.asList(
+				"		<meta name=\"dtb:uid\" content=",
+				"		<meta name=\"epub-creator\" 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(".info", Arrays.asList("CREATION_DATE=",
+				"URL=\"file:/", "UUID=EPUBCREATOR=\"", ""));
 		skipCompare.put("URL", Arrays.asList("file:/"));
+
+		for (String key : skipCompare.keySet()) {
+			skipCompareCross.put(key, skipCompare.get(key));
+		}
+
+		skipCompareCross.put(".info", Arrays.asList(""));
+		skipCompareCross.put("epb.opf", Arrays.asList("      <dc:"));
+		skipCompareCross.put("title.xhtml",
+				Arrays.asList("			<div class=\"type\">"));
+		skipCompareCross.put("index.html",
+				Arrays.asList("			<div class=\"type\">"));
+		skipCompareCross.put("URL", Arrays.asList(""));
 	}
 
 	@Override
@@ -105,6 +123,7 @@ class ConversionTest extends TestLauncher {
 				for (BasicOutput.OutputType crossType : realTypes) {
 					File crossDir = Test.tempFiles
 							.createTempDir("cross-result");
+
 					generate(this, target.getAbsolutePath(), crossDir,
 							crossType);
 					compareFiles(this, new File(resultDir), crossDir,
@@ -119,8 +138,8 @@ class ConversionTest extends TestLauncher {
 			BasicOutput.OutputType type) throws Exception {
 		final List<String> errors = new ArrayList<String>();
 
-		TraceHandler previousTraceHandler = Instance.getTraceHandler();
-		Instance.setTraceHandler(new TraceHandler(true, true, 0) {
+		TraceHandler previousTraceHandler = Instance.getInstance().getTraceHandler();
+		Instance.getInstance().setTraceHandler(new TraceHandler(true, true, 0) {
 			@Override
 			public void error(String message) {
 				errors.add(message);
@@ -159,13 +178,17 @@ class ConversionTest extends TestLauncher {
 
 			return target;
 		} finally {
-			Instance.setTraceHandler(previousTraceHandler);
+			Instance.getInstance().setTraceHandler(previousTraceHandler);
 		}
 	}
 
 	private void compareFiles(TestCase testCase, File expectedDir,
 			File resultDir, final BasicOutput.OutputType limitTiFiles,
 			final String errMess) throws Exception {
+
+		Map<String, List<String>> skipCompare = errMess.startsWith("Cross") ? this.skipCompareCross
+				: this.skipCompare;
+
 		FilenameFilter filter = null;
 		if (limitTiFiles != null) {
 			filter = new FilenameFilter() {