zongaro 2003/03/14 11:39:34
Modified: test Tag: XSLTC_DTM test.properties build.xml
test/tests/conf/string Tag: XSLTC_DTM string48.xsl
string49.xsl string61.xsl string62.xsl
Log:
Merging latest changes from the MAIN branch back to the XSLTC_DTM branch.
Revision Changes Path
No revision
No revision
1.90.2.2 +2 -1 xml-xalan/test/test.properties
Index: test.properties
===================================================================
RCS file: /home/cvs/xml-xalan/test/test.properties,v
retrieving revision 1.90.2.1
retrieving revision 1.90.2.2
diff -u -r1.90.2.1 -r1.90.2.2
--- test.properties 11 Feb 2003 18:31:43 -0000 1.90.2.1
+++ test.properties 14 Mar 2003 19:39:33 -0000 1.90.2.2
@@ -140,7 +140,8 @@
# Bugzilla10900 select85.xsl
# Bugzilla14862 idkey61.xsl;idkey62.xsl
# Bugzilla14999 idkey31.xsl
-smoketest.conf.normal.excludes=attribset40.xsl;axes62.xsl;axes129.xsl;copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl;idkey31.xsl;idkey61.xsl;idkey62.xsl;numberformat45.xsl;numberformat46.xsl;output97.xsl;select85.xsl
+# Bugzilla17400 position112.xsl;position113.xsl
+smoketest.conf.normal.excludes=attribset40.xsl;axes62.xsl;axes129.xsl;copy56.xsl;copy58.xsl;copy59.xsl;copy60.xsl;idkey31.xsl;idkey61.xsl;idkey62.xsl;numberformat45.xsl;numberformat46.xsl;output97.xsl;position112.xsl;position113.xsl;select85.xsl
smoketest.conf.supplemental.excludes=
smoketest.extensions.excludes=javaBugzilla3722.xsl;libraryNodeset05.xsl;libraryNodeset06.xsl;libraryNodeset07.xsl;libraryNodeset08.xsl
1.53.2.7 +33 -31 xml-xalan/test/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/build.xml,v
retrieving revision 1.53.2.6
retrieving revision 1.53.2.7
diff -u -r1.53.2.6 -r1.53.2.7
--- build.xml 27 Jan 2003 18:52:28 -0000 1.53.2.6
+++ build.xml 14 Mar 2003 19:39:33 -0000 1.53.2.7
@@ -188,6 +188,12 @@
<!-- Add more pathelements if we add more Java extensions dirs -->
</path>
+ <!-- Classpath used when build/running xslt20 XPath 2.0 RWAPI tests -->
+ <path id="rwapitest.class.path">
+ <path refid="api.class.path" />
+ <pathelement location="${xalan.build.dir}/xpathapi.jar" />
+ </path>
+
<!-- ==================================================================
-->
<!-- Initialize: Define an Ant task that executes Xalan test automation
-->
<!-- ==================================================================
-->
@@ -454,6 +460,21 @@
<echo message="If you got ClassNotFound, did you 'build
extensions.classes' first?" />
</target>
+ <target name="rwapi" description="Run TestletDriver with xslt20 XPath2.0
RWAPI tests"
+ depends="init.test,compile.rwapi,jar">
+ <property name="testClass"
value="org.apache.qetest.xsl.StylesheetTestletDriver" />
+ <echo message="Executing Xalan conf test: ${testClass}" />
+ <property name="testType" value="conf." />
+ <property name="conf.testlet"
value="org.apache.qetest.rwapi.XPathASTTestlet" />
+ <xalantest test="${testClass}"
+ testType="${testType}"
+ classpathref="rwapitest.class.path"
+ bootclasspathref="boot.class.path"
+ fork="${fork-tests}"
+ failonerror="${fail-on-error}" />
+ <property name="scan.outputDir" value="${conf.outputDir}"/>
+ <antcall target="scan"/>
+ </target>
<!-- ==================================================================
-->
<!-- Run tests: Run the Xalan-J 2.x Minitest
-->
<!-- ==================================================================
-->
@@ -1069,10 +1090,18 @@
classpathref="compiletest.class.path" />
</target>
+ <target name="compile.rwapi" depends="compile">
+ <echo message="Compile xslt20 / XPath2.0 RWAPI tests" />
+ <javac srcdir="${test.src.dir}"
+ destdir="${test.build.dir}"
+ includes="${test.root}rwapi/*.*"
+ debug="${debug}"
+ classpathref="rwapitest.class.path" />
+ </target>
+
<!-- Note that this target must *not* depend on any XSLTC tests,
which have to be compiled separately; otherwise the
- smoketest will fail. Please see compile.xsltc and
- jar.xsltc targets instead.
+ smoketest will fail.
-->
<target name="jar" depends="compile"
description="Build testxsl.jar with all available tests">
@@ -1316,33 +1345,6 @@
-->
<pathelement location="." />
</path>
-
- <target name="compile.xsltc.xslwrappers" depends="compile.xsl"
- description="Compile Xsltc*Wrapper xslwrappers only">
- <javac srcdir="${test.src.dir}"
- destdir="${test.build.dir}"
-
includes="${test.root}xslwrapper/Trax*Wrapper.java,${test.root}xslwrapper/TraxWrapperUtils.java,${test.root}xslwrapper/Xsltc*Wrapper.java,${test.root}dtm/xsltcDocCode.java"
- debug="${debug}">
- <classpath refid="xsltc.compile.class.path" />
- </javac>
- </target>
-
- <target name="compile.xsltc" depends="compile.trax"
- description="Compile xsltc native API tests only">
- <javac srcdir="${test.src.dir}"
- destdir="${test.build.dir}"
- includes="${test.root}xsltc/*.java"
- debug="${debug}">
- <classpath refid="xsltc.compile.class.path" />
- </javac>
- </target>
-
- <target name="jar.xsltc" depends="compile.xsltc"
- description="Build testxsl.jar with xsltc-specific tests">
- <jar jarfile="${test.build.dir}/${testxsl.jar.name}"
- basedir="${test.build.dir}"
- includes="**/*.class,**/*.properties" />
- </target>
<target name="conf.xsltc" description="Run TestletDriver over the conf
tree using xsltc">
<!-- Set the default conformance test driver, user may override -->
No revision
No revision
1.1.2.1 +10 -6 xml-xalan/test/tests/conf/string/string48.xsl
Index: string48.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/string/string48.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- string48.xsl 15 Dec 2000 21:52:08 -0000 1.1
+++ string48.xsl 14 Mar 2003 19:39:34 -0000 1.1.2.1
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <!-- FileName: str48 -->
+ <!-- FileName: string48 -->
<!-- Document: http://www.w3.org/TR/xpath -->
- <!-- DocVersion: 19990922 -->
+ <!-- DocVersion: 19991116 -->
<!-- Section: 4.2 String Functions -->
- <!-- Purpose: Test of 'starts-with()' function. -->
+ <!-- AdditionalSpec: http://www.w3.org/1999/11/REC-xpath-19991116-errata/
-->
+ <!-- ErrataAdd: 20011101 -->
+ <!-- Purpose: If the second argument to starts-with is the empty string,
then true is returned. -->
+
+<xsl:output method="xml" encoding="UTF-8" indent="no"/>
<xsl:template match="doc">
- <out>
- <xsl:value-of select="starts-with('abc', '')"/>
- </out>
+ <out>
+ <xsl:value-of select="starts-with('abc','')"/>
+ </out>
</xsl:template>
</xsl:stylesheet>
1.1.2.1 +8 -6 xml-xalan/test/tests/conf/string/string49.xsl
Index: string49.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/string/string49.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- string49.xsl 15 Dec 2000 21:52:08 -0000 1.1
+++ string49.xsl 14 Mar 2003 19:39:34 -0000 1.1.2.1
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <!-- FileName: str49 -->
+ <!-- FileName: string49 -->
<!-- Document: http://www.w3.org/TR/xpath -->
- <!-- DocVersion: 19990922 -->
+ <!-- DocVersion: 19991116 -->
<!-- Section: 4.2 String Functions -->
- <!-- Purpose: Test of 'starts-with()' function. -->
+ <!-- Purpose: If the second argument to starts-with is the empty string,
then true is returned. -->
+
+<xsl:output method="xml" encoding="UTF-8" indent="no"/>
<xsl:template match="doc">
- <out>
- <xsl:value-of select="starts-with('','')"/>
- </out>
+ <out>
+ <xsl:value-of select="starts-with('','')"/>
+ </out>
</xsl:template>
</xsl:stylesheet>
1.1.2.1 +10 -6 xml-xalan/test/tests/conf/string/string61.xsl
Index: string61.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/string/string61.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- string61.xsl 15 Dec 2000 21:52:10 -0000 1.1
+++ string61.xsl 14 Mar 2003 19:39:34 -0000 1.1.2.1
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <!-- FileName: str61 -->
+ <!-- FileName: string61 -->
<!-- Document: http://www.w3.org/TR/xpath -->
- <!-- DocVersion: 19990922 -->
+ <!-- DocVersion: 19991116 -->
<!-- Section: 4.2 String Functions -->
- <!-- Purpose: Test of 'contains()' function. -->
+ <!-- AdditionalSpec: http://www.w3.org/1999/11/REC-xpath-19991116-errata/
-->
+ <!-- ErrataAdd: 20011101 -->
+ <!-- Purpose: If the second argument to contains is the empty string, then
true is returned. -->
+
+<xsl:output method="xml" encoding="UTF-8" indent="no"/>
<xsl:template match="doc">
- <out>
- <xsl:value-of select="contains('abc', '')"/>
- </out>
+ <out>
+ <xsl:value-of select="contains('abc','')"/>
+ </out>
</xsl:template>
</xsl:stylesheet>
1.1.2.1 +10 -6 xml-xalan/test/tests/conf/string/string62.xsl
Index: string62.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/string/string62.xsl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- string62.xsl 15 Dec 2000 21:52:11 -0000 1.1
+++ string62.xsl 14 Mar 2003 19:39:34 -0000 1.1.2.1
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <!-- FileName: str62 -->
+ <!-- FileName: string62 -->
<!-- Document: http://www.w3.org/TR/xpath -->
- <!-- DocVersion: 19990922 -->
+ <!-- DocVersion: 19991116 -->
<!-- Section: 4.2 String Functions -->
- <!-- Purpose: Test of 'contains()' function. -->
+ <!-- AdditionalSpec: http://www.w3.org/1999/11/REC-xpath-19991116-errata/
-->
+ <!-- ErrataAdd: 20011101 -->
+ <!-- Purpose: If the second argument to contains is the empty string, then
true is returned. -->
+
+<xsl:output method="xml" encoding="UTF-8" indent="no"/>
<xsl:template match="doc">
- <out>
- <xsl:value-of select="contains('','')"/>
- </out>
+ <out>
+ <xsl:value-of select="contains('','')"/>
+ </out>
</xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
