X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FTest.java;fp=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FTest.java;h=35fdec164c5ab8252a7f4a9aa05d96790c14aa71;hp=7aac0cebd78cae0cc1b8bbc7788e52981986fef3;hb=06befaee4e5f7fc07017ed739f01df5a88f09635;hpb=4642806ae0cb3ba333e8a7ae3d856153323ef59c

diff --git a/src/be/nikiroo/fanfix/test/Test.java b/src/be/nikiroo/fanfix/test/Test.java
index 7aac0ce..35fdec1 100644
--- a/src/be/nikiroo/fanfix/test/Test.java
+++ b/src/be/nikiroo/fanfix/test/Test.java
@@ -1,11 +1,10 @@
 package be.nikiroo.fanfix.test;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Properties;
 
 import be.nikiroo.fanfix.Instance;
+import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.ConfigBundle;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.TempFiles;
@@ -49,7 +48,7 @@ public class Test extends TestLauncher {
 		addSeries(new BasicSupportUtilitiesTest(args));
 		addSeries(new BasicSupportDeprecatedTest(args));
 		addSeries(new LibraryTest(args));
-
+		
 		File sources = new File("test/");
 		if (sources.isDirectory()) {
 			for (File file : sources.listFiles()) {
@@ -71,7 +70,8 @@ public class Test extends TestLauncher {
 					continue;
 				}
 
-				addSeries(new ConversionTest(uri, expectedDir, resultDir, args));
+				addSeries(new ConversionTest(file.getName(), uri, expectedDir,
+						resultDir, args));
 			}
 		}
 	}
@@ -107,32 +107,23 @@ public class Test extends TestLauncher {
 			}
 			localCache.mkdirs();
 
-			FileOutputStream out = null;
-			try {
-				out = new FileOutputStream(new File(tmpConfig,
-						"config.properties"));
-				Properties props = new Properties();
-				props.setProperty("CACHE_DIR", localCache.getAbsolutePath());
-				props.store(out, null);
-			} finally {
-				if (out != null) {
-					out.close();
-				}
-			}
-
 			ConfigBundle config = new ConfigBundle();
 			Bundles.setDirectory(tmpConfig.getAbsolutePath());
+			config.setString(Config.CACHE_DIR, localCache.getAbsolutePath());
+			config.setInteger(Config.CACHE_MAX_TIME_STABLE, -1);
+			config.setInteger(Config.CACHE_MAX_TIME_CHANGING, -1);
 			config.updateFile(tmpConfig.getPath());
-
 			System.setProperty("CONFIG_DIR", tmpConfig.getAbsolutePath());
 
+			Instance.init(true);
+			Instance.getCache().setOffline(offline);
+
 			TestLauncher tests = new Test(args);
 			tests.setDetails(verbose);
 
 			result = tests.launch();
 
 			IOUtils.deltree(tmpConfig);
-			IOUtils.deltree(localCache);
 		} finally {
 			// Test temp files
 			tempFiles.close();