ceki 2005/02/25 05:45:22
Modified: tests/src/java/org/apache/log4j WriterAppenderTest.java
FileAppenderTest.java ConsoleAppenderTest.java
VectorAppender.java AbstractAppenderTest.java
tests/src/java/org/apache/log4j/performance
NullAppender.java
Log:
We already have a strategy ensuring backward compatibility, no need to make
things even more complicated.
Revision Changes Path
1.4 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/WriterAppenderTest.java
Index: WriterAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/WriterAppenderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WriterAppenderTest.java 24 Feb 2005 22:56:21 -0000 1.3
+++ WriterAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.4
@@ -26,11 +26,11 @@
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*/
public class WriterAppenderTest extends AbstractAppenderTest {
- protected AppenderSkeleton getAppender() {
+ protected Appender getAppender() {
return new WriterAppender();
}
- protected AppenderSkeleton getConfiguredAppender() {
+ protected Appender getConfiguredAppender() {
WriterAppender wa = new WriterAppender();
// set a bogus writer
1.4 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/FileAppenderTest.java
Index: FileAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/FileAppenderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FileAppenderTest.java 24 Feb 2005 22:56:21 -0000 1.3
+++ FileAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.4
@@ -24,11 +24,11 @@
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*/
public class FileAppenderTest extends AbstractAppenderTest {
- protected AppenderSkeleton getAppender() {
+ protected Appender getAppender() {
return new FileAppender();
}
- protected AppenderSkeleton getConfiguredAppender() {
+ protected Appender getConfiguredAppender() {
FileAppender wa = new FileAppender();
wa.setFile("output/temp");
wa.setLayout(new DummyLayout());
1.4 +2 -2
logging-log4j/tests/src/java/org/apache/log4j/ConsoleAppenderTest.java
Index: ConsoleAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/ConsoleAppenderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConsoleAppenderTest.java 24 Feb 2005 22:56:21 -0000 1.3
+++ ConsoleAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.4
@@ -25,11 +25,11 @@
*
*/
public class ConsoleAppenderTest extends AbstractAppenderTest {
- protected AppenderSkeleton getAppender() {
+ protected Appender getAppender() {
return new ConsoleAppender();
}
- protected AppenderSkeleton getConfiguredAppender() {
+ protected Appender getConfiguredAppender() {
ConsoleAppender ca = new ConsoleAppender();
// set a bogus layout
1.8 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/VectorAppender.java
Index: VectorAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/VectorAppender.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- VectorAppender.java 24 Feb 2005 22:56:21 -0000 1.7
+++ VectorAppender.java 25 Feb 2005 13:45:22 -0000 1.8
@@ -29,8 +29,8 @@
long delay = 0;
public VectorAppender() {
- super(true);
vector = new Vector();
+ super.activate();
}
/**
1.6 +23 -25
logging-log4j/tests/src/java/org/apache/log4j/AbstractAppenderTest.java
Index: AbstractAppenderTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/AbstractAppenderTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractAppenderTest.java 24 Feb 2005 22:56:21 -0000 1.5
+++ AbstractAppenderTest.java 25 Feb 2005 13:45:22 -0000 1.6
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2005 The Apache Software Foundation.
+ * 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.
@@ -18,6 +18,7 @@
import java.io.Writer;
+import org.apache.log4j.net.SMTPAppenderTest;
import org.apache.log4j.spi.LoggingEvent;
import junit.framework.Test;
@@ -27,52 +28,49 @@
/**
* An abstract test case which can be subclassed to derived to check the
- * certain (limited) aspects of Appender implementations.
- *
+ * certain (limited) aspects of Appender implementations.
+ *
* @author <a href="http://www.qos.ch/log4j/";>Ceki Gülcü</a>
*
*/
abstract public class AbstractAppenderTest extends TestCase {
-
- abstract protected AppenderSkeleton getAppender();
- abstract protected AppenderSkeleton getConfiguredAppender();
-
+
+ abstract protected Appender getAppender();
+ abstract protected Appender getConfiguredAppender();
+
public class DummyLayout extends Layout {
- public void format(Writer output, LoggingEvent event) {}
- public void activateOptions() {}
- }
-
- protected boolean isImmediatelyActive() {
- return false;
- }
-
+ public void format(Writer output, LoggingEvent event) {}
+ public void activateOptions() {}
+ }
+
public void testNewAppender() {
- // most newly constructed appenders whould be inactive
- AppenderSkeleton appender = getAppender();
- assertEquals(isImmediatelyActive(), appender.isActive());
+ // new appenders whould be inactive
+ Appender appender = getAppender();
+ assertFalse(appender.isActive());
assertFalse(appender.isClosed());
-
+
appender.close();
assertTrue(appender.isClosed());
}
-
+
public void testConfiguredAppender() {
- AppenderSkeleton appender = getConfiguredAppender();
+ Appender appender = getConfiguredAppender();
appender.activate();
assertTrue(appender.isActive());
assertFalse(appender.isClosed());
-
+
appender.close();
assertTrue(appender.isClosed());
}
-
-
+
+
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTestSuite(WriterAppenderTest.class);
suite.addTestSuite(ConsoleAppenderTest.class);
suite.addTestSuite(FileAppenderTest.class);
+ suite.addTestSuite(SMTPAppenderTest.class);
return suite;
}
-
+
}
1.4 +0 -1
logging-log4j/tests/src/java/org/apache/log4j/performance/NullAppender.java
Index: NullAppender.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/performance/NullAppender.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NullAppender.java 24 Feb 2005 22:56:21 -0000 1.3
+++ NullAppender.java 25 Feb 2005 13:45:22 -0000 1.4
@@ -35,7 +35,6 @@
public String t;
public NullAppender() {
- super(true);
}
public NullAppender(Layout layout) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
