curcuru 01/02/14 14:58:35
Modified: test/tests/conf/expression/err expressionerr01.xsl
expressionerr02.xsl
test/tests/conf/extend/err extenderr02.xsl extenderr03.xsl
extenderr04.xsl extenderr05.xsl
test/tests/conf/idkey/err idkeyerr01.xsl idkeyerr02.xsl
idkeyerr03.xsl idkeyerr14.xsl idkeyerr15.xsl
idkeyerr16.xsl idkeyerr17.xsl idkeyerr18.xsl
idkeyerr19.xsl
test/tests/conf/impincl/err impinclerr01.xsl
impinclerr02.xsl impinclerr04.xsl impinclerr05.xsl
impinclerr06.xsl impinclerr08.xsl impinclerr09.xsl
Log:
More: Update various ExpectedException strings for Xalan-J 2.x (ongoing)
Revision Changes Path
1.2 +1 -0
xml-xalan/test/tests/conf/expression/err/expressionerr01.xsl
Index: expressionerr01.xsl
===================================================================
RCS file:
/home/cvs/xml-xalan/test/tests/conf/expression/err/expressionerr01.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expressionerr01.xsl 2000/12/15 19:40:29 1.1
+++ expressionerr01.xsl 2001/02/14 22:58:29 1.2
@@ -8,6 +8,7 @@
<!-- Purpose: Invoke unparsed-entity-uri function with zero arguments -->
<!-- Creator: David Marston -->
<!-- ExpectedException: The unparsed-entity-uri function should take one
argument -->
+ <!-- ExpectedException: FuncUnparsedEntityURI only allows 1 arguments -->
<xsl:template match="doc">
<out>
1.2 +1 -0
xml-xalan/test/tests/conf/expression/err/expressionerr02.xsl
Index: expressionerr02.xsl
===================================================================
RCS file:
/home/cvs/xml-xalan/test/tests/conf/expression/err/expressionerr02.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expressionerr02.xsl 2000/12/15 19:40:29 1.1
+++ expressionerr02.xsl 2001/02/14 22:58:29 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Invoke unparsed-entity-uri function with too many arguments
-->
<!-- ExpectedException: The unparsed-entity-uri function should take one
argument -->
+ <!-- ExpectedException: FuncUnparsedEntityURI only allows 1 arguments -->
<xsl:template match="doc">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/extend/err/extenderr02.xsl
Index: extenderr02.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/extend/err/extenderr02.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extenderr02.xsl 2000/12/16 01:10:50 1.1
+++ extenderr02.xsl 2001/02/14 22:58:30 1.2
@@ -8,6 +8,7 @@
<!-- Purpose: Test function-available with too few arguments. -->
<!-- Creator: David Marston -->
<!-- ExpectedException: function-available requires one argument -->
+ <!-- ExpectedException: FuncExtFunctionAvailable only allows 1 arguments
-->
<xsl:template match="/">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/extend/err/extenderr03.xsl
Index: extenderr03.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/extend/err/extenderr03.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extenderr03.xsl 2000/12/16 01:10:50 1.1
+++ extenderr03.xsl 2001/02/14 22:58:30 1.2
@@ -7,6 +7,7 @@
<!-- Section: 14 Extensions -->
<!-- Purpose: Test function-available with too many arguments. -->
<!-- ExpectedException: function-available requires one argument -->
+ <!-- ExpectedException: FuncExtFunctionAvailable only allows 1 arguments
-->
<xsl:template match="/">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/extend/err/extenderr04.xsl
Index: extenderr04.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/extend/err/extenderr04.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extenderr04.xsl 2000/12/16 01:10:50 1.1
+++ extenderr04.xsl 2001/02/14 22:58:30 1.2
@@ -8,6 +8,7 @@
<!-- Purpose: Test element-available with too few arguments. -->
<!-- Creator: David Marston -->
<!-- ExpectedException: element-available requires one argument -->
+ <!-- ExpectedException: FuncExtElementAvailable only allows 1 arguments -->
<xsl:template match="/">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/extend/err/extenderr05.xsl
Index: extenderr05.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/extend/err/extenderr05.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extenderr05.xsl 2000/12/16 01:10:50 1.1
+++ extenderr05.xsl 2001/02/14 22:58:30 1.2
@@ -8,6 +8,7 @@
<!-- Purpose: Test element-available with too many arguments. -->
<!-- Creator: David Marston -->
<!-- ExpectedException: element-available requires one argument -->
+ <!-- ExpectedException: FuncExtElementAvailable only allows 1 arguments -->
<xsl:template match="/">
<out>
1.2 +1 -1 xml-xalan/test/tests/conf/idkey/err/idkeyerr01.xsl
Index: idkeyerr01.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr01.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr01.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr01.xsl 2001/02/14 22:58:31 1.2
@@ -9,7 +9,7 @@
<!-- Creator: David Marston -->
<!-- ExpectedException: xsl:key requires a name attribute! -->
<!-- ExpectedException: org.apache.xalan.xslt.XSLProcessorException:
xsl:key requires a name attribute! -->
-
+ <!-- ExpectedException: xsl:key requires attribute: name -->
<xsl:output indent="yes"/>
<xsl:key match="div" use="title" />
1.2 +2 -1 xml-xalan/test/tests/conf/idkey/err/idkeyerr02.xsl
Index: idkeyerr02.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr02.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr02.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr02.xsl 2001/02/14 22:58:31 1.2
@@ -9,7 +9,8 @@
<!-- Creator: David Marston -->
<!-- ExpectedException: xsl:key requires a match attribute! -->
<!-- ExpectedException: org.apache.xalan.xslt.XSLProcessorException:
xsl:key requires a match attribute! -->
-
+ <!-- ExpectedException: xsl:key requires attribute: match -->
+
<xsl:output indent="yes"/>
<xsl:key name="mykey" use="title"/>
1.2 +1 -0 xml-xalan/test/tests/conf/idkey/err/idkeyerr03.xsl
Index: idkeyerr03.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr03.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr03.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr03.xsl 2001/02/14 22:58:31 1.2
@@ -9,6 +9,7 @@
<!-- Creator: David Marston -->
<!-- ExpectedException: xsl:key requires a use attribute! -->
<!-- ExpectedException: org.apache.xalan.xslt.XSLProcessorException:
xsl:key requires a use attribute! -->
+ <!-- ExpectedException: xsl:key requires attribute: use -->
<xsl:output indent="yes"/>
1.2 +1 -0 xml-xalan/test/tests/conf/idkey/err/idkeyerr14.xsl
Index: idkeyerr14.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr14.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr14.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr14.xsl 2001/02/14 22:58:31 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Call key() with too few arguments. -->
<!-- ExpectedException: key() requires two arguments -->
+ <!-- ExpectedException: FuncKey only allows 2 arguments -->
<xsl:output indent="yes"/>
1.2 +1 -0 xml-xalan/test/tests/conf/idkey/err/idkeyerr15.xsl
Index: idkeyerr15.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr15.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr15.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr15.xsl 2001/02/14 22:58:31 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Call key() with too many arguments. -->
<!-- ExpectedException: key() requires two arguments -->
+ <!-- ExpectedException: FuncKey only allows 2 arguments -->
<xsl:output indent="yes"/>
1.3 +1 -0 xml-xalan/test/tests/conf/idkey/err/idkeyerr16.xsl
Index: idkeyerr16.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr16.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- idkeyerr16.xsl 2001/01/26 15:45:14 1.2
+++ idkeyerr16.xsl 2001/02/14 22:58:31 1.3
@@ -9,6 +9,7 @@
<!-- Purpose: Test of 'generate-id()' with multiple arguments. Should
generate
an error. Should test for zero, or one argument. -->
<!-- ExpectedException: generate-id only allows 1 argument -->
+ <!-- ExpectedException: FuncGenerateId only allows 1 arguments -->
<xsl:template match="doc">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/idkey/err/idkeyerr17.xsl
Index: idkeyerr17.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr17.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr17.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr17.xsl 2001/02/14 22:58:31 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Test placement of xsl:key inside atemplate, which is
illegal. -->
<!-- ExpectedException: XSLT: (StylesheetHandler) xsl:key is not allowed
inside a template! -->
+ <!-- ExpectedException: xsl:key is not allowed in this position in the
stylesheet! -->
<xsl:template match="doc">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/idkey/err/idkeyerr18.xsl
Index: idkeyerr18.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr18.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr18.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr18.xsl 2001/02/14 22:58:32 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Test for id() with too few arguments. -->
<!-- ExpectedException: id() should have one argument -->
+ <!-- ExpectedException: FuncId only allows 1 argument -->
<xsl:template match="t04">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/idkey/err/idkeyerr19.xsl
Index: idkeyerr19.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/idkey/err/idkeyerr19.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- idkeyerr19.xsl 2000/12/15 19:36:57 1.1
+++ idkeyerr19.xsl 2001/02/14 22:58:32 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Test for id() with too many arguments. -->
<!-- ExpectedException: id() should have one argument -->
+ <!-- ExpectedException: FuncId only allows 1 argument -->
<xsl:template match="t04">
<out>
1.2 +2 -1 xml-xalan/test/tests/conf/impincl/err/impinclerr01.xsl
Index: impinclerr01.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/impincl/err/impinclerr01.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- impinclerr01.xsl 2000/12/16 01:13:50 1.1
+++ impinclerr01.xsl 2001/02/14 22:58:33 1.2
@@ -9,7 +9,8 @@
<!-- Purpose: It is an error for a stylesheet to import itself. -->
<!-- ExpectedException: (StylesheetHandler)
file:/E:\builds\testsuite\.\conf\impincl\err\impinclerr01.xsl is directly or
indirectly importing itself! -->
<!-- ExpectedException: (StylesheetHandler)
file:E:/builds/testsuite/conf/impincl/err/impinclerr01.xsl is directly or
indirectly importing itself! -->
- <!-- ExpectedException: org.apache.xalan.xslt.XSLProcessorException:
(StylesheetHandler) file:E:/builds/testsuite/conf/impincl/err/impinclerr01.xsl
is directly or indirectly importing itself! -->
+ <!-- ExpectedException: impinclerr01.xsl is directly or indirectly
importing itself! -->
+
<xsl:import href="impinclerr01.xsl"/>
<xsl:template match="doc">
1.3 +1 -0 xml-xalan/test/tests/conf/impincl/err/impinclerr02.xsl
Index: impinclerr02.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/impincl/err/impinclerr02.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- impinclerr02.xsl 2001/01/26 15:46:46 1.2
+++ impinclerr02.xsl 2001/02/14 22:58:33 1.3
@@ -9,6 +9,7 @@
<!-- Purpose: It is an error if apply-imports is instantiated when the
current
template rule is null, i.e. from within a xsl:for-each loop. -->
<!-- ExpectedException: Attempt to use apply-imports without current
template rule -->
+ <!-- ExpectedException: xsl:apply-imports not allowed in a xsl:for-each -->
<xsl:import href="k.xsl"/>
1.2 +1 -1 xml-xalan/test/tests/conf/impincl/err/impinclerr04.xsl
Index: impinclerr04.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/impincl/err/impinclerr04.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- impinclerr04.xsl 2000/12/16 01:13:50 1.1
+++ impinclerr04.xsl 2001/02/14 22:58:33 1.2
@@ -9,7 +9,7 @@
<!-- Purpose: It is an error for a stylesheet to include itself. -->
<!-- ExpectedException: (StylesheetHandler)
file:/E:\builds\testsuite\.\conf\impincl\err\impinclerr04.xsl is directly or
indirectly importing itself! -->
<!-- ExpectedException: (StylesheetHandler)
file:E:/builds/testsuite/conf/impincl/err/impinclerr04.xsl is directly or
indirectly importing itself! -->
- <!-- ExpectedException: org.apache.xalan.xslt.XSLProcessorException:
(StylesheetHandler) file:E:/builds/testsuite/conf/impincl/err/impinclerr04.xsl
is directly or indirectly importing itself! -->
+ <!-- ExpectedException: impinclerr04.xsl is directly or indirectly
including itself! -->
<xsl:include href="impinclerr04.xsl"/>
1.2 +1 -0 xml-xalan/test/tests/conf/impincl/err/impinclerr05.xsl
Index: impinclerr05.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/impincl/err/impinclerr05.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- impinclerr05.xsl 2000/12/16 01:13:50 1.1
+++ impinclerr05.xsl 2001/02/14 22:58:34 1.2
@@ -11,6 +11,7 @@
<!-- Note: SCurcuru 28-Feb-00 added ExpectedException; seems like good
error text to me. -->
<!-- ExpectedException: org.apache.xalan.xslt.XSLProcessorException:
(StylesheetHandler) Could not find href attribute for xsl:import -->
<!-- ExpectedException: (StylesheetHandler) Could not find href attribute
for xsl:import -->
+ <!-- ExpectedException: xsl:import requires attribute: href -->
<xsl:import/>
1.2 +1 -0 xml-xalan/test/tests/conf/impincl/err/impinclerr06.xsl
Index: impinclerr06.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/impincl/err/impinclerr06.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- impinclerr06.xsl 2000/12/16 01:13:50 1.1
+++ impinclerr06.xsl 2001/02/14 22:58:34 1.2
@@ -11,6 +11,7 @@
<!-- Note: SCurcuru 28-Feb-00 added ExpectedException; seems like good
error text to me. -->
<!-- ExpectedException: org.apache.xalan.xslt.XSLProcessorException:
(StylesheetHandler) Could not find href attribute for xsl:include -->
<!-- ExpectedException: (StylesheetHandler) Could not find href attribute
for xsl:include -->
+ <!-- ExpectedException: xsl:include requires attribute: href -->
<xsl:include/>
1.2 +1 -0 xml-xalan/test/tests/conf/impincl/err/impinclerr08.xsl
Index: impinclerr08.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/impincl/err/impinclerr08.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- impinclerr08.xsl 2000/12/16 01:13:50 1.1
+++ impinclerr08.xsl 2001/02/14 22:58:34 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Test placement of xsl:import inside a template, which is
illegal. -->
<!-- ExpectedException: XSLT: (StylesheetHandler) xsl:import is not
allowed inside a template! -->
+ <!-- ExpectedException: xsl:import is not allowed in this position in the
stylesheet! -->
<xsl:template match="doc">
<out>
1.2 +1 -0 xml-xalan/test/tests/conf/impincl/err/impinclerr09.xsl
Index: impinclerr09.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/impincl/err/impinclerr09.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- impinclerr09.xsl 2000/12/16 01:13:50 1.1
+++ impinclerr09.xsl 2001/02/14 22:58:34 1.2
@@ -8,6 +8,7 @@
<!-- Creator: David Marston -->
<!-- Purpose: Test placement of xsl:include inside a template, which is
illegal. -->
<!-- ExpectedException: XSLT: (StylesheetHandler) xsl:include is not
allowed inside a template! -->
+ <!-- ExpectedException: xsl:include is not allowed in this position in the
stylesheet! -->
<xsl:template match="doc">
<out>
