LOG4J2-435 test unconditional deletion will not happen Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0e8c4386 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0e8c4386 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0e8c4386
Branch: refs/heads/master Commit: 0e8c4386269549faa3ea60130734d05e00699f96 Parents: aecb1d1 Author: rpopma <[email protected]> Authored: Fri Nov 27 13:32:50 2015 +0900 Committer: rpopma <[email protected]> Committed: Fri Nov 27 13:32:50 2015 +0900 ---------------------------------------------------------------------- ...ollingAppenderNoUnconditionalDeleteTest.java | 122 +++++++++++++++++++ ...olling-with-custom-delete-unconditional1.xml | 46 +++++++ ...olling-with-custom-delete-unconditional2.xml | 47 +++++++ ...olling-with-custom-delete-unconditional3.xml | 47 +++++++ 4 files changed, 262 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0e8c4386/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java new file mode 100644 index 0000000..5ddcced --- /dev/null +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java @@ -0,0 +1,122 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache license, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the license for the specific language governing permissions and + * limitations under the license. + */ +package org.apache.logging.log4j.core.appender.rolling; + +import java.io.File; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.regex.Pattern; + +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.junit.LoggerContextRule; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExternalResource; +import org.junit.rules.RuleChain; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.junit.Assert.*; + +/** + * + */ +@RunWith(Parameterized.class) +public class RollingAppenderNoUnconditionalDeleteTest { + +// private static final String DIR = "target/rolling1"; +// private static final String CONFIG = "log4j-rolling-with-custom-delete-unconditional1.xml"; +// private static final String DIR = "target/rolling-unconditional-delete1/test"; + + private final File directory; + private Logger logger; + + @Parameterized.Parameters(name = "{0} \u2192 {1}") + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] { // + // @formatter:off + {"log4j-rolling-with-custom-delete-unconditional1.xml", "target/rolling-unconditional-delete1/test"}, // + {"log4j-rolling-with-custom-delete-unconditional2.xml", "target/rolling-unconditional-delete2/test"}, // + {"log4j-rolling-with-custom-delete-unconditional3.xml", "target/rolling-unconditional-delete3/test"}, // + // @formatter:on + }); + } + + @Rule + public LoggerContextRule init; + + public RollingAppenderNoUnconditionalDeleteTest(final String configFile, final String dir) { + this.directory = new File(dir); + this.init = new LoggerContextRule(configFile); + } + + @Before + public void setUp() throws Exception { + this.logger = this.init.getLogger(); + } + + @After + public void tearDown() throws Exception { + deleteDir(); + } + + +// private final LoggerContextRule ctx = new LoggerContextRule(CONFIG); +// +// @Rule +// public RuleChain chain = RuleChain.outerRule(new ExternalResource() { +// @Override +// protected void before() throws Throwable { +// deleteDir(); +// } +// }).around(ctx); + + @Test + public void testAppender() throws Exception { + final int LINECOUNT = 18; // config has max="100" + for (int i = 0; i < LINECOUNT; ++i) { + // 30 chars per message: each message triggers a rollover + logger.debug("This is a test message number " + i); // 30 chars: + } + Thread.sleep(100); // Allow time for rollover to complete + + assertTrue("Dir " + directory + " should exist", directory.exists()); + assertTrue("Dir " + directory + " should contain files", directory.listFiles().length > 0); + + int total = 0; + for (File file : directory.listFiles()) { + List<String> lines = Files.readAllLines(file.toPath(), Charset.defaultCharset()); + total += lines.size(); + } + assertEquals("rolled over lines", LINECOUNT - 1, total); + } + + private void deleteDir() { + if (directory.exists()) { + final File[] files = directory.listFiles(); + for (final File file : files) { + file.delete(); + } + directory.delete(); + } + } +} http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0e8c4386/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional1.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional1.xml b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional1.xml new file mode 100644 index 0000000..92d726c --- /dev/null +++ b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional1.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="TRACE" name="RollingWithCustomUnconditionalDeleteTest"> + <Properties> + <Property name="base">target/rolling-unconditional-delete1/</Property> + </Properties> + + <Appenders> + <RollingFile name="RollingFile" fileName="${base}/rollingtest.log" + filePattern="${base}/test/test-%i.log"> + <PatternLayout> + <Pattern>%d %p %c{1.} [%t] %m%n</Pattern> + </PatternLayout> + <Policies> + <SizeBasedTriggeringPolicy size="50" /> + </Policies> + <DefaultRolloverStrategy max="100" stopCustomActionsOnError="true"> + <Delete basePath="${base}/test" maxDepth="2"> + </Delete> + </DefaultRolloverStrategy> + </RollingFile> + </Appenders> + + <Loggers> + <Root level="trace"> + <AppenderRef ref="RollingFile" /> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0e8c4386/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional2.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional2.xml b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional2.xml new file mode 100644 index 0000000..c656989 --- /dev/null +++ b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional2.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="TRACE" name="RollingWithCustomUnconditionalDeleteTest"> + <Properties> + <Property name="base">target/rolling-unconditional-delete2/</Property> + </Properties> + + <Appenders> + <RollingFile name="RollingFile" fileName="${base}/rollingtest.log" + filePattern="${base}/test/test-%i.log"> + <PatternLayout> + <Pattern>%d %p %c{1.} [%t] %m%n</Pattern> + </PatternLayout> + <Policies> + <SizeBasedTriggeringPolicy size="50" /> + </Policies> + <DefaultRolloverStrategy max="100" stopCustomActionsOnError="true"> + <Delete basePath="${base}/test" maxDepth="2"> + <IfAll /> + </Delete> + </DefaultRolloverStrategy> + </RollingFile> + </Appenders> + + <Loggers> + <Root level="trace"> + <AppenderRef ref="RollingFile" /> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0e8c4386/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional3.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional3.xml b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional3.xml new file mode 100644 index 0000000..a3af06d --- /dev/null +++ b/log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional3.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="TRACE" name="RollingWithCustomUnconditionalDeleteTest"> + <Properties> + <Property name="base">target/rolling-unconditional-delete3/</Property> + </Properties> + + <Appenders> + <RollingFile name="RollingFile" fileName="${base}/rollingtest.log" + filePattern="${base}/test/test-%i.log"> + <PatternLayout> + <Pattern>%d %p %c{1.} [%t] %m%n</Pattern> + </PatternLayout> + <Policies> + <SizeBasedTriggeringPolicy size="50" /> + </Policies> + <DefaultRolloverStrategy max="100" stopCustomActionsOnError="true"> + <Delete basePath="${base}/test" maxDepth="2"> + <IfAny /> + </Delete> + </DefaultRolloverStrategy> + </RollingFile> + </Appenders> + + <Loggers> + <Root level="trace"> + <AppenderRef ref="RollingFile" /> + </Root> + </Loggers> + +</Configuration> \ No newline at end of file
