X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FTest.java;h=5ec24a43b1b6a0eee8ba68991c9b2fe9d86c2c7b;hp=7aac0cebd78cae0cc1b8bbc7788e52981986fef3;hb=HEAD;hpb=dabc4b957b52302c39cb6d07c6c91a1f91195d5a

diff --git a/src/be/nikiroo/fanfix/test/Test.java b/src/be/nikiroo/fanfix/test/Test.java
index 7aac0ce..5ec24a4 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;
@@ -19,11 +18,16 @@ import be.nikiroo.utils.test.TestLauncher;
  */
 public class Test extends TestLauncher {
 	//
-	// 3 files can control the test:
+	// 4 files can control the test:
 	// - test/VERBOSE: enable verbose mode
 	// - test/OFFLINE: to forbid any downloading
+	// - test/URLS: to allow testing URLs
 	// - test/FORCE_REFRESH: to force a clear of the cache
 	//
+	// Note that test/CACHE can be kept, as it will contain all internet related
+	// files you need (if you allow URLs, run the test once which will populate
+	// the CACHE then go OFFLINE, it will still work).
+	//
 	// The test files will be:
 	// - test/*.url: URL to download in text format, content = URL
 	// - test/*.story: text mode story, content = story
@@ -40,12 +44,14 @@ public class Test extends TestLauncher {
 	 * @param args
 	 *            the arguments to configure the number of columns and the ok/ko
 	 *            {@link String}s
+	 * @param urlsAllowed
+	 *            allow testing URLs (<tt>.url</tt> files)
 	 * 
 	 * @throws IOException
 	 */
-	public Test(String[] args) throws IOException {
+	public Test(String[] args, boolean urlsAllowed) throws IOException {
 		super("Fanfix", args);
-		Instance.setTraceHandler(null);
+		Instance.getInstance().setTraceHandler(null);
 		addSeries(new BasicSupportUtilitiesTest(args));
 		addSeries(new BasicSupportDeprecatedTest(args));
 		addSeries(new LibraryTest(args));
@@ -63,7 +69,7 @@ public class Test extends TestLauncher {
 						+ file.getName()).getAbsolutePath();
 
 				String uri;
-				if (file.getName().endsWith(".url")) {
+				if (urlsAllowed && file.getName().endsWith(".url")) {
 					uri = IOUtils.readSmallFile(file).trim();
 				} else if (file.getName().endsWith(".story")) {
 					uri = file.getAbsolutePath();
@@ -71,7 +77,8 @@ public class Test extends TestLauncher {
 					continue;
 				}
 
-				addSeries(new ConversionTest(uri, expectedDir, resultDir, args));
+				addSeries(new ConversionTest(file.getName(), uri, expectedDir,
+						resultDir, args));
 			}
 		}
 	}
@@ -93,54 +100,78 @@ public class Test extends TestLauncher {
 		// Can force refresh
 		boolean forceRefresh = new File("test/FORCE_REFRESH").exists();
 
+		// Allow URLs:
+		boolean urlsAllowed = new File("test/URLS").exists();
+
+		
 		// Only download files if allowed:
 		boolean offline = new File("test/OFFLINE").exists();
-		Instance.getCache().setOffline(offline);
+		Instance.getInstance().getCache().setOffline(offline);
+
 
+		
 		int result = 0;
 		tempFiles = new TempFiles("fanfix-test");
 		try {
 			File tmpConfig = tempFiles.createTempDir("fanfix-config");
 			File localCache = new File("test/CACHE");
-			if (forceRefresh) {
-				IOUtils.deltree(localCache);
-			}
-			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();
-				}
-			}
+			prepareCache(localCache, forceRefresh);
 
 			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());
 
-			TestLauncher tests = new Test(args);
+			Instance.init(true);
+			Instance.getInstance().getCache().setOffline(offline);
+
+			TestLauncher tests = new Test(args, urlsAllowed);
 			tests.setDetails(verbose);
 
 			result = tests.launch();
 
 			IOUtils.deltree(tmpConfig);
-			IOUtils.deltree(localCache);
+			prepareCache(localCache, forceRefresh);
 		} finally {
 			// Test temp files
 			tempFiles.close();
 
 			// This is usually done in Fanfix.Main:
-			Instance.getTempFiles().close();
+			Instance.getInstance().getTempFiles().close();
 		}
 
 		System.exit(result);
 	}
+
+	/**
+	 * Prepare the cache (or clean it up).
+	 * <p>
+	 * The cache directory will always exist if this method succeed
+	 * 
+	 * @param localCache
+	 *            the cache directory
+	 * @param forceRefresh
+	 *            TRUE to force acache refresh (delete all files)
+	 * 
+	 * @throw IOException if the cache cannot be created
+	 */
+	private static void prepareCache(File localCache, boolean forceRefresh)
+			throws IOException {
+		// if needed
+		localCache.mkdirs();
+
+		if (!localCache.isDirectory()) {
+			throw new IOException("Cannot get a cache");
+		}
+
+		// delete local cached files (_*) or all files if forceRefresh
+		for (File f : localCache.listFiles()) {
+			if (forceRefresh || f.getName().startsWith("_")) {
+				IOUtils.deltree(f);
+			}
+		}
+	}
 }