Add Html5libTest

Author: anthonyvdotbe

test-src/nu/validator/htmlparser/test/EncodingTester.java

@@ -39,7 +39,7 @@ public class EncodingTester {
 
     protected static int SNIFFING_LIMIT = 16384;
 
-    private static int exitStatus = 0;
+    static int exitStatus = 0;
 
     private final InputStream aggregateStream;
 
@@ -59,7 +59,7 @@ public EncodingTester() {
         this.aggregateStream = null;
     }
 
-    private void runTests() throws IOException, SAXException {
+    void runTests() throws IOException, SAXException {
         while (runTest()) {
             // spin
         }

test-src/nu/validator/htmlparser/test/Html5libTest.java

@@ -0,0 +1,87 @@
+package nu.validator.htmlparser.test;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.function.Consumer;
+
+public class Html5libTest {
+
+    private final Path testDir;
+
+    public Html5libTest() throws URISyntaxException {
+        this.testDir = Path.of(Html5libTest.class.getResource("/html5lib-tests").toURI());
+    }
+
+    public void testEncoding() throws Exception {
+        Files.walkFileTree(testDir.resolve("encoding"), new TestVisitor(true, false, file -> new EncodingTester(Files.newInputStream(file)).runTests()));
+        if(EncodingTester.exitStatus != 0) {
+            assert false : "Encoding test failed";
+        }
+    }
+
+    public void testTokenizer() throws Exception {
+        Files.walkFileTree(testDir.resolve("tokenizer"), new TestVisitor(true, true, file -> new TokenizerTester(null).test(file.toString())));
+        if(TokenizerTester.exitStatus != 0) {
+            assert false : "Tokenizer test failed";
+        }
+    }
+
+    public void testTree() throws Exception {
+        TreeTester tester = new TreeTester();
+        Files.walkFileTree(testDir.resolve("tree-construction"), new TestVisitor(true, false, file -> tester.runTests(file.toString())));
+        if(TreeTester.exitStatus != 0) {
+            assert false : "Tree test failed";
+        }
+    }
+
+    private interface TestConsumer extends Consumer<Path> {
+
+        @Override
+        default void accept(Path t) {
+            try {
+                acceptTest(t);
+            } catch(Throwable e) {
+                throw new AssertionError(e);
+            }
+        }
+
+        void acceptTest(Path t) throws Throwable;
+
+    }
+
+    private static class TestVisitor extends SimpleFileVisitor<Path> {
+
+        private final boolean skipScripted;
+        private final boolean requireTestExtension;
+        private final TestConsumer runner;
+
+        private TestVisitor(boolean skipScripted, boolean requireTestExtension, TestConsumer runner) {
+            this.skipScripted = skipScripted;
+            this.requireTestExtension = requireTestExtension;
+            this.runner = runner;
+        }
+
+        @Override
+        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+            if (skipScripted && dir.getFileName().equals(Path.of("scripted"))) {
+                return FileVisitResult.SKIP_SUBTREE;
+            }
+
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+            if (!requireTestExtension || file.getFileName().toString().endsWith(".test")) {
+                runner.accept(file);
+            }
+            return FileVisitResult.CONTINUE;
+        }
+    }
+
+}

test-src/nu/validator/htmlparser/test/TokenizerTester.java

@@ -56,7 +56,7 @@
 
 public class TokenizerTester {
 
-    private static int exitStatus = 0;
+    static int exitStatus = 0;
 
     private static JSONString PLAINTEXT = new JSONString("PLAINTEXT state");
 
@@ -102,7 +102,7 @@ private static boolean jsonDeepEquals(JSONValue one, JSONValue other) {
 
     private final Writer writer;
 
-    private TokenizerTester(InputStream stream) throws TokenStreamException,
+    TokenizerTester(InputStream stream) throws TokenStreamException,
             RecognitionException, UnsupportedEncodingException {
         tests = null;
         tokenHandler = new JSONArrayTokenHandler();
@@ -226,7 +226,7 @@ private void recurseDirectory(File directory) throws Throwable {
         }
     }
 
-    private void test(String file)
+    void test(String file)
             throws IOException, TokenStreamException, RecognitionException,
             SAXException {
         if (!file.endsWith(".test")) {

test-src/nu/validator/htmlparser/test/TreeTester.java

@@ -44,7 +44,7 @@ public class TreeTester {
 
     private boolean streaming = false;
 
-    private static int exitStatus = 0;
+    static int exitStatus = 0;
 
     /**
      * @param aggregateStream
@@ -53,7 +53,7 @@ public TreeTester() {
         this.aggregateStream = null;
     }
 
-    private void runTests(String filename) throws Throwable {
+    void runTests(String filename) throws Throwable {
         if (!filename.endsWith(".dat")) {
             return;
         }