X-Git-Url: https://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Ftest%2FTest.java;h=5ec24a43b1b6a0eee8ba68991c9b2fe9d86c2c7b;hb=1dbed6237611f74292af13f20f9d80c446a60020;hp=8ca8b7ca1f09a73fc09e15f7e13ad25f0c7ec9ee;hpb=f1ce03f76073d9ba0777d0f47058d614577fbe2e;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/test/Test.java b/src/be/nikiroo/fanfix/test/Test.java index 8ca8b7c..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; @@ -18,6 +17,22 @@ import be.nikiroo.utils.test.TestLauncher; * @author niki */ public class Test extends TestLauncher { + // + // 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 + // + /** * The temporary files handler. */ @@ -29,14 +44,43 @@ 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 (.url files) + * + * @throws IOException */ - public Test(String[] args) { + 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)); - addSeries(new ConversionTest(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 (urlsAllowed && 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)); + } + } } /** @@ -49,45 +93,85 @@ public class Test extends TestLauncher { */ static public void main(String[] args) throws IOException { Instance.init(); - //Instance.getCache().setOffline(true); + + // Verbose mode: + boolean verbose = new File("test/VERBOSE").exists(); + + // 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.getInstance().getCache().setOffline(offline); + + 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(); - } - } + File localCache = new File("test/CACHE"); + 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()); - result = new Test(args).launch(); + 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(tmpCache); + 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). + *
+ * 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); + } + } + } }