ceki 02/04/16 03:41:45
Modified: tests README build.xml
Added: tests/input shortSocketServer1.properties
tests/src/java/org/apache/log4j/net
SocketServerTestCase.java
Removed: tests/src/java/org/apache/log4j/net SocketAppenderTest.java
Log:
Moving SocketAppender tests to junit.
Revision Changes Path
1.6 +3 -3 jakarta-log4j/tests/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-log4j/tests/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- README 12 Apr 2002 15:11:49 -0000 1.5
+++ README 16 Apr 2002 10:41:45 -0000 1.6
@@ -21,8 +21,8 @@
Type "ant" to see the available commands.
------------------------------------------------------------------------
-NOTE: The compilation and execution of test must be done from the tests/
- directory, that is from the directory where this README file is
- located.
+NOTE: The compilation and execution of tests must be performed from
+ within the tests/ directory, that is from the directory where
+ this README file is located.
------------------------------------------------------------------------
1.10 +28 -4 jakarta-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/tests/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 12 Apr 2002 15:11:49 -0000 1.9
+++ build.xml 16 Apr 2002 10:41:45 -0000 1.10
@@ -91,10 +91,12 @@
<!-- ================================================================= -->
<!-- Tests multiple parts of log4j. These tests are much more fragile -->
- <!-- unit tests. -->
+ <!-- unit tests. Regression tests compare output with a previously -->
+ <!-- created witness file. -->
<!-- ================================================================= -->
<target name="regression" depends="Minimum, Logger, DOM, CustomLevel,
- CustomLogger, PatternLayout"/>
+ CustomLogger, PatternLayout,
+ SocketServer"/>
<!-- ================================================================= -->
<!-- Unit tests test small parts of log4j for logical programming -->
@@ -107,7 +109,10 @@
<!-- Longer unit tests -->
<!-- ================================================================= -->
<target name="longUnit" depends="DRFA"/>
-
+
+ <!-- ================================================================= -->
+ <!-- =================== Regression Tests follow ===================== -->
+ <!-- ================================================================= -->
<target name="Minimum" depends="build">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="tests.classpath"/>
@@ -157,8 +162,26 @@
</junit>
</target>
+ <target name="SocketServer" depends="build">
+ <parallel>
+ <java classname="org.apache.log4j.net.ShortSocketServer" fork="yes">
+ <arg value="input/shortSocketServer1.properties"/>
+ <classpath refid="tests.classpath"/>
+ </java>
+ <sequential>
+ <sleep seconds="2"/>
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="tests.classpath"/>
+ <formatter type="plain" usefile="false" />
+ <test name="org.apache.log4j.net.SocketServerTestCase" />
+ </junit>
+ </sequential>
+ </parallel>
+ </target>
-
+ <!-- ================================================================= -->
+ <!-- ========================= Unit Tests ============================ -->
+ <!-- ================================================================= -->
<target name="OptionConverter" depends="build">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="tests.classpath"/>
@@ -198,5 +221,6 @@
<test name="org.apache.log4j.or.ORTestCase" />
</junit>
</target>
+
</project>
1.1 jakarta-log4j/tests/input/shortSocketServer1.properties
Index: shortSocketServer1.properties
===================================================================
log4j.rootLogger=DEBUG, A
log4j.Logger.org.apache.log4j.test.ShortSocketServer=WARN
log4j.Logger.org.apache.log4j.net.SocketNode=WARN
log4j.appender.A=org.apache.log4j.FileAppender
log4j.appender.A.file=output/temp
log4j.appender.A.Append=false
log4j.appender.A.layout=org.apache.log4j.PatternLayout
log4j.appender.A.layout.ConversionPattern=%5p %x [%t] %c %m%n
log4j.debug=true
1.1
jakarta-log4j/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
Index: SocketServerTestCase.java
===================================================================
/* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.log4j.net;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Test;
import org.apache.log4j.*;
import org.apache.log4j.helpers.AbsoluteTimeDateFormat;
import org.apache.log4j.util.*;
import org.apache.log4j.xml.DOMConfigurator;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.Logger;
import org.apache.log4j.LogManager;
import org.apache.log4j.NDC;
import org.apache.log4j.xml.XLevel;
import org.apache.log4j.Priority;
import java.io.IOException;
import java.util.Enumeration;
/**
@author Ceki Gülcü
*/
public class SocketServerTestCase extends TestCase {
static Logger logger = Logger.getLogger(SocketAppenderTestCase.class);
static public final int PORT = 12345;
static Logger rootLogger = Logger.getRootLogger();
public SocketServerTestCase(String name) {
super(name);
}
public void setUp() {
System.out.println("-----------------Setting up test case.");
SocketAppender socketAppender = new SocketAppender("localhost", PORT);
rootLogger.addAppender(socketAppender);
}
public void tearDown() {
System.out.println("---------------Tearing down test case.");
rootLogger.removeAllAppenders();
}
public void test1() {
common();
}
static
void common() {
int i = -1;
NDC.push("NDC");
Logger root = Logger.getRootLogger();
logger.log(XLevel.TRACE, "Message " + ++i);
logger.debug("Message " + ++i);
root.debug("Message " + ++i);
logger.info("Message " + ++i);
logger.warn("Message " + ++i);
logger.log(XLevel.LETHAL, "Message " + ++i); //5
Exception e = new Exception("Just testing");
logger.debug("Message " + ++i, e);
root.error("Message " + ++i, e);
}
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTest(new SocketServerTestCase("test1"));
return suite;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
