Test clean up with CleanFiles test rule. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7b954b6c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7b954b6c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7b954b6c
Branch: refs/heads/LOG4J-1181 Commit: 7b954b6c2585a2fd522eec3a9d4253da49d69db6 Parents: cd8ce78 Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Jun 28 12:48:10 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Jun 28 12:48:10 2016 -0700 ---------------------------------------------------------------------- .../rolling/OnStartupTriggeringPolicyTest.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b954b6c/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java index 07db3b4..e5f00f9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicyTest.java @@ -16,20 +16,21 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import java.io.ByteArrayInputStream; +import static org.junit.Assert.assertTrue; +import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; + import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.layout.PatternLayout; -import org.junit.AfterClass; +import org.apache.logging.log4j.junit.CleanFiles; +import org.junit.Rule; import org.junit.Test; -import static org.junit.Assert.*; - /** * */ @@ -40,6 +41,9 @@ public class OnStartupTriggeringPolicyTest { private static final String ROLLED_FILE = "target/rolling1/test1-1.log"; private static final String TEST_DATA = "Hello world!"; + @Rule + public CleanFiles rule = new CleanFiles(TARGET_FILE, ROLLED_FILE); + @Test public void testPolicy() throws Exception { final Configuration configuration = new DefaultConfiguration(); @@ -72,12 +76,4 @@ public class OnStartupTriggeringPolicyTest { } } - @AfterClass - public static void cleanup() throws Exception { - final Path target = Paths.get(TARGET_FILE); - final Path rolled = Paths.get(ROLLED_FILE); - Files.deleteIfExists(target); - Files.deleteIfExists(rolled); - } - }
