[4suite-checkins] In 4Suite/test/Xml/Core, files test_xinclude.py

Thu Aug 17 12:51:47 MDT 2006

Update of /var/local/cvsroot/4Suite/test/Xml/Core
In directory gonzaga:/tmp/cvs-serv10388/test/Xml/Core

Modified Files:
	test_xinclude.py 
Log Message:
Fixed new XInclude errors discovered by test suite.


ViewCVS diff:
  http://cvs.4suite.org/viewcvs/4Suite/test/Xml/Core/test_xinclude.py.diff?r1=1.37&r2=1.38
ViewCVS view:
  http://cvs.4suite.org/viewcvs/4Suite/test/Xml/Core/test_xinclude.py?rev=1.38&content-type=text/vnd.viewcvs-markup

Index: test_xinclude.py
===================================================================
RCS file: /var/local/cvsroot/4Suite/test/Xml/Core/test_xinclude.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -U2 -r1.37 -r1.38

--- test_xinclude.py	16 Aug 2006 07:02:12 -0000	1.37
+++ test_xinclude.py	17 Aug 2006 18:51:47 -0000	1.38
@@ -67,10 +67,14 @@
 
     tester.startGroup('XInclude spec errata')
-    doTest(tester, 'PEX1 Error in ignored fallback', ERRATA_SRC_1, ERRATA_EXPECTED_1)
+    doTest(tester, 'PEX1 Error in ignored fallback', PEX1_SRC, PEX1_EXPECTED)
     tester.startGroup('PEX6')
-    doTest(tester, 'BOM in included UTF-8 text parsed as UTF-8', ERRATA_SRC_2, ERRATA_EXPECTED_2)
-    doTest(tester, 'BOM in included UTF-8 text parsed as ISO-8859-1', ERRATA_SRC_3, ERRATA_EXPECTED_3)
-    doTest(tester, 'BOM in included UTF-16 text parsed as default', ERRATA_SRC_4, ERRATA_EXPECTED_4)
-    doTest(tester, 'BOM in included UTF-16 text parsed as UTF-16LE', ERRATA_SRC_5, ERRATA_EXPECTED_5)
+    doTest(tester, 'BOM in included UTF-8 text parsed as UTF-8',
+           PEX6_SRC_1, PEX6_EXPECTED_1)
+    doTest(tester, 'BOM in included UTF-8 text parsed as ISO-8859-1',
+           PEX6_SRC_2, PEX6_EXPECTED_2)
+    doTest(tester, 'BOM in included UTF-16 text parsed as default',
+           PEX6_SRC_3, PEX6_EXPECTED_3)
+    doTest(tester, 'BOM in included UTF-16 text parsed as UTF-16LE',
+           PEX6_SRC_4, PEX6_EXPECTED_4)
     tester.groupDone()
     #PEX7 only says that the encoding attribute need not be a valid encoding name.
@@ -552,6 +556,8 @@
 
 # 3.1 encoding declaration ignored when parse="xml"
-SRC_15 = """<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
-<xi:include href="include1.xml" parse="xml" encoding="UTF-16LE"/></x>"""
+SRC_15 = """<?xml version='1.0'?>
+<x xmlns:xi="http://www.w3.org/2001/XInclude">
+<xi:include href="include1.xml" parse="xml" encoding="UTF-16LE"/>
+</x>"""
 
 expected_15 = """<?xml version="1.0" encoding="UTF-8"?>
@@ -563,9 +569,9 @@
 # erratum PEX1: errors in fallback should be ignored if fallback isn't performed.
 # This test assumes include1.xml will be successfully included.
-ERRATA_SRC_1="""<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
+PEX1_SRC = """<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
 <xi:include href="include1.xml"><xi:fallback><xi:include href="include2.xml" parse="bogus"/></xi:fallback></xi:include>
 </x>"""
 
-ERRATA_EXPECTED_1 = """<?xml version="1.0" encoding="UTF-8"?>
+PEX1_EXPECTED = """<?xml version="1.0" encoding="UTF-8"?>
 <x xmlns:xi="http://www.w3.org/2001/XInclude">
 <foo xml:base="%s"/>
@@ -573,8 +579,8 @@
 
 # erratum PEX6: when parse="text", a BOM at the start of included text is discarded if that text is being read as UTF-8/16/32
-ERRATA_SRC_2 = """<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
+PEX6_SRC_1 = """<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
 <xi:include href="utf8bom.txt" parse="text" encoding="utf-8"/></x>"""
 
-ERRATA_EXPECTED_2 = """<?xml version="1.0" encoding="UTF-8"?>
+PEX6_EXPECTED_1 = """<?xml version="1.0" encoding="UTF-8"?>
 <x xmlns:xi="http://www.w3.org/2001/XInclude">
 This file has a UTF-8 BOM.
@@ -582,5 +588,6 @@
 
 # erratum PEX6 continued
-ERRATA_SRC_3 = """<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
+PEX6_SRC_2 = """<?xml version='1.0'?>
+<x xmlns:xi="http://www.w3.org/2001/XInclude">
 <xi:include href="utf8bom.txt" parse="text" encoding="iso-8859-1"/></x>"""
 
@@ -588,5 +595,5 @@
 # should be interpreted as U+00EF U+00BB U+00BF.
 # When serialized as UTF-8, we expect those to turn into C3 AF C2 BB C2 BF.
-ERRATA_EXPECTED_3 = """<?xml version="1.0" encoding="UTF-8"?>
+PEX6_EXPECTED_2 = """<?xml version="1.0" encoding="UTF-8"?>
 <x xmlns:xi="http://www.w3.org/2001/XInclude">
 \xc3\xaf\xc2\xbb\xc2\xbfThis file has a UTF-8 BOM.
@@ -594,8 +601,9 @@
 
 # erratum PEX6 continued
-ERRATA_SRC_4 = """<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
+PEX6_SRC_3 = """<?xml version='1.0'?>
+<x xmlns:xi="http://www.w3.org/2001/XInclude">
 <xi:include href="utf16bom.txt" parse="text"/></x>"""
 
-ERRATA_EXPECTED_4 = """<?xml version="1.0" encoding="UTF-8"?>
+PEX6_EXPECTED_3 = """<?xml version="1.0" encoding="UTF-8"?>
 <x xmlns:xi="http://www.w3.org/2001/XInclude">
 This file has a UTF-16 little-endian BOM.
@@ -603,5 +611,6 @@
 
 # erratum PEX6 continued
-ERRATA_SRC_5 = """<?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude">
+PEX6_SRC_4 = """<?xml version='1.0'?>
+<x xmlns:xi="http://www.w3.org/2001/XInclude">
 <xi:include href="utf16bom.txt" parse="text" encoding="utf-16LE"/></x>"""
 
@@ -609,5 +618,5 @@
 # When read as UTF-16LE, it will be interpreted as U+FEFF.
 # When U+FEFF is serialized as UTF-8, it is EF BB BF (the UTF-8 BOM!)
-ERRATA_EXPECTED_5 = """<?xml version="1.0" encoding="UTF-8"?>
+PEX6_EXPECTED_4 = """<?xml version="1.0" encoding="UTF-8"?>
 <x xmlns:xi="http://www.w3.org/2001/XInclude">
 \xef\xbb\xbfThis file has a UTF-16 little-endian BOM.

