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

diff --git a/src/be/nikiroo/fanfix/test/Test.java b/src/be/nikiroo/fanfix/test/Test.java
index c5d852d..35fdec1 100644
--- a/src/be/nikiroo/fanfix/test/Test.java
+++ b/src/be/nikiroo/fanfix/test/Test.java
@@ -1,13 +1,13 @@
 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;
 import be.nikiroo.utils.resources.Bundles;
 import be.nikiroo.utils.test.TestLauncher;
 
@@ -17,18 +17,63 @@ import be.nikiroo.utils.test.TestLauncher;
  * @author niki
  */
 public class Test extends TestLauncher {
+	//
+	// 3 files can control the test:
+	// - test/VERBOSE: enable verbose mode
+	// - test/OFFLINE: to forbid any downloading
+	// - test/FORCE_REFRESH: to force a clear of the cache
+	//
+	// The test files will be:
+	// - test/*.url: URL to download in text format, content = URL
+	// - test/*.story: text mode story, content = story
+	//
+
+	/**
+	 * 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
+	 * 
+	 * @throws IOException
 	 */
-	public Test(String[] args) {
+	public Test(String[] args) throws IOException {
 		super("Fanfix", args);
 		Instance.setTraceHandler(null);
-		addSeries(new BasicSupportTest(args));
+		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()) {
+				if (file.isDirectory()) {
+					continue;
+				}
+
+				String expectedDir = new File(file.getParentFile(), "expected_"
+						+ file.getName()).getAbsolutePath();
+				String resultDir = new File(file.getParentFile(), "result_"
+						+ file.getName()).getAbsolutePath();
+
+				String uri;
+				if (file.getName().endsWith(".url")) {
+					uri = IOUtils.readSmallFile(file).trim();
+				} else if (file.getName().endsWith(".story")) {
+					uri = file.getAbsolutePath();
+				} else {
+					continue;
+				}
+
+				addSeries(new ConversionTest(file.getName(), uri, expectedDir,
+						resultDir, args));
+			}
+		}
 	}
 
 	/**
@@ -40,35 +85,52 @@ public class Test extends TestLauncher {
 	 *             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 = null;
+		Instance.init();
+
+		// Verbose mode:
+		boolean verbose = new File("test/VERBOSE").exists();
+
+		// Can force refresh
+		boolean forceRefresh = new File("test/FORCE_REFRESH").exists();
+
+		// Only download files if allowed:
+		boolean offline = new File("test/OFFLINE").exists();
+		Instance.getCache().setOffline(offline);
+
+		int result = 0;
+		tempFiles = new TempFiles("fanfix-test");
 		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();
+			File tmpConfig = tempFiles.createTempDir("fanfix-config");
+			File localCache = new File("test/CACHE");
+			if (forceRefresh) {
+				IOUtils.deltree(localCache);
 			}
-		}
+			localCache.mkdirs();
+
+			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());
 
-		ConfigBundle config = new ConfigBundle();
-		Bundles.setDirectory(tmpConfig.getAbsolutePath());
-		config.updateFile(tmpConfig.getPath());
+			Instance.init(true);
+			Instance.getCache().setOffline(offline);
 
-		System.setProperty("CONFIG_DIR", tmpConfig.getAbsolutePath());
+			TestLauncher tests = new Test(args);
+			tests.setDetails(verbose);
 
-		int result = new Test(args).launch();
+			result = tests.launch();
 
-		IOUtils.deltree(tmpConfig);
-		IOUtils.deltree(tmpCache);
+			IOUtils.deltree(tmpConfig);
+		} finally {
+			// Test temp files
+			tempFiles.close();
+
+			// This is usually done in Fanfix.Main:
+			Instance.getTempFiles().close();
+		}
 
 		System.exit(result);
 	}