Use Files.list() in fuzz tests

jhy · Jul 23, 2024 · 2915f88 · 2915f88
1 parent dcf190c
commit 2915f88
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 28 deletions.
diff --git a/src/test/java/org/jsoup/integration/FuzzFixesIT.java b/src/test/java/org/jsoup/integration/FuzzFixesIT.java
@@ -8,8 +8,9 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -22,40 +23,36 @@
 public class FuzzFixesIT {
     static int numIters = 50;
     static int timeout = 30; // external fuzzer is set to 60 for 100 runs
-    static File testDir = ParseTest.getFile("/fuzztests/");
+    static Path testDir = ParseTest.getPath("/fuzztests/");
 
-    private static Stream<File> testFiles() {
-        File[] files = testDir.listFiles();
-        assertNotNull(files);
-        assertTrue(files.length > 10);
-
-        return Stream.of(files);
+    private static Stream<Path> testPaths() throws IOException {
+        return Files.list(testDir);
     }
 
     @Disabled // disabled, as these soak up build time and the outcome oughtn't change unless we are refactoring the tree builders. manually execute as desired.
     @ParameterizedTest
-    @MethodSource("testFiles")
-    void testHtmlParse(File file) throws IOException {
+    @MethodSource("testPaths")
+    void testHtmlParse(Path path) throws IOException {
         long startTime = System.currentTimeMillis();
         long completeBy = startTime + timeout * 1000L;
 
         for (int i = 0; i < numIters; i++) {
-            Document doc = Jsoup.parse(file, "UTF-8", "https://example.com/");
+            Document doc = Jsoup.parse(path, "UTF-8", "https://example.com/");
             assertNotNull(doc);
             if (System.currentTimeMillis() > completeBy)
-                Assertions.fail(String.format("Timeout: only completed %d iters of [%s] in %d seconds", i, file.getName(), timeout));
+                Assertions.fail(String.format("Timeout: only completed %d iters of [%s] in %d seconds", i, path.getFileName(), timeout));
         }
     }
 
     @Disabled // disabled, as these soak up build time and the outcome oughtn't change unless we are refactoring the tree builders. manually execute as desired.
     @ParameterizedTest
-    @MethodSource("testFiles")
-    void testXmlParse(File file) throws IOException {
+    @MethodSource("testPaths")
+    void testXmlParse(Path path) throws IOException {
         long startTime = System.currentTimeMillis();
         long completeBy = startTime + timeout * 1000L;
 
         for (int i = 0; i < numIters; i++) {
-            Document doc = Jsoup.parse(file, "UTF-8", "https://example.com/", Parser.xmlParser());
+            Document doc = Jsoup.parse(path, "UTF-8", "https://example.com/", Parser.xmlParser());
             assertNotNull(doc);
             if (System.currentTimeMillis() > completeBy)
                 Assertions.fail(String.format("Timeout: only completed %d iters of [%s] in %d seconds", i, file.getName(), timeout));

diff --git a/src/test/java/org/jsoup/integration/FuzzFixesTest.java b/src/test/java/org/jsoup/integration/FuzzFixesTest.java
@@ -7,8 +7,9 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -20,12 +21,8 @@
  */
 public class FuzzFixesTest {
 
-    private static Stream<File> testFiles() {
-        File[] files = FuzzFixesIT.testDir.listFiles();
-        assertNotNull(files);
-        assertTrue(files.length > 10);
-
-        return Stream.of(files);
+    private static Stream<Path> testPaths() throws IOException {
+        return Files.list(FuzzFixesIT.testDir);
     }
 
     @Test
@@ -48,16 +45,16 @@ public void bookmark() {
     }
 
     @ParameterizedTest
-    @MethodSource("testFiles")
-    void testHtmlParse(File file) throws IOException {
-        Document doc = Jsoup.parse(file, "UTF-8", "https://example.com/");
+    @MethodSource("testPaths")
+    void testHtmlParse(Path path) throws IOException {
+        Document doc = Jsoup.parse(path, "UTF-8", "https://example.com/");
         assertNotNull(doc);
     }
 
     @ParameterizedTest
-    @MethodSource("testFiles")
-    void testXmlParse(File file) throws IOException {
-        Document doc = Jsoup.parse(file, "UTF-8", "https://example.com/", Parser.xmlParser());
+    @MethodSource("testPaths")
+    void testXmlParse(Path path) throws IOException {
+        Document doc = Jsoup.parse(path, "UTF-8", "https://example.com/", Parser.xmlParser());
         assertNotNull(doc);
     }
 }