curcuru 01/07/30 13:10:37
Modified: test build.xml test.properties
Log:
Updated to enable minitest,. smoketest, and harness meta-targets
These targets re-set various properties and then use worker
targets like conf and api to run sets of tests
Revision Changes Path
1.3 +48 -4 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/07/26 19:52:25 1.2
+++ build.xml 2001/07/30 20:10:37 1.3
@@ -199,8 +199,9 @@
<!-- Set the default conformance test driver, user may override -->
<property name="testClass"
value="org.apache.qetest.xsl.StylesheetTestletDriver" />
<echo message="Executing Xalan conf test: ${testClass}" />
+ <property name="testType" value="conf." />
<xalantest test="${testClass}"
- testType="conf."
+ testType="${testType}"
classpathref="conf.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
@@ -214,8 +215,9 @@
<!-- Set the default conformance test driver, user may override -->
<property name="testClass"
value="org.apache.qetest.xsl.StylesheetTestletDriver" />
<echo message="Executing Xalan perf test: ${testClass}" />
+ <property name="testType" value="perf." />
<xalantest test="${testClass}"
- testType="perf."
+ testType="${testType}"
classpathref="perf.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
@@ -229,8 +231,9 @@
<!-- Set the default conformance test driver, user may override -->
<property name="testClass"
value="org.apache.qetest.xsl.StylesheetTestletDriver" />
<echo message="Executing Xalan contrib test: ${testClass}" />
+ <property name="testType" value="contrib." />
<xalantest test="${testClass}"
- testType="contrib."
+ testType="${testType}"
classpathref="contrib.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
@@ -243,14 +246,29 @@
depends="init.test">
<!-- Note no default is set; also testClass is not prefixed! -->
<echo message="Executing Xalan api test: ${testClass}" />
+ <property name="testType" value="api." />
<xalantest test="${testClass}"
- testType="api."
+ testType="${testType}"
classpathref="api.class.path"
fork="${fork-tests}"
failonerror="${fail-on-error}" />
</target>
<!-- ==================================================================
-->
+ <!-- Run tests: Run all available API tests
-->
+ <!-- ==================================================================
-->
+ <target name="harness" description="Run all available API tests">
+ <antcall target="api">
+ <param name="testClass"
value="org.apache.qetest.xsl.XSLTestHarness"/>
+ <param name="qetest.tests" value="${harness.tests}"/>
+ <!-- Below line is in case we run ThreadedTestletDriver -->
+ <param name="qetest.testlet" value="${harness.threads.testlet}"/>
+ <param name="qetest.fileList"
value="${harness.threads.fileList}"/>
+ </antcall>
+ </target>
+
+
+ <!-- ==================================================================
-->
<!-- Run tests: Run the Xalan-J 2.x Minitest
-->
<!-- ==================================================================
-->
<target name="minitest" description="Run the Xalan-J 2.x Minitest">
@@ -258,6 +276,32 @@
<param name="testClass" value="org.apache.qetest.trax.Minitest"/>
</antcall>
</target>
+
+
+ <!-- ==================================================================
-->
+ <!-- Run tests: Run the Xalan-J 2.x Smoketest, including several tests
-->
+ <!-- Note: this target is frequently called from outside of this file!
-->
+ <!-- ==================================================================
-->
+ <target name="smoketest" description="Run the Xalan-J 2.x Smoketest">
+ <echo message="About to execute the Minitest..." />
+ <antcall target="api">
+ <param name="testClass" value="org.apache.qetest.trax.Minitest"/>
+ <param name="testType" value="minitest."/>
+ </antcall>
+ <echo message="About to execute other API tests..." />
+ <antcall target="api">
+ <param name="testClass"
value="org.apache.qetest.xsl.XSLTestHarness"/>
+ <param name="testType" value="smoketest.api."/>
+ </antcall>
+ <echo message="About to execute Conformance tests..." />
+ <antcall target="conf">
+ <param name="qetest.category" value="copy"/> <!-- HACK DEBUGGING
-->
+ <param name="testType" value="smoketest.conf."/>
+ </antcall>
+ <!-- Now, evaluate the results to see if we should fail or not -->
+ <!-- TBD -->
+ </target>
+
<!-- ==================================================================
-->
1.2 +29 -0 xml-xalan/test/test.properties
Index: test.properties
===================================================================
RCS file: /home/cvs/xml-xalan/test/test.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.properties 2001/07/25 18:29:17 1.1
+++ test.properties 2001/07/30 20:10:37 1.2
@@ -89,3 +89,32 @@
# Specify files to be skipped, and not tested at all
#qetest.excludes=lre01.xsl;lre02.xsl
+
+#---- Special: Smoketest settings and XSLTestHarness tests ----
+# Various other overrides for the smoketest; note that
+# the prefixes are ripped off in the smoketest target in build.xml
+# Runs the conformance test once with defaults
+smoketest.conf.inputDir=tests/conf
+smoketest.conf.goldDir=tests/conf-gold
+smoketest.conf.outputDir=smoketest/conf
+smoketest.conf.logFile=smoketest/results-conf.xml
+# Runs a selected set of known passing API tests
+smoketest.api.tests=trax.Minitest;trax.TransformerAPITest;xalanj2.TransformStateTest
+smoketest.api.inputDir=tests/api
+smoketest.api.goldDir=tests/api-gold
+smoketest.api.outputDir=smoketest/
+smoketest.api.logFile=smoketest/results-api.xml
+# Used by both the minitest and smoketest targets
+minitest.inputDir=tests/api
+minitest.goldDir=tests/api-gold
+minitest.outputDir=smoketest/
+minitest.logFile=smoketest/Minitest.xml
+
+# A listing of all normal API tests currently available, except Minitest
+# Note tests do not all include package names since they'll
+# actually be loaded by QetestUtils.testClassForName()
+harness.tests=trax.EmbeddedStylesheetTest;trax.ErrorListenerAPITest;trax.ErrorListenerTest;trax.ExamplesTest;trax.OutputPropertiesTest;trax.ParameterTest;trax.TemplatesAPITest;trax.TransformerAPITest;trax.TransformerFactoryAPITest;trax.SystemIdTest;trax.SystemIdImpInclTest;trax.URIResolverTest;;trax.dom.DOMResultAPITest;trax.dom.DOMSourceAPITest;;trax.sax.SAXResultAPITest;trax.sax.SAXSourceAPITest;trax.sax.SAXTransformerFactoryAPITest;trax.sax.TemplatesHandlerAPITest;trax.sax.TransformerHandlerAPITest;trax.sax.TransformerHandlerTest;;trax.stream.StreamResultAPITest;trax.stream.StreamSourceAPITest;;xalanj2.FactoryFeatureTest;xalanj2.ProgrammaticDOMTest;xalanj2.SerializedStylesheetTest;xalanj2.TraceListenerTest;xalanj2.TransformStateAPITest;xalanj2.TransformStateTest;xalanj2.TestXPathAPI;;
+harness.threads.testlet=org.apache.qetest.xsl.ThreadedStylesheetTestlet
+harness.threads.fileList=threads.filelist
+
+# End of File
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
