Author: ceki
Date: Thu Jul 12 22:16:55 2007
New Revision: 847
Added:
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/DummyObject.java
- copied, changed from r845,
/slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/DummyObject.java
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/LoggerTest.java
- copied, changed from r845,
/slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/LoggerTest.java
Removed:
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/DummyObject.java
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/LoggerTest.java
Modified:
slf4j/trunk/log4j-over-slf4j/compatibility/build.xml
slf4j/trunk/log4j-over-slf4j/compatibility/lib/logback-classic-0.9.8-SNAPSHOT.jar
slf4j/trunk/log4j-over-slf4j/compatibility/lib/logback-core-0.9.8-SNAPSHOT.jar
slf4j/trunk/log4j-over-slf4j/compatibility/readme.txt
Log:
improved testing
Modified: slf4j/trunk/log4j-over-slf4j/compatibility/build.xml
==============================================================================
--- slf4j/trunk/log4j-over-slf4j/compatibility/build.xml (original)
+++ slf4j/trunk/log4j-over-slf4j/compatibility/build.xml Thu Jul 12
22:16:55 2007
@@ -1,7 +1,7 @@
<project name="testing-log4j-bridge" default="usage" basedir=".">
<property name="lbversion" value="0.9.8-SNAPSHOT" />
- <property name="slf4jversion" value="1.4.1" />
+ <property name="slf4jversion" value="1.4.2" />
<property name="source.home" value="./src/main/java/" />
<property name="javac.dest.12" value="./target/classes12/" />
<property name="javac.dest.13" value="./target/classes13/" />
@@ -26,9 +26,9 @@
<pathelement location="${lib}/log4j-1.3alpha-8.jar" />
</path>
- <path id="log4-bridge.classpath">
+ <path id="los.classpath">
<path refid="basic.classpath" />
- <pathelement location="${lib}/log4j-bridge-${lbversion}.jar" />
+ <pathelement
location="${lib}/log4j-over-slf4j-${slf4jversion}.jar" />
<pathelement location="${lib}/logback-classic-${lbversion}.jar"
/>
<pathelement location="${lib}/logback-core-${lbversion}.jar" />
<pathelement location="${lib}/slf4j-api-${slf4jversion}.jar" />
@@ -57,9 +57,8 @@
<include name="log4j-bridge-*.jar"/>
</fileset>
</delete>
- <copy file="../../logback-core/target/logback-core-${lbversion}.jar"
todir="lib/"/>
- <copy file="../../logback-classic/target/logback-classic-${lbversion}.jar"
todir="lib/"/>
- <copy file="../target/log4j-bridge-${lbversion}.jar" todir="lib/"/>
+ <copy file="../../slf4j-api/target/slf4j-api-${slf4jversion}.jar"
todir="lib/"/>
+ <copy file="../target/log4j-over-slf4j-${slf4jversion}.jar" todir="lib/"/>
</target>
@@ -92,15 +91,34 @@
<classpath refid="log4j13.classpath" />
</javac>
</target>
+
+ <target name="build_loggerTest" depends="init">
+ <javac srcdir="${source.home}"
+ destdir="${javac.dest.12}"
+ includes="**/LoggerTest.java"
+ deprecation="${deprecation}" debug="on">
+ <classpath refid="los.classpath" />
+ </javac>
+ </target>
<!-- =================================================================
-->
<!-- Run tests -->
<!-- =================================================================
-->
- <target name="all" depends="test12, test13" />
+ <target name="all" depends="test12, test13, loggerTest" />
+
+ <target name="loggerTest" depends="build_loggerTest">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="los.classpath" />
+ <classpath location="${javac.dest.12}" />
+ <formatter type="plain" usefile="false" />
+ <test name="test.LoggerTest" />
+ </junit>
+ </target>
+
<target name="test12" depends="build_log4j12">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="log4-bridge.classpath" />
+ <classpath refid="los.classpath" />
<classpath location="${javac.dest.12}" />
<formatter type="plain" usefile="false" />
<test name="test.Log4j12Calls" />
@@ -109,7 +127,7 @@
<target name="test13" depends="build_log4j13">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
- <classpath refid="log4-bridge.classpath" />
+ <classpath refid="los.classpath" />
<classpath location="${javac.dest.13}" />
<formatter type="plain" usefile="false" />
<test name="test.Log4j13Calls" />
Modified:
slf4j/trunk/log4j-over-slf4j/compatibility/lib/logback-classic-0.9.8-SNAPSHOT.jar
==============================================================================
Binary files. No diff available.
Modified:
slf4j/trunk/log4j-over-slf4j/compatibility/lib/logback-core-0.9.8-SNAPSHOT.jar
==============================================================================
Binary files. No diff available.
Modified: slf4j/trunk/log4j-over-slf4j/compatibility/readme.txt
==============================================================================
--- slf4j/trunk/log4j-over-slf4j/compatibility/readme.txt (original)
+++ slf4j/trunk/log4j-over-slf4j/compatibility/readme.txt Thu Jul 12
22:16:55 2007
@@ -1,8 +1,3 @@
-#--------------------------#
-| |
-| Log4j-bridge Read-me |
-| |
-#--------------------------#
This directory is used to test the module against various log4j calls.
Two test cases simulate the typical calls that one can find in an application
@@ -18,5 +13,5 @@
ant all
-To obtain more information about the use of the log4j-bridge module,
-please visit http://logback.qos.ch/bridge.html
\ No newline at end of file
+To obtain more information about the use of the log4j-over-slf4j module,
+please visit http://www..slf4j.org/log4j-over-slf4j.html
\ No newline at end of file
Copied:
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/DummyObject.java
(from r845,
/slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/DummyObject.java)
==============================================================================
---
/slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/DummyObject.java
(original)
+++
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/DummyObject.java
Thu Jul 12 22:16:55 2007
@@ -1,4 +1,4 @@
-package test.org.apache.log4j;
+package test;
public class DummyObject {
Copied:
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/LoggerTest.java
(from r845,
/slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/LoggerTest.java)
==============================================================================
---
/slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/org/apache/log4j/LoggerTest.java
(original)
+++
slf4j/trunk/log4j-over-slf4j/compatibility/src/main/java/test/LoggerTest.java
Thu Jul 12 22:16:55 2007
@@ -1,4 +1,4 @@
-package org.apache.log4j;
+package test;
import junit.framework.TestCase;
@@ -7,6 +7,7 @@
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.LoggingEvent;
import ch.qos.logback.core.read.ListAppender;
+import org.apache.log4j.Level;
/**
* A class that tests the invocation of the org.apache.log4j.Logger class that
_______________________________________________
dev mailing list
[email protected]
http://www.slf4j.org/mailman/listinfo/dev
