Better test name

Longer lines

Author: garydgregory

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

@@ -90,32 +90,30 @@ private String showFailures() {
 
     @AfterEach
     public void tearDown() {
-
         // reset file cleaner class, so as not to break other tests
-
         /**
-         * The following block of code can possibly be removed when the deprecated {@link FileCleaner} is gone. The
-         * question is, whether we want to support reuse of {@link FileCleaningTracker} instances, which we should, IMO,
-         * not.
+         * The following block of code can possibly be removed when the deprecated {@link FileCleaner} is gone. The question is, whether we want to support
+         * reuse of {@link FileCleaningTracker} instances, which we should, IMO, not.
          */
         {
             if (fileCleaningTracker != null) {
+                if (fileCleaningTracker.reaper != null) {
+                    fileCleaningTracker.reaper.interrupt();
+                }
                 fileCleaningTracker.refQueue = new ReferenceQueue<>();
                 fileCleaningTracker.trackers.clear();
                 fileCleaningTracker.deleteFailures.clear();
                 fileCleaningTracker.exitWhenFinished = false;
                 fileCleaningTracker.reaper = null;
             }
         }
-
         fileCleaningTracker = null;
     }
 
     @Test
     void testFileCleanerDirectory_ForceStrategy_FileSource() throws Exception {
         if (!testFile.getParentFile().exists()) {
-            throw new IOException("Cannot create file " + testFile
-                    + " as the parent directory does not exist");
+            throw new IOException("Cannot create file " + testFile + " as the parent directory does not exist");
         }
         try (BufferedOutputStream output =
                 new BufferedOutputStream(Files.newOutputStream(testFile.toPath()))) {
@@ -131,7 +129,7 @@ void testFileCleanerDirectory_ForceStrategy_FileSource() throws Exception {
 
         obj = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
         pauseForDeleteToComplete(testFile.getParentFile());
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
@@ -142,8 +140,7 @@ void testFileCleanerDirectory_ForceStrategy_FileSource() throws Exception {
     @Test
     void testFileCleanerDirectory_ForceStrategy_PathSource() throws Exception {
         if (!Files.exists(testPath.getParent())) {
-            throw new IOException("Cannot create file " + testPath
-                    + " as the parent directory does not exist");
+            throw new IOException("Cannot create file " + testPath + " as the parent directory does not exist");
         }
         try (BufferedOutputStream output =
                 new BufferedOutputStream(Files.newOutputStream(testPath))) {
@@ -159,7 +156,7 @@ void testFileCleanerDirectory_ForceStrategy_PathSource() throws Exception {
 
         obj = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
         pauseForDeleteToComplete(testPath.getParent());
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
@@ -180,7 +177,7 @@ void testFileCleanerDirectory_NullStrategy() throws Exception {
 
         obj = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
         assertTrue(testFile.exists());  // not deleted, as dir not empty
@@ -200,7 +197,7 @@ void testFileCleanerDirectoryFileSource() throws Exception {
 
         obj = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
         assertTrue(testFile.exists());  // not deleted, as dir not empty
@@ -220,7 +217,7 @@ void testFileCleanerDirectoryPathSource() throws Exception {
 
         obj = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
         assertTrue(Files.exists(testPath));  // not deleted, as dir not empty
@@ -267,7 +264,7 @@ void testFileCleanerExitWhenFinished1() throws Exception {
         testFile = null;
         raf = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
         pauseForDeleteToComplete(new File(path));
 
         assertEquals(0, fileCleaningTracker.getTrackCount(), "10-Track Count");
@@ -294,7 +291,7 @@ void testFileCleanerExitWhenFinished2() throws Exception {
         testFile = null;
         r = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
         pauseForDeleteToComplete(new File(path));
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
@@ -318,7 +315,7 @@ void testFileCleanerExitWhenFinishedFirst() throws Exception {
         assertTrue(fileCleaningTracker.exitWhenFinished);
         assertNull(fileCleaningTracker.reaper);
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
         assertTrue(fileCleaningTracker.exitWhenFinished);
@@ -341,7 +338,7 @@ void testFileCleanerFile() throws Exception {
         testFile = null;
         raf = null;
 
-        waitUntilTrackCount();
+        waitUntilTrackCount0();
         pauseForDeleteToComplete(new File(path));
 
         assertEquals(0, fileCleaningTracker.getTrackCount());
@@ -355,7 +352,7 @@ void testFileCleanerNull() {
         assertThrows(NullPointerException.class, () -> fileCleaningTracker.track((String) null, new Object(), FileDeleteStrategy.NORMAL));
     }
 
-    private void waitUntilTrackCount() throws Exception {
+    private void waitUntilTrackCount0() throws Exception {
         System.gc();
         TestUtils.sleep(500);
         int count = 0;
@@ -365,8 +362,8 @@ private void waitUntilTrackCount() throws Exception {
                 long i = 0;
                 while (fileCleaningTracker.getTrackCount() != 0) {
                     list.add(
-                        "A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String "
-                            + i++);
+                            "A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String "
+                                    + i++);
                 }
             } catch (final Throwable ignored) {
             }
@@ -377,6 +374,5 @@ private void waitUntilTrackCount() throws Exception {
         if (fileCleaningTracker.getTrackCount() != 0) {
             throw new IllegalStateException("Your JVM is not releasing References, try running the test with less memory (-Xmx)");
         }
-
     }
 }