Author: jncharpin Date: Fri Mar 30 16:24:01 2007 New Revision: 1498 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SubTimeBasedRollingPolicy.java - copied, changed from r1497, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicyTest.java Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicyTest.java Modified: logback/trunk/logback-core/pom.xml logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Log: Uncommented TimeBasedRollingTest from pom.xml Renamed TimeBasedRollingPolicyTest to SubTimeBasedRollingPolicy so that it is not mistaken for a test case. Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Fri Mar 30 16:24:01 2007 @@ -76,7 +76,6 @@ <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> <exclude>**/SizeBasedRollingTest.java</exclude> - <exclude>**/TimeBasedRollingTest.java</exclude> </excludes> </configuration> </plugin> Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SubTimeBasedRollingPolicy.java (from r1497, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicyTest.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicyTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SubTimeBasedRollingPolicy.java Fri Mar 30 16:24:01 2007 @@ -10,7 +10,7 @@ * * @author Jean-Noel Charpin */ -public class TimeBasedRollingPolicyTest extends TimeBasedRollingPolicy { +public class SubTimeBasedRollingPolicy extends TimeBasedRollingPolicy { private long simulatedTime; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Fri Mar 30 16:24:01 2007 @@ -90,7 +90,7 @@ rfa.setContext(context); rfa.setLayout(layout); - TimeBasedRollingPolicyTest tbrpt = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt = new SubTimeBasedRollingPolicy(); tbrpt.setContext(context); tbrpt.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test1-%d{" + DATE_PATTERN + "}"); @@ -141,7 +141,7 @@ rfa1.setContext(context); rfa1.setLayout(layout); - TimeBasedRollingPolicyTest tbrpt1 = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt1 = new SubTimeBasedRollingPolicy(); tbrpt1.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test2-%d{" + DATE_PATTERN + "}"); tbrpt1.setContext(context); @@ -176,7 +176,7 @@ rfa2.setContext(context); rfa2.setLayout(layout); - TimeBasedRollingPolicyTest tbrpt2 = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt2 = new SubTimeBasedRollingPolicy(); tbrpt2.setContext(context); tbrpt2.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test2-%d{" + DATE_PATTERN + "}"); @@ -210,7 +210,7 @@ rfa.setContext(context); rfa.setLayout(layout); - TimeBasedRollingPolicyTest tbrpt = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt = new SubTimeBasedRollingPolicy(); tbrpt.setContext(context); tbrpt.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test3-%d{" + DATE_PATTERN + "}.gz"); @@ -267,7 +267,7 @@ rfa1.setLayout(layout); rfa1.setFile(Constants.TEST_DIR_PREFIX + "output/test4.log"); - TimeBasedRollingPolicyTest tbrpt1 = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt1 = new SubTimeBasedRollingPolicy(); tbrpt1.setContext(context); // tbrp1.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/test4.log"); tbrpt1.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{" @@ -304,7 +304,7 @@ rfa2.setLayout(layout); rfa2.setFile(Constants.TEST_DIR_PREFIX + "output/test4.log"); - TimeBasedRollingPolicyTest tbrpt2 = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt2 = new SubTimeBasedRollingPolicy(); tbrpt2.setContext(context); tbrpt2.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test4-%d{" + DATE_PATTERN + "}"); @@ -339,7 +339,7 @@ rfa.setLayout(layout); rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test5.log"); - TimeBasedRollingPolicyTest tbrpt = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt = new SubTimeBasedRollingPolicy(); tbrpt.setContext(context); tbrpt.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test5-%d{" + DATE_PATTERN + "}"); @@ -389,7 +389,7 @@ rfa.setLayout(layout); rfa.setFile(Constants.TEST_DIR_PREFIX + "output/test6.log"); - TimeBasedRollingPolicyTest tbrpt = new TimeBasedRollingPolicyTest(); + SubTimeBasedRollingPolicy tbrpt = new SubTimeBasedRollingPolicy(); tbrpt.setContext(context); tbrpt.setFileNamePattern(Constants.TEST_DIR_PREFIX + "output/test6-%d{" + DATE_PATTERN + "}.gz");