Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Massive removal of custom test targets now most tests support the PathableTestSuite stuff.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@209453 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Simon Kitching
2005-07-06 12:41:30 +00:00
parent 4c8d747d37
commit 1b26226906
1 changed files with 42 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
build.xml
View File

@@ -49,6 +49,17 @@
<property name="junit.home" value="/usr/local/junit3.5"/> <property name="junit.home" value="/usr/local/junit3.5"/>
<property name="jakarta.home" value="../.."/> <property name="jakarta.home" value="../.."/>
<!--
- The names of the unit tests to run. By default all tests are run, but
- this can be overridden from the command line by something like:
- ant -Dtestmatch=**/FooTestCase.java test
-
- Currently, the default is to run only the "pathable" test cases as
- the others still need to be converted over to specifying their
- custom classpaths.
-->
<property name="testmatch" value="**/pathable/*TestCase"/>
<!-- ========== Derived Values ============================================ --> <!-- ========== Derived Values ============================================ -->
@@ -101,6 +112,7 @@
<property name="core.jar.name" value="commons-${component.name}-${component.version}.jar"/> <property name="core.jar.name" value="commons-${component.name}-${component.version}.jar"/>
<property name="api.jar.name" value="commons-${component.name}-api-${component.version}.jar"/> <property name="api.jar.name" value="commons-${component.name}-api-${component.version}.jar"/>
<property name="adapters.jar.name" value="commons-${component.name}-adapters-${component.version}.jar"/> <property name="adapters.jar.name" value="commons-${component.name}-adapters-${component.version}.jar"/>
<property name="optional.jar.name" value="commons-${component.name}-optional-${component.version}.jar"/>
<!-- ========== Compiler Defaults ========================================= --> <!-- ========== Compiler Defaults ========================================= -->
@@ -143,13 +155,6 @@
<pathelement location="${servletapi.jar}"/> <pathelement location="${servletapi.jar}"/>
</path> </path>
<!-- Construct unit test classpath (JDK 1.4 tests) -->
<path id="test.classpath.jdk14">
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/tests"/>
<pathelement location="${junit.jar}"/>
</path>
<!-- Construct unit test classpath (Log4J tests) --> <!-- Construct unit test classpath (Log4J tests) -->
<path id="test.classpath.log4j13"> <path id="test.classpath.log4j13">
<pathelement location="${build.home}/classes"/> <pathelement location="${build.home}/classes"/>
@@ -180,6 +185,7 @@
<property name="test.sysprops.commons-logging" value="${build.home}/${core.jar.name}"/> <property name="test.sysprops.commons-logging" value="${build.home}/${core.jar.name}"/>
<property name="test.sysprops.commons-logging-api" value="${build.home}/${api.jar.name}"/> <property name="test.sysprops.commons-logging-api" value="${build.home}/${api.jar.name}"/>
<property name="test.sysprops.commons-logging-adapters" value="${build.home}/${adapters.jar.name}"/> <property name="test.sysprops.commons-logging-adapters" value="${build.home}/${adapters.jar.name}"/>
<property name="test.sysprops.commons-logging-optional" value="${dist.home}/${optional.jar.name}"/>
<propertyset id="test-lib-props"> <propertyset id="test-lib-props">
<propertyref prefix="test.sysprops."/> <propertyref prefix="test.sysprops."/>
<mapper type="glob" from="test.sysprops.*" to="*"/> <mapper type="glob" from="test.sysprops.*" to="*"/>
@@ -580,7 +586,7 @@ limitations under the License.--&gt;'>
<target name="test" <target name="test"
depends="test.alt-hashtable, log4j12-test-warning, compile.tests,test.jdk14,test.simple,test.avalon,test.log4j" depends="log4j12-test-warning, compile.tests, testall, test.log4j"
if="test.entry" if="test.entry"
description="Run all unit test cases"> description="Run all unit test cases">
<java classname="${test.runner}" fork="yes" <java classname="${test.runner}" fork="yes"
@@ -592,7 +598,7 @@ limitations under the License.--&gt;'>
<!-- <!--
- Target to run all unit tests under the "pathable" directory. - Target to run all unit tests (except log4j tests for now).
- -
- The batchtest task auto-detects what tests are available without - The batchtest task auto-detects what tests are available without
- any need to define TestSuite objects in the code to compose - any need to define TestSuite objects in the code to compose
@@ -605,17 +611,17 @@ limitations under the License.--&gt;'>
- If you're having problems running this target due to the use of - If you're having problems running this target due to the use of
- the "junit" task below, see the comments at the head of this file. - the "junit" task below, see the comments at the head of this file.
- -
- TODO: implement something like the "testmatchpattern" feature - Individual tests (or subsets of tests) can be run by doing
- of maven's test task. This would allow people to do something like - ant -Dtestmatch=**/FooTestCase testall
- ant -Dtestmatchpattern=**/FooTestCase.java test.pathable
- in order to run specific test cases, or subsets of test cases.
--> -->
<target name="test.pathable" depends="compile.tests"
<target name="testall" depends="compile.tests"
description="Run unit tests specific to Pathable support classes"> description="Run unit tests specific to Pathable support classes">
<echo message="Test output can be found in directory ${build.home}/test-reports."/> <echo message="Test output can be found in directory ${build.home}/test-reports."/>
<delete dir="${build.home}/test-reports"/> <delete dir="${build.home}/test-reports"/>
<mkdir dir="${build.home}/test-reports"/> <mkdir dir="${build.home}/test-reports"/>
<echo message="executing tests [${testmatch}.java]"/>
<!-- <!--
- Note that the fork/forkmode settings define default behaviour for tests. - Note that the fork/forkmode settings define default behaviour for tests.
- The <test> and <batchtest> tags can override these settings if needed. - The <test> and <batchtest> tags can override these settings if needed.
@@ -632,144 +638,37 @@ limitations under the License.--&gt;'>
- the use of the PathableClassLoader class used by some unit tests. - the use of the PathableClassLoader class used by some unit tests.
--> -->
<syspropertyset refid="test-lib-props"/> <syspropertyset refid="test-lib-props"/>
<classpath> <classpath refid="test.classpath"/>
<pathelement location="${build.home}/tests"/>
<pathelement location="${junit.jar}"/>
</classpath>
<!-- <!--
- Auto-detect the tests to run. Checking the source directory - Auto-detect the tests to run. Checking the ${build.home}/tests
- for java files rather than the ${build.home}/tests directory - directory for .class files rather than the src/test directory
- for .class files is deliberate; that will pick up any problems - for .java files means that when we run the tests on platforms
- where we haven't correctly compiled all the available unit test - where some components (eg jdk14 logging) is not available,
- source files. - just ensuring the tests are skipped from the compile will
- also cause them to be skipped from the testing.
-
- This does introduce the danger that if tests accidentally
- fail to compile then we won't notice it here. However that
- should have been reported earlier anyway.
--> -->
<batchtest todir="${build.home}/test-reports"> <batchtest todir="${build.home}/test-reports">
<fileset dir="${test.home}"> <fileset dir="${build.home}/tests">
<include name="**/pathable/*TestCase.java"/> <include name="${testmatch}.class"/>
<!--
- Because we have two possible log4j jar files we
- can't include them in the system classpath, and
- so can't run the log4j tests here until after
- those TestCase classes have been converted over
- to using the PathableTestSuite approach.
-->
<exclude name="**/log4j/*"/>
</fileset> </fileset>
</batchtest> </batchtest>
</junit> </junit>
</target> </target>
<target name="test.jdk14" depends="compile.tests" if="jdk.1.4.present"
description="Run unit tests specific to JDK 1.4 logging">
<echo message="Default Configuration (JDK 1.4 Auto-Recognized)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.DefaultConfigTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
</java>
<echo message="Default Configuration (JDK 1.4 LogFactoryImpl Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
<arg value="org.apache.commons.logging.jdk14.DefaultConfigTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
</java>
<echo message="Default Configuration (JDK 1.4 Jdk14Logger Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Jdk14Logger"/>
<arg value="org.apache.commons.logging.jdk14.DefaultConfigTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
</java>
<echo message="Custom Configuration (JDK 1.4 Auto-Recognized)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
</java>
<echo message="Custom Configuration (JDK 1.4 LogFactoryImpl Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
<arg value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
</java>
<echo message="Custom Configuration (JDK 1.4 Jdk14Logger Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Jdk14Logger"/>
<arg value="org.apache.commons.logging.jdk14.CustomConfigTestCase"/>
<classpath refid="test.classpath.jdk14"/>
</java>
<echo message="Basic Operations"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Jdk14Logger"/>
<arg value="org.apache.commons.logging.BasicOperationsTest"/>
<classpath refid="test.classpath.log4j12"/>
</java>
<echo message="Hierarchy Configuration API (JDK 1.4 Auto-Recognized)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.CustomConfigAPITestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
</java>
<echo message="Hierarchy Configuration API (JDK 1.4 LogFactoryImpl Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.CustomConfigAPITestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
</java>
<echo message="Hierarchy Configuration API (JDK 1.4 Jdk14Logger Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.CustomConfigAPITestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Jdk14Logger"/>
</java>
<echo message="Hierarchy Configuration FULL (JDK 1.4 Auto-Recognized)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.CustomConfigFullTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
</java>
<echo message="Hierarchy Configuration FULL (JDK 1.4 LogFactoryImpl Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.CustomConfigFullTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
<sysproperty key="org.apache.commons.logging.LogFactory"
value="org.apache.commons.logging.impl.LogFactoryImpl"/>
</java>
<echo message="Hierarchy Configuration FULL (JDK 1.4 Jdk14Logger Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.jdk14.CustomConfigFullTestCase"/>
<classpath refid="test.classpath.jdk14"/>
<syspropertyset refid="test-lib-props"/>
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.Jdk14Logger"/>
</java>
</target>
<target name="test.log4j" depends="compile.tests" if="log4j12.present" <target name="test.log4j" depends="compile.tests" if="log4j12.present"
description="Run unit tests specific to Log4J logging"> description="Run unit tests specific to Log4J logging">
@@ -889,83 +788,4 @@ limitations under the License.--&gt;'>
</target> </target>
<target name="test.simple" depends="compile.tests"
description="Run unit tests specific to SimpleLog logging">
<echo message="Default Configuration (SimpleLog Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.SimpleLog"/>
<arg value="org.apache.commons.logging.simple.DefaultConfigTestCase"/>
<classpath refid="test.classpath"/>
</java>
<echo message="Custom Configuration (SimpleLog Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.simple.DecoratedSimpleLog"/>
<sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
value="debug"/>
<arg value="org.apache.commons.logging.simple.CustomConfigTestCase"/>
<classpath refid="test.classpath"/>
</java>
<echo message="Custom Configuration With DateTime (SimpleLog Selected)"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.simple.DecoratedSimpleLog"/>
<sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
value="debug"/>
<sysproperty key="org.apache.commons.logging.simplelog.dateTimeFormat"
value="dd.mm.yyyy"/>
<sysproperty key="org.apache.commons.logging.simplelog.showdatetime"
value="true"/>
<arg value="org.apache.commons.logging.simple.DateTimeCustomConfigTestCase"/>
<classpath refid="test.classpath"/>
</java>
<echo message="Basic Operations"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<sysproperty key="org.apache.commons.logging.Log"
value="org.apache.commons.logging.impl.SimpleLog"/>
<arg value="org.apache.commons.logging.BasicOperationsTest"/>
<classpath refid="test.classpath"/>
</java>
</target>
<target name="test.avalon" depends="compile.tests" if="avalon-framework.present"
description="Run unit tests specific to Avalon (Framework) logging">
<echo message="Avalon Tests"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.avalon.AvalonLoggerTest"/>
<classpath refid="test.classpath"/>
</java>
</target>
<target name="test.alt-hashtable" depends="compile.tests"
description="Tests for hashtable substitution">
<echo message="Hashtable substitution Tests"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.AltHashtableTest"/>
<classpath refid="test.classpath"/>
<sysproperty key="org.apache.commons.logging.LogFactory.HashtableImpl"
value="org.apache.commons.logging.AltHashtable"/>
</java>
<echo message="Bad property test"/>
<java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
<arg value="org.apache.commons.logging.BadHashtablePropertyTest"/>
<classpath refid="test.classpath"/>
<sysproperty key="org.apache.commons.logging.LogFactory.HashtableImpl"
value="org.apache.commons.logging.bad.BogusHashTable"/>
</java>
</target>
</project> </project>