Repository: logging-log4j2 Updated Branches: refs/heads/master 20f552e1b -> 525d3d633
Clean up directory before and after running the test Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/525d3d63 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/525d3d63 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/525d3d63 Branch: refs/heads/master Commit: 525d3d633712842b1cba5b64259e0c3a42c0308d Parents: 20f552e Author: Ralph Goers <[email protected]> Authored: Sun Jun 12 01:03:54 2016 -0700 Committer: Ralph Goers <[email protected]> Committed: Sun Jun 12 01:03:54 2016 -0700 ---------------------------------------------------------------------- .../rolling/RollingAppenderSizeTest.java | 35 ++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/525d3d63/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java index 1834105..1ce7d2f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java @@ -19,7 +19,12 @@ package org.apache.logging.log4j.core.appender.rolling; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.IOException; import java.nio.charset.Charset; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Arrays; import java.util.Collection; @@ -30,7 +35,9 @@ import org.apache.commons.compress.utils.IOUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.junit.LoggerContextRule; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -76,6 +83,16 @@ public class RollingAppenderSizeTest { this.init = new LoggerContextRule(configFile); } + @BeforeClass + public static void beforeClass() { + deleteDir(); + } + + @AfterClass + public static void afterClass() { + deleteDir(); + } + @Before public void setUp() throws Exception { this.logger = this.init.getLogger(RollingAppenderSizeTest.class.getName()); @@ -108,6 +125,7 @@ public class RollingAppenderSizeTest { fail("Error creating intput stream from " + file.toString() + ": " + ce.getMessage()); } final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + assertNotNull("No input stream for " + file.getName(), in); IOUtils.copy(in, baos); final String text = new String(baos.toByteArray(), Charset.defaultCharset()); final String[] lines = text.split("[\\r\\n]+"); @@ -124,13 +142,18 @@ public class RollingAppenderSizeTest { } private static void deleteDir() { - final File dir = new File(DIR); - if (dir.exists()) { - final File[] files = dir.listFiles(); - for (final File file : files) { - file.delete(); + if (Files.exists(Paths.get(DIR))) { + String fileName = null; + try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(Paths.get(DIR))) { + for (Path path : directoryStream) { + fileName = path.toFile().getName(); + Files.delete(path); + } + Files.delete(Paths.get(DIR)); + } catch (IOException ioe) { + fail("Unable to delete " + fileName + " due to " + ioe.getClass().getSimpleName() + ": " + + ioe.getMessage()); } - dir.delete(); } } }
