[IO-857"][Javadoc] PathUtils.cleanDirectory() methods vs FileUtils.

Add FileUtils test assertions

Author: garydgregory

src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTest.java

@@ -68,66 +68,57 @@ private boolean chmod(final File file, final int mode, final boolean recurse) th
     void testCleanDirectoryToForceDelete() throws Exception {
         final File file = new File(tempDirFile, "restricted");
         FileUtils.touch(file);
-
         // 300 = owner: WE.
         // 500 = owner: RE.
         // 700 = owner: RWE.
         assumeTrue(chmod(tempDirFile, 700, false));
-
         // cleanDirectory calls forceDelete
         FileUtils.cleanDirectory(tempDirFile);
+        assertTrue(tempDirFile.exists());
     }
 
     @Test
     void testCleanEmpty() throws Exception {
         assertEquals(0, tempDirFile.list().length);
-
         FileUtils.cleanDirectory(tempDirFile);
-
+        assertTrue(tempDirFile.exists());
         assertEquals(0, tempDirFile.list().length);
     }
 
     @Test
     void testDeletesNested() throws Exception {
         final File nested = new File(tempDirFile, "nested");
-
         assertTrue(nested.mkdirs());
-
         FileUtils.touch(new File(nested, "file"));
-
         assertEquals(1, tempDirFile.list().length);
-
         FileUtils.cleanDirectory(tempDirFile);
-
+        assertTrue(tempDirFile.exists());
         assertEquals(0, tempDirFile.list().length);
     }
 
     @Test
     void testDeletesRegular() throws Exception {
         FileUtils.touch(new File(tempDirFile, "regular"));
         FileUtils.touch(new File(tempDirFile, ".hidden"));
-
         assertEquals(2, tempDirFile.list().length);
-
         FileUtils.cleanDirectory(tempDirFile);
-
+        assertTrue(tempDirFile.exists());
         assertEquals(0, tempDirFile.list().length);
     }
 
     @DisabledOnOs(OS.WINDOWS)
     @Test
     void testThrowsOnNullList() throws Exception {
-        // test won't work if we can't restrict permissions on the
-        // directory, so skip it.
+        // test won't work if we can't restrict permissions on the directory, so skip it.
         assumeTrue(chmod(tempDirFile, 0, false));
-
         try {
             // cleanDirectory calls forceDelete
             final IOException e = assertThrows(IOException.class, () -> FileUtils.cleanDirectory(tempDirFile));
             assertEquals("Unknown I/O error listing contents of directory: " + tempDirFile.getAbsolutePath(), e.getMessage());
         } finally {
             chmod(tempDirFile, 755, false);
         }
+        assertTrue(tempDirFile.exists());
     }
 
 }

src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTest.java

@@ -82,6 +82,7 @@ void testCleanDirWithASymlinkDir() throws Exception {
 
         // assert contents of the real directory were removed including the symlink
         FileUtils.cleanDirectory(realOuter);
+        assertTrue(realOuter.exists());
         assertEquals(0, realOuter.list().length);
 
         // ensure that the contents of the symlink were NOT removed.
@@ -121,6 +122,7 @@ void testCleanDirWithParentSymlinks() throws Exception {
         // assert contents of the real directory were removed including the symlink
         // should clean the contents of this but not recurse into other links
         FileUtils.cleanDirectory(symlinkParentDirectory);
+        assertTrue(symlinkParentDirectory.exists());
         assertEquals(0, symlinkParentDirectory.list().length);
         assertEquals(0, realParent.list().length);
 
@@ -155,6 +157,7 @@ void testCleanDirWithSymlinkFile() throws Exception {
 
         // assert contents of the real directory were removed including the symlink
         FileUtils.cleanDirectory(realOuter);
+        assertTrue(realOuter.exists());
         assertEquals(0, realOuter.list().length);
 
         // ensure that the contents of the symlink were NOT removed.
@@ -256,6 +259,7 @@ void testStillClearsIfGivenDirectoryIsASymlink() throws Exception {
         assertTrue(setupSymlink(randomDirectory, symlinkDirectory));
 
         FileUtils.cleanDirectory(symlinkDirectory);
+        assertTrue(symlinkDirectory.exists());
         assertEquals(0, symlinkDirectory.list().length);
         assertEquals(0, randomDirectory.list().length);
     }