X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FConversionTest.java;h=2b22364dca5241049420bd05bc09c740e48841c5;hb=HEAD;hp=607f49ba744b955eba4bf21796ee54b03b9ba9a4;hpb=9892fdaafb368227aa9630ab3abe6ed10bb1d001;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/test/ConversionTest.java b/src/be/nikiroo/fanfix/test/ConversionTest.java
index 607f49b..2b22364 100644
--- a/src/be/nikiroo/fanfix/test/ConversionTest.java
+++ b/src/be/nikiroo/fanfix/test/ConversionTest.java
@@ -12,12 +12,22 @@ import java.util.Map.Entry;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.Main;
 import be.nikiroo.fanfix.output.BasicOutput;
+import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.TraceHandler;
 import be.nikiroo.utils.test.TestCase;
 import be.nikiroo.utils.test.TestLauncher;
 
 class ConversionTest extends TestLauncher {
+	private class MainWithConvert extends Main {
+		@Override
+		public int convert(String urlString, OutputType type, String target,
+				boolean infoCover, Progress pg) {
+			return super.convert(urlString, type, target, infoCover, pg);
+		}
+	}
+	
 	private String testUri;
 	private String expectedDir;
 	private String resultDir;
@@ -138,8 +148,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);
@@ -161,7 +171,7 @@ class ConversionTest extends TestLauncher {
 
 		try {
 			File target = new File(resultDir, type.toString());
-			int code = Main.convert(testUri, type.toString(),
+			int code = new MainWithConvert().convert(testUri, type,
 					target.getAbsolutePath(), false, null);
 
 			String error = "";
@@ -178,7 +188,7 @@ class ConversionTest extends TestLauncher {
 
 			return target;
 		} finally {
-			Instance.setTraceHandler(previousTraceHandler);
+			Instance.getInstance().setTraceHandler(previousTraceHandler);
 		}
 	}