open conversion test for external input
authorNiki Roo <niki@nikiroo.be>
Tue, 17 Sep 2019 16:23:18 +0000 (18:23 +0200)
committerNiki Roo <niki@nikiroo.be>
Tue, 17 Sep 2019 16:23:18 +0000 (18:23 +0200)
12 files changed:
src/be/nikiroo/fanfix/test/ConversionTest.java
src/be/nikiroo/fanfix/test/Test.java
test/expected_test.story/cbz.cbz [moved from test/expected/cbz.cbz with 100% similarity]
test/expected_test.story/epub.epub [moved from test/expected/epub.epub with 100% similarity]
test/expected_test.story/html/html.info [moved from test/expected/html/html.info with 100% similarity]
test/expected_test.story/html/html.txt [moved from test/expected/html/html.txt with 100% similarity]
test/expected_test.story/html/index.html [moved from test/expected/html/index.html with 100% similarity]
test/expected_test.story/html/style.css [moved from test/expected/html/style.css with 100% similarity]
test/expected_test.story/info_text [moved from test/expected/info_text with 100% similarity]
test/expected_test.story/info_text.info [moved from test/expected/info_text.info with 100% similarity]
test/expected_test.story/latex.tex [moved from test/expected/latex.tex with 100% similarity]
test/expected_test.story/text.txt [moved from test/expected/text.txt with 100% similarity]

