Add TestRepository.createExternal() and bolster its purgeData()

Author: idodeclare

opengrok-indexer/src/test/java/org/opengrok/indexer/util/FileUtilities.java

@@ -81,15 +81,15 @@ public static void extractArchive(File sourceBundle, File root) throws IOExcepti
         }
     }
 
-    public static void removeDirs(File root) {
+    public static boolean removeDirs(File root) {
         for (File f : root.listFiles()) {
             if (f.isDirectory()) {
                 removeDirs(f);
             } else {
                 f.delete();
             }
         }
-        root.delete();
+        return root.delete();
     }
 
     public static void copyFile(InputStream in, OutputStream out) throws IOException {

opengrok-indexer/src/test/java/org/opengrok/indexer/util/TestRepository.java

@@ -19,10 +19,11 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2018-2019, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.util;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -41,52 +42,54 @@
  */
 public class TestRepository {
 
+    private final RuntimeEnvironment env;
     private File sourceRoot;
     private File dataRoot;
+    private File externalRoot;
+
+    public TestRepository() {
+        env = RuntimeEnvironment.getInstance();
+    }
 
     public void createEmpty() throws IOException {
-        RuntimeEnvironment env = RuntimeEnvironment.getInstance();
         sourceRoot = Files.createTempDirectory("source").toFile();
         dataRoot = Files.createTempDirectory("data").toFile();
         env.setSourceRoot(sourceRoot.getAbsolutePath());
         env.setDataRoot(dataRoot.getAbsolutePath());
     }
 
     public void create(InputStream inputBundle) throws IOException {
-        File sourceBundle = null;
-        try {
-            sourceRoot = Files.createTempDirectory("source").toFile();
-            dataRoot = Files.createTempDirectory("data").toFile();
-            sourceBundle = File.createTempFile("srcbundle", ".zip");
-
-            if (sourceBundle.exists()) {
-                assertTrue(sourceBundle.delete());
-            }
+        createEmpty();
+        extractBundle(sourceRoot, inputBundle);
+    }
 
-            assertNotNull(inputBundle);
-            FileOutputStream out = new FileOutputStream(sourceBundle);
-            FileUtilities.copyFile(inputBundle, out);
-            out.close();
-            FileUtilities.extractArchive(sourceBundle, sourceRoot);
-            RuntimeEnvironment.getInstance().setSourceRoot(sourceRoot.getAbsolutePath());
-            RuntimeEnvironment.getInstance().setDataRoot(dataRoot.getAbsolutePath());
-        } finally {
-            if (sourceBundle != null) {
-                sourceBundle.delete();
-            }
-        }
+    public void createExternal(InputStream inputBundle) throws IOException {
+        createEmpty();
+        externalRoot = Files.createTempDirectory("external").toFile();
+        extractBundle(externalRoot, inputBundle);
     }
 
     public void destroy() {
         if (sourceRoot != null) {
             FileUtilities.removeDirs(sourceRoot);
         }
-        purgeData();
+        if (externalRoot != null) {
+            FileUtilities.removeDirs(externalRoot);
+        }
+        if (dataRoot != null) {
+            FileUtilities.removeDirs(dataRoot);
+        }
     }
 
+    /**
+     * Deletes the directory tree of {@link #getDataRoot()}, and then recreates
+     * the empty directory afterward.
+     */
     public void purgeData() {
         if (dataRoot != null) {
-            FileUtilities.removeDirs(dataRoot);
+            assertTrue("should delete dataRoot", FileUtilities.removeDirs(dataRoot));
+            assertFalse("dataRoot should not exist", dataRoot.exists());
+            assertTrue("should recreate dataRoot", dataRoot.mkdir());
         }
     }
 
@@ -98,6 +101,10 @@ public String getDataRoot() {
         return dataRoot.getAbsolutePath();
     }
 
+    public String getExternalRoot() {
+        return externalRoot == null ? null : externalRoot.getAbsolutePath();
+    }
+
     private final static String dummyFilename = "dummy.txt";
 
     public File addDummyFile(String project) throws IOException {
@@ -145,4 +152,24 @@ public File addAdhocFile(String filename, InputStream in, String project)
         }
         return adhoc;
     }
+
+    private void extractBundle(File target, InputStream inputBundle) throws IOException {
+        File sourceBundle = null;
+        try {
+            sourceBundle = File.createTempFile("srcbundle", ".zip");
+            if (sourceBundle.exists()) {
+                assertTrue(sourceBundle.delete());
+            }
+
+            assertNotNull("inputBundle should not be null", inputBundle);
+            FileOutputStream out = new FileOutputStream(sourceBundle);
+            FileUtilities.copyFile(inputBundle, out);
+            out.close();
+            FileUtilities.extractArchive(sourceBundle, target);
+        } finally {
+            if (sourceBundle != null) {
+                sourceBundle.delete();
+            }
+        }
+    }
 }