[slf4j-dev] svn commit: r21 - in slf4j/trunk/tests: . input input/log4j

[ceki at slf4j.org]

Author: ceki
Date: Fri Apr 29 18:49:54 2005
New Revision: 21

Added:
   slf4j/trunk/tests/input/
   slf4j/trunk/tests/input/log4j/
   slf4j/trunk/tests/input/log4j/basic.xml
Modified:
   slf4j/trunk/tests/build.xml
Log:

Added test for log4j-1.2.10



Modified: slf4j/trunk/tests/build.xml
==============================================================================
--- slf4j/trunk/tests/build.xml	(original)
+++ slf4j/trunk/tests/build.xml	Fri Apr 29 18:49:54 2005
@@ -32,10 +32,10 @@
     <pathelement location="../slf4j-jdk14.jar"/>
   </path>
 
-   <path id="log4j.classpath">
+   <path id="log4j1210.classpath">
      <path refid="basic.classpath"/>
-     <fileset dir="..">
-       <include name="log4j-*.jar"/>
+     <fileset dir="lib">
+       <include name="log4j-1.2.10.jar"/>
      </fileset>
   </path>
 
@@ -97,11 +97,6 @@
     <ant  dir=".." antfile="build.xml" target="slf4j-jdk14.jar"/> 
   </target>
 
-  <target name="log4j.jar">
-    <!-- The main build is big enough to have its own properties -->
-    <ant  dir=".." antfile="build.xml" target="log4j.jar" inheritAll="false"/> 
-  </target>
-  
   <!-- ================================================================= -->
   <!-- Run all tests                                                     -->
   <!-- ================================================================= -->  
@@ -111,7 +106,8 @@
   <target name="regression" depends="MessageFormatter,
                                      InvokeNOP,
                                      InvokeSimple,
-                                     InvokeJDK14"
+                                     InvokeJDK14,
+                                     InvokeLog4j1210"
                                      />
 
   <target name="MessageFormatter" depends="build, cleanOutputDir">
@@ -147,14 +143,14 @@
   </target>
 
 
-  <target name="InvokeLog4j" depends="build, log4j.jar, cleanOutputDir">
+  <target name="InvokeLog4j1210" depends="build, cleanOutputDir">
     
-    <copy file="input/slf4j/basic.xml" tofile="${tests.javac.dest}/log4j.xml"/>
+    <copy file="input/log4j/basic.xml" tofile="${tests.javac.dest}/log4j.xml"/>
 
     <junit printsummary="yes" fork="yes" haltonfailure="yes">
-      <classpath refid="log4j.classpath"/>
+      <classpath refid="log4j1210.classpath"/>
       <formatter type="plain" usefile="false"/>
-      <test name="org.slf4j.InvokingSLF4" />
+      <test name="org.slf4j.InvokingSLF4J" />
     </junit>
 
     <delete file="${tests.javac.dest}/log4j.xml"/>

Added: slf4j/trunk/tests/input/log4j/basic.xml
==============================================================================
--- (empty file)
+++ slf4j/trunk/tests/input/log4j/basic.xml	Fri Apr 29 18:49:54 2005
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/' debug="false">
+
+  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern"  value="%d %c - %m%n"/>  
+    </layout>
+  </appender>
+    
+  <root>
+    <level value="DEBUG" />
+    <appender-ref ref="CONSOLE" />
+  </root>
+  
+</log4j:configuration>