index 0eb1eb04b95eef90cbd749901d673a966bee3144..371c05aa25060a45cbb63e727a8c76b33d126c50 100644 (file)
@@ -18,15 +18,20 @@ import be.nikiroo.utils.test.TestCase;
 import be.nikiroo.utils.test.TestLauncher;
 
 class ConversionTest extends TestLauncher {
-       private File testFile;
-       private File expectedDir;
-       private File resultDir;
+       private String testUri;
+       private String expectedDir;
+       private String resultDir;
        private List<BasicOutput.OutputType> realTypes;
        private Map<String, List<String>> skipCompare;
 
-       public ConversionTest(String[] args) {
+       public ConversionTest(final String testUri, final String expectedDir,
+                       final String resultDir, String[] args) {
                super("Conversion", args);
 
+               this.testUri = testUri;
+               this.expectedDir = expectedDir;
+               this.resultDir = resultDir;
+
                // Special mode SYSOUT is not a file type (System.out)
                realTypes = new ArrayList<BasicOutput.OutputType>();
                for (BasicOutput.OutputType type : BasicOutput.OutputType.values()) {
@@ -38,20 +43,23 @@ class ConversionTest extends TestLauncher {
                addTest(new TestCase("Read the test file") {
                        @Override
                        public void test() throws Exception {
-                               assertEquals("The test file \"" + testFile
-                                               + "\" cannot be found", true, testFile.exists());
+                               assertEquals("The test file \"" + testUri
+                                               + "\" cannot be found", true,
+                                               new File(testUri).exists());
                        }
                });
 
                addTest(new TestCase("Assure directories exist") {
                        @Override
                        public void test() throws Exception {
-                               expectedDir.mkdirs();
-                               resultDir.mkdirs();
+                               new File(expectedDir).mkdirs();
+                               new File(resultDir).mkdirs();
                                assertEquals("The Expected directory \"" + expectedDir
-                                               + "\" cannot be created", true, expectedDir.exists());
+                                               + "\" cannot be created", true,
+                                               new File(expectedDir).exists());
                                assertEquals("The Result directory \"" + resultDir
-                                               + "\" cannot be created", true, resultDir.exists());
+                                               + "\" cannot be created", true,
+                                               new File(resultDir).exists());
                        }
                });
 
@@ -62,10 +70,6 @@ class ConversionTest extends TestLauncher {
 
        @Override
        protected void start() throws Exception {
-               testFile = new File("test/test.story");
-               expectedDir = new File("test/expected/");
-               resultDir = new File("test/result/");
-
                skipCompare = new HashMap<String, List<String>>();
                skipCompare.put("epb.ncx",
                                Arrays.asList("         <meta name=\"dtb:uid\" content="));
@@ -84,13 +88,13 @@ class ConversionTest extends TestLauncher {
                return new TestCase(type + " output mode") {
                        @Override
                        public void test() throws Exception {
-                               File target = generate(this, testFile, resultDir, type);
+                               File target = generate(this, testUri, new File(resultDir), type);
                                target = new File(target.getAbsolutePath()
                                                + type.getDefaultExtension(false));
 
                                // Check conversion:
-                               compareFiles(this, expectedDir, resultDir, type, "Generate "
-                                               + type);
+                               compareFiles(this, new File(expectedDir), new File(resultDir),
+                                               type, "Generate " + type);
 
                                // LATEX not supported as input
                                if (BasicOutput.OutputType.LATEX.equals(type)) {
@@ -101,16 +105,17 @@ class ConversionTest extends TestLauncher {
                                for (BasicOutput.OutputType crossType : realTypes) {
                                        File crossDir = Test.tempFiles
                                                        .createTempDir("cross-result");
-                                       generate(this, target, crossDir, crossType);
-                                       compareFiles(this, resultDir, crossDir, crossType,
-                                                       "Cross compare " + crossType + " generated from "
-                                                                       + type);
+                                       generate(this, target.getAbsolutePath(), crossDir,
+                                                       crossType);
+                                       compareFiles(this, new File(resultDir), crossDir,
+                                                       crossType, "Cross compare " + crossType
+                                                                       + " generated from " + type);
                                }
                        }
                };
        }
 
-       private File generate(TestCase testCase, File testFile, File resultDir,
+       private File generate(TestCase testCase, String testUri, File resultDir,
                        BasicOutput.OutputType type) throws Exception {
                final List<String> errors = new ArrayList<String>();
 
@@ -137,8 +142,8 @@ class ConversionTest extends TestLauncher {
 
                try {
                        File target = new File(resultDir, type.toString());
-                       int code = Main.convert(testFile.getAbsolutePath(),
-                                       type.toString(), target.getAbsolutePath(), false, null);
+                       int code = Main.convert(testUri, type.toString(),
+                                       target.getAbsolutePath(), false, null);
 
                        String error = "";
                        for (String err : errors) {
index 8ca8b7ca1f09a73fc09e15f7e13ad25f0c7ec9ee..7aac0cebd78cae0cc1b8bbc7788e52981986fef3 100644 (file)
@@ -18,6 +18,17 @@ 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.
         */
@@ -29,14 +40,40 @@ public class Test extends 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 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 (file.getName().endsWith(".url")) {
+                                       uri = IOUtils.readSmallFile(file).trim();
+                               } else if (file.getName().endsWith(".story")) {
+                                       uri = file.getAbsolutePath();
+                               } else {
+                                       continue;
+                               }
+
+                               addSeries(new ConversionTest(uri, expectedDir, resultDir, args));
+                       }
+               }
        }
 
        /**
@@ -49,20 +86,33 @@ 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();
+
+               // 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 {
                        File tmpConfig = tempFiles.createTempDir("fanfix-config");
-                       File tmpCache = tempFiles.createTempDir("fanfix-cache");
+                       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", tmpCache.getAbsolutePath());
+                               props.setProperty("CACHE_DIR", localCache.getAbsolutePath());
                                props.store(out, null);
                        } finally {
                                if (out != null) {
@@ -76,10 +126,13 @@ public class Test extends TestLauncher {
 
                        System.setProperty("CONFIG_DIR", tmpConfig.getAbsolutePath());
 
-                       result = new Test(args).launch();
+                       TestLauncher tests = new Test(args);
+                       tests.setDetails(verbose);
+
+                       result = tests.launch();
 
                        IOUtils.deltree(tmpConfig);
-                       IOUtils.deltree(tmpCache);
+                       IOUtils.deltree(localCache);
                } finally {
                        // Test temp files
                        tempFiles.close();