X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FTest.java;h=05edcb0965cbbbca08b9ab770ce62b84273dda22;hp=0dc544b8d71d93ba4a74b9fdd903b81ecfb19d50;hb=8d59ce0748baeeea0458bab49716ab4543aae439;hpb=581d42c09b2673025e719a25477565362ebf4482

diff --git a/src/be/nikiroo/fanfix/test/Test.java b/src/be/nikiroo/fanfix/test/Test.java
index 0dc544b..05edcb0 100644
--- a/src/be/nikiroo/fanfix/test/Test.java
+++ b/src/be/nikiroo/fanfix/test/Test.java
@@ -8,6 +8,7 @@ import java.util.Properties;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.ConfigBundle;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.TempFiles;
 import be.nikiroo.utils.resources.Bundles;
 import be.nikiroo.utils.test.TestLauncher;
 
@@ -17,11 +18,25 @@ import be.nikiroo.utils.test.TestLauncher;
  * @author niki
  */
 public class Test extends TestLauncher {
+	/**
+	 * The temporary files handler.
+	 */
+	static TempFiles tempFiles;
+
+	/**
+	 * Create the Fanfix {@link TestLauncher}.
+	 * 
+	 * @param args
+	 *            the arguments to configure the number of columns and the ok/ko
+	 *            {@link String}s
+	 */
 	public Test(String[] args) {
 		super("Fanfix", args);
 		Instance.setTraceHandler(null);
-		addSeries(new BasicSupportTest(args));
+		addSeries(new BasicSupportUtilitiesTest(args));
+		addSeries(new BasicSupportDeprecatedTest(args));
 		addSeries(new LibraryTest(args));
+		addSeries(new ConversionTest(args));
 	}
 
 	/**
@@ -30,32 +45,47 @@ public class Test extends TestLauncher {
 	 * @param args
 	 *            the arguments passed to the {@link TestLauncher}s.
 	 * @throws IOException
+	 *             in case of I/O error
 	 */
 	static public void main(String[] args) throws IOException {
-		File tmpConfig = File.createTempFile("fanfix-config_", ".test");
-		File tmpCache = File.createTempFile("fanfix-cache_", ".test");
-		tmpConfig.delete();
-		tmpConfig.mkdir();
-		tmpCache.delete();
-		tmpCache.mkdir();
-
-		FileOutputStream out = new FileOutputStream(new File(tmpConfig,
-				"config.properties"));
-		Properties props = new Properties();
-		props.setProperty("CACHE_DIR", tmpCache.getAbsolutePath());
-		props.store(out, null);
-		out.close();
-
-		ConfigBundle config = new ConfigBundle();
-		Bundles.setDirectory(tmpConfig.getAbsolutePath());
-		config.updateFile(tmpConfig.getPath());
-
-		System.setProperty("CONFIG_DIR", tmpConfig.getAbsolutePath());
-
-		int result = new Test(args).launch();
-
-		IOUtils.deltree(tmpConfig);
-		IOUtils.deltree(tmpCache);
+		Instance.init();
+		
+		int result = 0;
+		tempFiles = new TempFiles("fanfix-test");
+		try {
+			File tmpConfig = tempFiles.createTempDir("fanfix-config");
+			File tmpCache = tempFiles.createTempDir("fanfix-cache");
+
+			FileOutputStream out = null;
+			try {
+				out = new FileOutputStream(new File(tmpConfig,
+						"config.properties"));
+				Properties props = new Properties();
+				props.setProperty("CACHE_DIR", tmpCache.getAbsolutePath());
+				props.store(out, null);
+			} finally {
+				if (out != null) {
+					out.close();
+				}
+			}
+
+			ConfigBundle config = new ConfigBundle();
+			Bundles.setDirectory(tmpConfig.getAbsolutePath());
+			config.updateFile(tmpConfig.getPath());
+
+			System.setProperty("CONFIG_DIR", tmpConfig.getAbsolutePath());
+
+			result = new Test(args).launch();
+
+			IOUtils.deltree(tmpConfig);
+			IOUtils.deltree(tmpCache);
+		} finally {
+			// Test temp files
+			tempFiles.close();
+
+			// This is usually done in Fanfix.Main:
+			Instance.getTempFiles().close();
+		}
 
 		System.exit(result);
 	}