Reverting another debug statement.

Change test to just do a rename and not a delete.

Author: labkey-danield

src/org/labkey/test/TestFileUtils.java

@@ -446,16 +446,28 @@ public static void deleteDir(File dir)
         }
     }
 
+    /**
+     * Rename a directory.
+     * @param sourceDir the directory to rename
+     * @param newDirName the new name for the directory
+     */
     public static void renameDir(Path sourceDir, String newDirName)
     {
-        LOG.info("Renaming " + sourceDir + " to " + newDirName);
+        LOG.info("Renaming {} to {}", sourceDir, newDirName);
+
+        // Check if the directory is outside the test enlistment.
         checkFileLocation(sourceDir.toFile());
+
         Assert.assertTrue(sourceDir + " does not exists.", sourceDir.toFile().exists());
 
         try
         {
+            // Get the separator appropriate for the given OS.
             String separator = File.separator;
-            Path newDir = Paths.get(sourceDir.toString().substring(0, sourceDir.toString().lastIndexOf(separator)) + separator + newDirName);
+            int lastIndex = sourceDir.toString().lastIndexOf(separator);
+            Path newDir = lastIndex <= 0 ?
+                    Paths.get(separator + newDirName) :
+                    Paths.get(sourceDir.toString().substring(0, lastIndex) + separator + newDirName);
             Files.move(sourceDir, newDir);
             LOG.info("Rename successful.");
         }
@@ -472,7 +484,7 @@ private static void checkFileLocation(File file)
             if (!FileUtils.directoryContains(getLabKeyRoot(), file))
             {
                 // TODO: Consider throwing IllegalArgumentException
-                LOG.info("DEBUG: Attempting to delete a file outside of test enlistment: " + getLabKeyRoot());
+                LOG.info("DEBUG: Attempting to delete / rename a file outside of test enlistment: " + getLabKeyRoot());
             }
         }
         catch (IOException ignore) { }

src/org/labkey/test/tests/assay/AssayTransformMissingParentDirTest.java

@@ -51,17 +51,10 @@ public void testMissingParentDirectoryRegression() throws Exception
         getArtifactCollector().dumpPageSnapshot("TransformScript_Added");
         assayDesignerPage.clickSave();
 
-        // Now delete, or rename, the parent dir to ensure we handle it reasonably
-        if (SystemUtils.IS_OS_WINDOWS)
-        {
-            // Deleting directories on Windows is not always reliable, try renaming as an alternative.
-            String newName = "Not-Here-" + Instant.now().getEpochSecond();
-            TestFileUtils.renameDir(parentDir, newName);
-        }
-        else
-        {
-            TestFileUtils.deleteDir(parentDir.toFile());
-        }
+        // Now rename the parent dir to ensure we handle it reasonably. Deleting directories on Windows is not always
+        // timely, renaming the directory will have the same effect.
+        String newName = "Not-Here-" + Instant.now().getEpochSecond();
+        TestFileUtils.renameDir(parentDir, newName);
 
         Assert.assertFalse(String.format("Directory %s is still present.", parentDir),
                 FileUtils.isDirectory(parentDir.toFile()));

src/org/labkey/test/util/RReportHelper.java

@@ -160,7 +160,7 @@ public boolean executeScriptDirectly(String script, String expectedLines, boolea
         return checkScriptOutput(scriptOutput, expectedLines, failOnError);
     }
 
-    public boolean checkScriptOutput(String scriptOutput, String expectedLines, boolean failOnError)
+    private boolean checkScriptOutput(String scriptOutput, String expectedLines, boolean failOnError)
     {
         if (failOnError && doesScriptProduceError(scriptOutput))
             return false;