X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FTest.java;h=614cec14ea2609f45bc9af7c2b09e6a48f7445a3;hb=2aac79c740789071ad9b773d25f20e103f0da86c;hp=2eaeff061642d0e5e4e833efc384ed7077399df2;hpb=92fb0719f84f5b6734b51e528332546d78e9ccec;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/test/Test.java b/src/be/nikiroo/fanfix/test/Test.java
index 2eaeff0..614cec1 100644
--- a/src/be/nikiroo/fanfix/test/Test.java
+++ b/src/be/nikiroo/fanfix/test/Test.java
@@ -1,5 +1,15 @@
 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.ConfigBundle;
+import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.TempFiles;
+import be.nikiroo.utils.resources.Bundles;
 import be.nikiroo.utils.test.TestLauncher;
 
 /**
@@ -8,8 +18,24 @@ 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 (empty: all tests were moved to nikiroo-utils...)", args);
+		super("Fanfix", args);
+		Instance.setTraceHandler(null);
+		addSeries(new BasicSupportTest(args));
+		addSeries(new LibraryTest(args));
+		addSeries(new ConversionTest(args));
 	}
 
 	/**
@@ -17,8 +43,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) {
-		System.exit(new Test(args).launch());
+	static public void main(String[] args) throws IOException {
+		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);
 	}
 }