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

diff --git a/src/be/nikiroo/fanfix/test/ConversionTest.java b/src/be/nikiroo/fanfix/test/ConversionTest.java
index 035a848..d730b3b 100644
--- a/src/be/nikiroo/fanfix/test/ConversionTest.java
+++ b/src/be/nikiroo/fanfix/test/ConversionTest.java
@@ -75,15 +75,16 @@ class ConversionTest extends TestLauncher {
 	protected void start() throws Exception {
 		skipCompare = new HashMap<String, List<String>>();
 		skipCompareCross = new HashMap<String, List<String>>();
-		
-		skipCompare.put("epb.ncx",
-				Arrays.asList("		<meta name=\"dtb:uid\" content="));
+
+		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=", "URL=\"file:/", "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));
 		}
@@ -137,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);
@@ -177,7 +178,7 @@ class ConversionTest extends TestLauncher {
 
 			return target;
 		} finally {
-			Instance.setTraceHandler(previousTraceHandler);
+			Instance.getInstance().setTraceHandler(previousTraceHandler);
 		}
 	}