Author: peterjm
Date: Tue May 16 15:11:59 2006
New Revision: 407092
URL: http://svn.apache.org/viewcvs?rev=407092&view=rev
Log:
Changed Test.java to not output error messages. Also regenerated the expected
output to not have error messages.
Modified:
xerces/java/trunk/tests/xinclude/Test.java
xerces/java/trunk/tests/xinclude/output/test01.xml
xerces/java/trunk/tests/xinclude/output/test07.txt
xerces/java/trunk/tests/xinclude/output/test09.txt
xerces/java/trunk/tests/xinclude/output/test11.txt
xerces/java/trunk/tests/xinclude/output/test12.txt
xerces/java/trunk/tests/xinclude/output/test13.txt
xerces/java/trunk/tests/xinclude/output/test14.txt
xerces/java/trunk/tests/xinclude/output/test18.txt
xerces/java/trunk/tests/xinclude/output/test22.txt
xerces/java/trunk/tests/xinclude/output/test24.txt
xerces/java/trunk/tests/xinclude/output/test25.txt
xerces/java/trunk/tests/xinclude/output/test26.txt
xerces/java/trunk/tests/xinclude/output/test29.txt
xerces/java/trunk/tests/xinclude/output/test32.txt
xerces/java/trunk/tests/xinclude/output/test39.txt
xerces/java/trunk/tests/xinclude/output/test40.txt
Modified: xerces/java/trunk/tests/xinclude/Test.java
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/Test.java?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/Test.java (original)
+++ xerces/java/trunk/tests/xinclude/Test.java Tue May 16 15:11:59 2006
@@ -397,8 +397,14 @@
fOutputWriter.print(ex.getLineNumber());
fOutputWriter.print(':');
fOutputWriter.print(ex.getColumnNumber());
+ /*
+ * The String returned by getMessage() is not stable across JDKs, so we
+ * don't print it. Unfortunately, there doesn't seem to be a way to
get
+ * the underlying type of exception (like FileNotFoundException) so
+ * we just don't print anything.
fOutputWriter.print(": ");
fOutputWriter.print(ex.getMessage());
+ */
fOutputWriter.println();
fOutputWriter.flush();
} // printError(String,XMLParseException)
Modified: xerces/java/trunk/tests/xinclude/output/test01.xml
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test01.xml?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test01.xml (original)
+++ xerces/java/trunk/tests/xinclude/output/test01.xml Tue May 16 15:11:59 2006
@@ -2,20 +2,20 @@
<!-- This test doesn't test anything in particular. But it is an example of a
somewhat complicated setup. -->
<xit:myRoot xmlns:xit="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
- [Warning] test01.xml:8:87: Include operation failed, reverting to
fallback. Resource error reading file as XML (href='../included/invalid.xml').
Reason: tests\xinclude\included\invalid.xml (The system cannot find the file
specified)
+ [Warning] test01.xml:8:87
- [Warning] test01.xml:11:47: Include operation failed,
reverting to fallback. Resource error reading file as XML
(href='../included/invalid.xml'). Reason: tests\xinclude\included\invalid.xml
(The system cannot find the file specified)
+ [Warning] test01.xml:11:47
<child1 name="kid1"
xmlns:test01="http://www.test.org/test02";
xmlns:test02="http://www.test.org/TEST02";><desc>Text1</desc></child1>
- [Warning] test01.xml:22:45: Include operation failed, reverting to
fallback. Resource error reading file as XML (href='../included/invalid.xml').
Reason: tests\xinclude\included\invalid.xml (The system cannot find the file
specified)
+ [Warning] test01.xml:22:45
<child2 name="kid2"><desc>Text2</desc></child2>
<!-- this tests a valid include -->
- <!-- tests that files included from other directories work -->[Warning]
include09.xml:3:69: Include operation failed, reverting to fallback. Resource
error reading file as XML (href='invalid.xml'). Reason:
tests\xinclude\included\dir\invalid.xml (The system cannot find the file
specified)
+ <!-- tests that files included from other directories work -->[Warning]
include09.xml:3:69
<child3 xmlns="" name="kid3"
xml:base="../included/dir/include09.xml"><desc>Text3</desc></child3>
<!-- this tests that idrefs still work when an ID from an included file
is used -->
Modified: xerces/java/trunk/tests/xinclude/output/test07.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test07.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test07.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test07.txt Tue May 16 15:11:59 2006
@@ -2,4 +2,4 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- tests that values for parse other than "xml" or "text" are invalid -->
<!-- EXPECT FAILURE -->
- [Fatal Error] test07.xml:9:45: Invalid value for 'parse' attribute on
'include' element: 'xxx'.
+ [Fatal Error] test07.xml:9:45
Modified: xerces/java/trunk/tests/xinclude/output/test09.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test09.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test09.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test09.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- tests that 0 fallbacks is a failure when the include is unsuccessful
-->
<!-- EXPECT FAILURE -->
- [Warning] test09.xml:9:48: Include operation failed, reverting to fallback.
Resource error reading file as XML (href='../included/invalid.xml'). Reason:
tests\xinclude\included\invalid.xml (The system cannot find the file specified)
-[Fatal Error] test09.xml:9:48: An 'include' failed, and no 'fallback' element
was found.
+ [Warning] test09.xml:9:48
+[Fatal Error] test09.xml:9:48
Modified: xerces/java/trunk/tests/xinclude/output/test11.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test11.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test11.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test11.txt Tue May 16 15:11:59 2006
@@ -2,4 +2,4 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- tests that 2 fallbacks cause a failure when the include is successful
-->
<!-- EXPECT FAILURE -->
- <elem xmlns="http://www.schemaTest.org/xinclude-test";
xml:base="../included/elem.xml"/>[Fatal Error] test11.xml:11:22: The [children]
of an 'include' element cannot contain more than one 'fallback' element.
+ <elem xmlns="http://www.schemaTest.org/xinclude-test";
xml:base="../included/elem.xml"/>[Fatal Error] test11.xml:11:22
Modified: xerces/java/trunk/tests/xinclude/output/test12.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test12.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test12.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test12.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- tests that 2 fallbacks cause a failure when the include is
unsuccessful -->
<!-- EXPECT FAILURE -->
- [Warning] test12.xml:9:47: Include operation failed, reverting to fallback.
Resource error reading file as XML (href='../included/invalid.xml'). Reason:
tests\xinclude\included\invalid.xml (The system cannot find the file specified)
-[Fatal Error] test12.xml:11:22: The [children] of an 'include' element cannot
contain more than one 'fallback' element.
+ [Warning] test12.xml:9:47
+[Fatal Error] test12.xml:11:22
Modified: xerces/java/trunk/tests/xinclude/output/test13.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test13.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test13.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test13.txt Tue May 16 15:11:59 2006
@@ -2,4 +2,4 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- tests that other elements from xi namespace are not allowed when
include is successful -->
<!-- EXPECT FAILURE -->
- <elem xmlns="http://www.schemaTest.org/xinclude-test";
xml:base="../included/elem.xml"/>[Fatal Error] test13.xml:10:19: Elements from
namespace 'http://www.w3.org/2001/XInclude', other than 'fallback', are not
allowed to be children of 'include' elements. However, 'xi:other' was found.
+ <elem xmlns="http://www.schemaTest.org/xinclude-test";
xml:base="../included/elem.xml"/>[Fatal Error] test13.xml:10:19
Modified: xerces/java/trunk/tests/xinclude/output/test14.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test14.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test14.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test14.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- tests that other elements from xi namespace are not allowed when
include is not successful -->
<!-- EXPECT FAILURE -->
- [Warning] test14.xml:9:47: Include operation failed, reverting to fallback.
Resource error reading file as XML (href='../included/invalid.xml'). Reason:
tests\xinclude\included\invalid.xml (The system cannot find the file specified)
-[Fatal Error] test14.xml:10:19: Elements from namespace
'http://www.w3.org/2001/XInclude', other than 'fallback', are not allowed to be
children of 'include' elements. However, 'xi:other' was found.
+ [Warning] test14.xml:9:47
+[Fatal Error] test14.xml:10:19
Modified: xerces/java/trunk/tests/xinclude/output/test18.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test18.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test18.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test18.txt Tue May 16 15:11:59 2006
@@ -2,4 +2,4 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- tests that fallback must be child of include -->
<!-- EXPECT FAILURE -->
- [Fatal Error] test18.xml:8:18: A 'fallback' element was found that did not
have 'include' as the parent.
+ [Fatal Error] test18.xml:8:18
Modified: xerces/java/trunk/tests/xinclude/output/test22.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test22.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test22.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test22.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- include not well formed XML -->
<!-- EXPECT FAILURE -->
- [Fatal Error] not-well-formed.xml:1:10: Attribute name "is" associated with
an element type "this" must be followed by the ' = ' character.
-[Fatal Error] test22.xml:9:56: Error attempting to parse XML file
(href='../included/not-well-formed.xml').
+ [Fatal Error] not-well-formed.xml:1:10
+[Fatal Error] test22.xml:9:56
Modified: xerces/java/trunk/tests/xinclude/output/test24.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test24.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test24.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test24.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- test that including the same document fails -->
<!-- EXPECT FAILURE -->
- [Fatal Error] test24.xml:1:1: Recursive include detected. Document
'tests/xinclude/tests/test24.xml' was already processed.
-[Fatal Error] test24.xml:9:35: Error attempting to parse XML file
(href='test24.xml').
+ [Fatal Error] test24.xml:1:1
+[Fatal Error] test24.xml:9:35
Modified: xerces/java/trunk/tests/xinclude/output/test25.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test25.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test25.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test25.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- test including a resource that isn't there, when parse="xml" -->
<!-- EXPECT FAILURE -->
- [Warning] test25.xml:9:48: Include operation failed, reverting to fallback.
Resource error reading file as XML (href='../included/invalid.xml'). Reason:
tests\xinclude\included\invalid.xml (The system cannot find the file specified)
-[Fatal Error] test25.xml:9:48: An 'include' failed, and no 'fallback' element
was found.
+ [Warning] test25.xml:9:48
+[Fatal Error] test25.xml:9:48
Modified: xerces/java/trunk/tests/xinclude/output/test26.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test26.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test26.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test26.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- test including a resource that isn't there, when parse="text" -->
<!-- EXPECT FAILURE -->
- [Warning] test26.xml:9:48: Include operation failed, reverting to fallback.
Resource error reading file as text (href='../included/invalid.xml'). Reason:
tests\xinclude\included\invalid.xml (The system cannot find the file specified)
-[Fatal Error] test26.xml:9:48: An 'include' failed, and no 'fallback' element
was found.
+ [Warning] test26.xml:9:48
+[Fatal Error] test26.xml:9:48
Modified: xerces/java/trunk/tests/xinclude/output/test29.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test29.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test29.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test29.txt Tue May 16 15:11:59 2006
@@ -3,5 +3,5 @@
<elem bar="jpg"/>
<!-- test including a document with a conflicting notation -->
<!-- EXPECT FAILURE -->
- [Fatal Error] not2.xml:12:56: Multiple notations were used which had the
name 'jpg', but which were not determined to be duplicates.
-[Fatal Error] test29.xml:11:45: Error attempting to parse XML file
(href='../included/not2.xml').
+ [Fatal Error] not2.xml:12:56
+[Fatal Error] test29.xml:11:45
Modified: xerces/java/trunk/tests/xinclude/output/test32.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test32.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test32.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test32.txt Tue May 16 15:11:59 2006
@@ -6,5 +6,5 @@
notation -->
<!-- EXPECT FAILURE -->
<elem foo="image"/>
- [Fatal Error] ue2.xml:12:56: Multiple notations were used which had the
name 'jpg', but which were not determined to be duplicates.
-[Fatal Error] test32.xml:14:44: Error attempting to parse XML file
(href='../included/ue2.xml').
+ [Fatal Error] ue2.xml:12:56
+[Fatal Error] test32.xml:14:44
Modified: xerces/java/trunk/tests/xinclude/output/test39.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test39.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test39.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test39.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd"
xml:base="../">
<!-- using xml:base on both parent element to move to wrong directory -->
<!-- EXPECT FAILURE -->
- [Warning] test39.xml:10:45: Include operation failed, reverting to
fallback. Resource error reading file as XML (href='../included/elem.xml').
Reason: tests\included\elem.xml (The system cannot find the path specified)
-[Fatal Error] test39.xml:10:45: An 'include' failed, and no 'fallback' element
was found.
+ [Warning] test39.xml:10:45
+[Fatal Error] test39.xml:10:45
Modified: xerces/java/trunk/tests/xinclude/output/test40.txt
URL:
http://svn.apache.org/viewcvs/xerces/java/trunk/tests/xinclude/output/test40.txt?rev=407092&r1=407091&r2=407092&view=diff
==============================================================================
--- xerces/java/trunk/tests/xinclude/output/test40.txt (original)
+++ xerces/java/trunk/tests/xinclude/output/test40.txt Tue May 16 15:11:59 2006
@@ -2,5 +2,5 @@
<x xmlns="http://www.schemaTest.org/xinclude-test";
xmlns:xi="http://www.w3.org/2001/XInclude";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.schemaTest.org/xinclude-test tests.xsd">
<!-- using xml:base on include element to move to wrong directory -->
<!-- EXPECT FAILURE -->
- [Warning] test40.xml:10:45: Include operation failed, reverting to
fallback. Resource error reading file as XML (href='../included/elem.xml').
Reason: tests\included\elem.xml (The system cannot find the path specified)
-[Fatal Error] test40.xml:10:45: An 'include' failed, and no 'fallback' element
was found.
+ [Warning] test40.xml:10:45
+[Fatal Error] test40.xml:10:45
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
