svn commit: r1815319 - /tomcat/trunk/test/org/apache/juli/TestFileHandler.java

[markt]

Author: markt
Date: Wed Nov 15 15:49:38 2017
New Revision: 1815319

URL: http://svn.apache.org/viewvc?rev=1815319&view=rev
Log:
If the test logs files aren't closed, they will be locked. On Windows this 
means they can't be deleted. This causes the tearDown code to fail.
Close the FileHandlers so the log files are closed so they can be deleted.

Modified:
    tomcat/trunk/test/org/apache/juli/TestFileHandler.java

Modified: tomcat/trunk/test/org/apache/juli/TestFileHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/juli/TestFileHandler.java?rev=1815319&r1=1815318&r2=1815319&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/juli/TestFileHandler.java (original)
+++ tomcat/trunk/test/org/apache/juli/TestFileHandler.java Wed Nov 15 15:49:38 
2017
@@ -73,43 +73,49 @@ public class TestFileHandler {
         }
     }
 
-    @SuppressWarnings("unused")
     @Test
     public void testCleanOnInitOneHandler() throws Exception {
         generateLogFiles(logsDir, PREFIX_1, SUFIX_1, 3);
 
-        new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, SUFIX_1, 2);
+        FileHandler fh1 = new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, 
SUFIX_1, 2);
 
         Thread.sleep(1000);
 
         Assert.assertTrue(logsDir.list().length == 16);
+
+        fh1.close();
     }
 
-    @SuppressWarnings("unused")
     @Test
     public void testCleanOnInitMultipleHandlers() throws Exception {
         generateLogFiles(logsDir, PREFIX_1, SUFIX_1, 3);
 
-        new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, SUFIX_1, 2);
-        new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, SUFIX_2, 2);
-        new FileHandler(logsDir.getAbsolutePath(), PREFIX_2, SUFIX_1, 2);
-        new FileHandler(logsDir.getAbsolutePath(), PREFIX_3, SUFIX_1, 2);
+        FileHandler fh1 = new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, 
SUFIX_1, 2);
+        FileHandler fh2 = new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, 
SUFIX_2, 2);
+        FileHandler fh3 = new FileHandler(logsDir.getAbsolutePath(), PREFIX_2, 
SUFIX_1, 2);
+        FileHandler fh4 = new FileHandler(logsDir.getAbsolutePath(), PREFIX_3, 
SUFIX_1, 2);
 
         Thread.sleep(1000);
 
         Assert.assertTrue(logsDir.list().length == 16);
+
+        fh1.close();
+        fh2.close();
+        fh3.close();
+        fh4.close();
     }
 
-    @SuppressWarnings("unused")
     @Test
     public void testCleanDisabled() throws Exception {
         generateLogFiles(logsDir, PREFIX_1, SUFIX_1, 3);
 
-        new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, SUFIX_1, -1);
+        FileHandler fh1 = new FileHandler(logsDir.getAbsolutePath(), PREFIX_1, 
SUFIX_1, -1);
 
         Thread.sleep(1000);
 
         Assert.assertTrue(logsDir.list().length == 17);
+
+        fh1.close();
     }
 
     private void generateLogFiles(File dir, String prefix, String sufix, int 
amount)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org