You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/05/24 18:10:54 UTC
cvs commit: logging-log4j/tests/src/java/org/apache/log4j VectorAppender.java AsyncAppenderTestCase.java
ceki 2004/05/24 09:10:54
Modified: tests/src/java/org/apache/log4j VectorAppender.java
AsyncAppenderTestCase.java
Log:
In VectorAppender (used in unit testing) made sleeping an parameterized option.
Revision Changes Path
1.5 +15 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VectorAppender.java 27 Feb 2004 16:47:36 -0000 1.4
+++ VectorAppender.java 24 May 2004 16:10:54 -0000 1.5
@@ -26,6 +26,8 @@
public class VectorAppender extends AppenderSkeleton {
public Vector vector;
+ long delay = 0;
+
public VectorAppender() {
vector = new Vector();
}
@@ -42,11 +44,11 @@
*/
public void append(LoggingEvent event) {
- //System.out.println("---Vector appender called with message ["+event.getRenderedMessage()+"].");
- //System.out.flush();
- try {
- Thread.sleep(100);
- } catch (Exception e) {
+ if(delay > 0) {
+ try {
+ Thread.sleep(delay);
+ } catch (Exception e) {
+ }
}
vector.addElement(event);
@@ -71,4 +73,12 @@
public boolean requiresLayout() {
return false;
}
+
+ public long getDelay() {
+ return delay;
+ }
+ public void setDelay(long delay) {
+ this.delay = delay;
+ }
+
}
1.5 +18 -27 logging-log4j/tests/src/java/org/apache/log4j/AsyncAppenderTestCase.java
Index: AsyncAppenderTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/AsyncAppenderTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AsyncAppenderTestCase.java 27 Feb 2004 16:47:36 -0000 1.4
+++ AsyncAppenderTestCase.java 24 May 2004 16:10:54 -0000 1.5
@@ -27,11 +27,23 @@
A superficial but general test of log4j.
*/
public class AsyncAppenderTestCase extends TestCase {
+ static int DELAY = 10;
+
+ Logger root = Logger.getRootLogger();;
+ Layout layout = new SimpleLayout();;
+ VectorAppender vectorAppender;
+ AsyncAppender asyncAppender = new AsyncAppender();
+
public AsyncAppenderTestCase(String name) {
super(name);
}
public void setUp() {
+ vectorAppender = new VectorAppender();
+ vectorAppender.setDelay(DELAY);
+ asyncAppender.addAppender(vectorAppender);
+ asyncAppender.activateOptions();
+ root.addAppender(asyncAppender);
}
public void tearDown() {
@@ -39,33 +51,19 @@
}
// this test checks whether it is possible to write to a closed AsyncAppender
- public void closeTest() throws Exception {
- Logger root = Logger.getRootLogger();
- Layout layout = new SimpleLayout();
- VectorAppender vectorAppender = new VectorAppender();
- AsyncAppender asyncAppender = new AsyncAppender();
+ public void test1() throws Exception {
asyncAppender.setName("async-CloseTest");
- asyncAppender.addAppender(vectorAppender);
- root.addAppender(asyncAppender);
-
root.debug("m1");
asyncAppender.close();
root.debug("m2");
-
Vector v = vectorAppender.getVector();
assertEquals(v.size(), 1);
}
// this test checks whether appenders embedded within an AsyncAppender are also
// closed
- public void test2() {
- Logger root = Logger.getRootLogger();
- Layout layout = new SimpleLayout();
- VectorAppender vectorAppender = new VectorAppender();
- AsyncAppender asyncAppender = new AsyncAppender();
+ public void closeTest() {
asyncAppender.setName("async-test2");
- asyncAppender.addAppender(vectorAppender);
- root.addAppender(asyncAppender);
root.debug("m1");
asyncAppender.close();
@@ -78,16 +76,9 @@
// this test checks whether appenders embedded within an AsyncAppender are also
// closed
- public void test3() {
+ public void test2() {
int LEN = 200;
- Logger root = Logger.getRootLogger();
- Layout layout = new SimpleLayout();
- VectorAppender vectorAppender = new VectorAppender();
- AsyncAppender asyncAppender = new AsyncAppender();
asyncAppender.setName("async-test3");
- asyncAppender.addAppender(vectorAppender);
- root.addAppender(asyncAppender);
-
for (int i = 0; i < LEN; i++) {
root.debug("message" + i);
}
@@ -102,11 +93,11 @@
assertTrue(vectorAppender.isClosed());
}
- public static Test suite() {
+ // rename the method to suite() to have all tests executed. Rebame the method
+ // to Xsuite to have only selected tests executed.
+ public static Test Xsuite() {
TestSuite suite = new TestSuite();
suite.addTest(new AsyncAppenderTestCase("closeTest"));
- suite.addTest(new AsyncAppenderTestCase("test2"));
- suite.addTest(new AsyncAppenderTestCase("test3"));
return suite;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org