ceki 2004/11/23 10:50:12
Modified: tests/src/java/org/apache/log4j DRFATestCase.java
Added: tests/src/java/org/apache/log4j/rolling/helper
CompressTestCase.java FileNamePatternTestCase.java
Removed: tests/src/java/org/apache/log4j/rolling/helpers
CompressTestCase.java FileNamePatternTestCase.java
Log:
Prefer singular 'helper' to plural 'helpers'
Revision Changes Path
1.1
logging-log4j/tests/src/java/org/apache/log4j/rolling/helper/CompressTestCase.java
Index: CompressTestCase.java
===================================================================
/*
* Copyright 1999,2004 The Apache Software Foundation.
*
* Licensed 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.log4j.rolling.helper;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.LogManager;
import org.apache.log4j.rolling.helper.Compress;
import org.apache.log4j.util.Compare;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
/**
* @author Ceki
*/
public class CompressTestCase extends TestCase {
/**
* Constructor for CompressTestCase.
* @param arg0
*/
public CompressTestCase(String arg0) {
super(arg0);
}
public void setUp() {
BasicConfigurator.configure();;
}
public void tearDown() {
LogManager.shutdown();
}
public void test1() throws Exception {
Compress.GZCompress("input/compress1.txt", "output/compress1.txt.gz");
assertTrue(Compare.gzCompare("output/compress1.txt.gz",
"witness/compress1.txt.gz"));
}
public void test2() throws Exception {
Compress.GZCompress("input/compress2.txt", "output/compress2.txt");
assertTrue(Compare.gzCompare("output/compress2.txt.gz",
"witness/compress2.txt.gz"));
}
public void test3() throws Exception {
Compress.ZIPCompress("input/compress3.txt", "output/compress3.txt");
//assertTrue(Compare.compare("output/compress3.txt.zip",
// "witness/compress3.txt.zip"));
}
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(new CompressTestCase("test1"));
suite.addTest(new CompressTestCase("test2"));
suite.addTest(new CompressTestCase("test3"));
return suite;
}
}
1.1
logging-log4j/tests/src/java/org/apache/log4j/rolling/helper/FileNamePatternTestCase.java
Index: FileNamePatternTestCase.java
===================================================================
/*
* Copyright 1999,2004 The Apache Software Foundation.
*
* Licensed 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.log4j.rolling.helper;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.log4j.BasicConfigurator;
import org.apache.log4j.LogManager;
import org.apache.log4j.rolling.helper.FileNamePattern;
import java.util.Calendar;
/**
* @author Ceki
*
*/
public class FileNamePatternTestCase extends TestCase {
/**
* Constructor for FileNamePatternParserTestCase.
* @param arg0
*/
public FileNamePatternTestCase(String arg0) {
super(arg0);
}
public void setUp() throws Exception {
BasicConfigurator.configure();
//Logger root = Logger.getRootLogger();
//Appender appender =
// new FileAppender(new PatternLayout(), "filenamepattern.log");
//root.addAppender(appender);
}
public void tearDown() {
LogManager.shutdown();
}
public void test1() {
//System.out.println("Testing [t]");
FileNamePattern pp = new FileNamePattern("t");
assertEquals("t", pp.convert(3));
//System.out.println("Testing [foo]");
pp = new FileNamePattern("foo");
assertEquals("foo", pp.convert(3));
//System.out.println("Testing [foo%]");
pp = new FileNamePattern("foo%");
assertEquals("foo%", pp.convert(3));
pp = new FileNamePattern("%ifoo");
assertEquals("3foo", pp.convert(3));
pp = new FileNamePattern("foo%ixixo");
assertEquals("foo3xixo", pp.convert(3));
pp = new FileNamePattern("foo%i.log");
assertEquals("foo3.log", pp.convert(3));
pp = new FileNamePattern("foo.%i.log");
assertEquals("foo.3.log", pp.convert(3));
pp = new FileNamePattern("%ifoo%");
assertEquals("3foo%", pp.convert(3));
pp = new FileNamePattern("%ifoo%%");
assertEquals("3foo%", pp.convert(3));
pp = new FileNamePattern("%%foo");
assertEquals("%foo", pp.convert(3));
}
public void test2() {
System.out.println("Testing [foo%ibar%i]");
FileNamePattern pp = new FileNamePattern("foo%ibar%i");
assertEquals("foo3bar3", pp.convert(3));
///pp = new FileNamePattern("%%foo");
//assertEquals("%foo", pp.convert(3));
}
public void test3() {
Calendar cal = Calendar.getInstance();
cal.set(2003, 4, 20, 17, 55);
FileNamePattern pp = new FileNamePattern("foo%d{yyyy.MM.dd}");
assertEquals("foo2003.05.20", pp.convert(cal.getTime()));
pp = new FileNamePattern("foo%d{yyyy.MM.dd HH:mm}");
assertEquals("foo2003.05.20 17:55", pp.convert(cal.getTime()));
pp = new FileNamePattern("%d{yyyy.MM.dd HH:mm} foo");
assertEquals("2003.05.20 17:55 foo", pp.convert(cal.getTime()));
// Degenerate cases:
pp = new FileNamePattern("foo%dyyyy.MM.dd}");
assertEquals("foo%dyyyy.MM.dd}", pp.convert(cal.getTime()));
pp = new FileNamePattern("foo%d{yyyy.MM.dd");
assertEquals("foo%d{yyyy.MM.dd", pp.convert(cal.getTime()));
}
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(new FileNamePatternTestCase("test1"));
suite.addTest(new FileNamePatternTestCase("test2"));
suite.addTest(new FileNamePatternTestCase("test3"));
return suite;
}
}
1.6 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/DRFATestCase.java
Index: DRFATestCase.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/DRFATestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DRFATestCase.java 27 Feb 2004 16:47:36 -0000 1.5
+++ DRFATestCase.java 23 Nov 2004 18:50:12 -0000 1.6
@@ -23,7 +23,7 @@
import java.util.Calendar;
import java.util.TimeZone;
-import org.apache.log4j.rolling.helpers.RollingCalendar;
+import org.apache.log4j.rolling.helper.RollingCalendar;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
