ripperstest java.nio

Author: soloturn

src/test/java/com/rarchives/ripme/tst/ripper/rippers/RippersTest.java

@@ -1,11 +1,8 @@
 package com.rarchives.ripme.tst.ripper.rippers;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
+import com.rarchives.ripme.ripper.AbstractRipper;
 import com.rarchives.ripme.ripper.rippers.ChanRipper;
-
+import com.rarchives.ripme.utils.Utils;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -14,8 +11,12 @@
 import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.junit.jupiter.api.Assertions;
 
-import com.rarchives.ripme.ripper.AbstractRipper;
-import com.rarchives.ripme.utils.Utils;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * Contains helper methods for testing rippers.
@@ -41,12 +42,13 @@ void testRipper(AbstractRipper ripper) {
             ripper.rip();
             if (logger.isTraceEnabled()) {
                 logger.trace("working dir: " + ripper.getWorkingDir());
-                logger.trace("list files: " + ripper.getWorkingDir().listFiles().length);
-                for (int i = 0; i < ripper.getWorkingDir().listFiles().length; i++) {
-                    logger.trace("   " + ripper.getWorkingDir().listFiles()[i]);
+                File wd = ripper.getWorkingDir().toFile();
+                logger.trace("list files: " + wd.listFiles().length);
+                for (int i = 0; i < wd.listFiles().length; i++) {
+                    logger.trace("   " + wd.listFiles()[i]);
                 }
             }
-            Assertions.assertTrue(ripper.getWorkingDir().listFiles().length >= 1,
+            Assertions.assertFalse(isEmpty(ripper.getWorkingDir()),
                     "Failed to download a single file from " + ripper.getURL());
         } catch (IOException e) {
             if (e.getMessage().contains("Ripping interrupted")) {
@@ -97,7 +99,8 @@ void testChanRipper(ChanRipper ripper) {
             "txt", "log", "php" };
 
     /** Recursively deletes a directory */
-    void deleteDir(File dir) {
+    void deleteDir(Path folder) {
+        File dir = folder.toFile();
         if (!dir.getName().contains("_")) {
             // All ripped albums contain an underscore
             // Don't delete an album if it doesn't have an underscore
@@ -113,15 +116,16 @@ void deleteDir(File dir) {
                 return;
             }
             if (f.isDirectory()) {
-                deleteDir(f);
+                deleteDir(f.toPath());
             }
             f.delete();
         }
         dir.delete();
     }
 
-    void deleteSubdirs(File workingDir) {
-        for (File f : workingDir.listFiles()) {
+    void deleteSubdirs(Path workingDir) {
+        File wd = workingDir.toFile();
+        for (File f : wd.listFiles()) {
             if (f.isDirectory()) {
                 for (File sf : f.listFiles()) {
                     logger.debug("Deleting " + sf);
@@ -133,4 +137,12 @@ void deleteSubdirs(File workingDir) {
         }
     }
 
+    private boolean isEmpty(Path path) throws IOException {
+        if (Files.isDirectory(path)) {
+            try (Stream<Path> entries = Files.list(path)) {
+                return !entries.findFirst().isPresent();
+            }
+        }
+        return false;
+    }
 }