improve error message if delete fails Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7ff4c96f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7ff4c96f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7ff4c96f
Branch: refs/heads/LOG4J2-1278-gc-free-logger Commit: 7ff4c96fbdfba4a49198b342dfa24c9e5333d6fd Parents: cbd191c Author: rpopma <[email protected]> Authored: Mon Feb 22 03:29:40 2016 +0900 Committer: rpopma <[email protected]> Committed: Mon Feb 22 03:29:40 2016 +0900 ---------------------------------------------------------------------- .../org/apache/logging/log4j/junit/CleanFiles.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7ff4c96f/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java index 69b0cdc..36386af 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/junit/CleanFiles.java @@ -17,8 +17,8 @@ package org.apache.logging.log4j.junit; import java.io.File; -import java.sql.Date; -import java.text.DateFormat; +import java.io.IOException; +import java.nio.file.FileSystems; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -47,13 +47,11 @@ public class CleanFiles extends ExternalResource { private void clean() { for (final File file : files) { if (file.exists()) { - final boolean deleted = file.delete(); - if (!deleted) { - file.deleteOnExit(); + try { + FileSystems.getDefault().provider().delete(file.toPath()); + } catch (IOException e) { + fail(e.toString()); } - assertTrue( - "Could not delete " + file.toString() + ", last modified " - + DateFormat.getInstance().format(new Date(file.lastModified())), deleted); } } }
