mrglavas 2003/09/29 10:50:24
Modified: java/tests/xinclude/included include.xml
java/tests/xinclude/tests test14.xml
Added: java/tests/xinclude/included base.xml elem_base.xml
java/tests/xinclude/tests test41.xml test39.xml test40.xml
test38.xml test37.xml test36.xml test35.xml
test34.xml
Log:
Added XInclude tests for xml:base. Submitted by Peter McCracken.
Revision Changes Path
1.2 +1 -1 xml-xerces/java/tests/xinclude/included/include.xml
Index: include.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/xinclude/included/include.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- include.xml 28 Jul 2003 20:47:31 -0000 1.1
+++ include.xml 29 Sep 2003 17:50:23 -0000 1.2
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
-<include xmlns="http://www.w3.org/2001/XInclude";
+<include xml:base="../included/" xmlns="http://www.w3.org/2001/XInclude";
href="elem.xml"/>
1.1 xml-xerces/java/tests/xinclude/included/base.xml
Index: base.xml
===================================================================
<?xml version="1.0"?>
<!-- redundant path structure -->
<include xml:base="../included/" xmlns="http://www.w3.org/2001/XInclude";
href="../included/elem_base.xml"/>
1.1 xml-xerces/java/tests/xinclude/included/elem_base.xml
Index: elem_base.xml
===================================================================
<?xml version="1.0"?>
<elem xmlns="http://www.schemaTest.org/xinclude-test";
xml:base="dir/"/>
1.2 +1 -1 xml-xerces/java/tests/xinclude/tests/test14.xml
Index: test14.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/xinclude/tests/test14.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test14.xml 28 Jul 2003 20:47:32 -0000 1.1
+++ test14.xml 29 Sep 2003 17:50:23 -0000 1.2
@@ -3,7 +3,7 @@
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 -->
+ <!-- tests that other elements from xi namespace are not allowed when include is
not successful -->
<!-- EXPECT FAILURE -->
<xi:include parse="xml"
href="../included/invalid.xml">
1.1 xml-xerces/java/tests/xinclude/tests/test41.xml
Index: test41.xml
===================================================================
<?xml version="1.0"?>
<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">
<!-- final included element specifies an xml:base attribute, which will be
overwritten by the new xml:base attribute -->
<xi:include parse="xml"
href="../included/base.xml"/>
</x>
1.1 xml-xerces/java/tests/xinclude/tests/test39.xml
Index: test39.xml
===================================================================
<?xml version="1.0"?>
<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 -->
<xi:include parse="xml"
href="../included/elem.xml"/>
</x>
1.1 xml-xerces/java/tests/xinclude/tests/test40.xml
Index: test40.xml
===================================================================
<?xml version="1.0"?>
<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 -->
<xi:include xml:base="../"
parse="xml"
href="../included/elem.xml"/>
</x>
1.1 xml-xerces/java/tests/xinclude/tests/test38.xml
Index: test38.xml
===================================================================
<?xml version="1.0"?>
<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 and include element -->
<xi:include xml:base="included/"
parse="xml"
href="elem.xml"/>
</x>
1.1 xml-xerces/java/tests/xinclude/tests/test37.xml
Index: test37.xml
===================================================================
<?xml version="1.0"?>
<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 the included directory -->
<xi:include xml:base="../included/"
parse="xml"
href="elem.xml"/>
</x>
1.1 xml-xerces/java/tests/xinclude/tests/test36.xml
Index: test36.xml
===================================================================
<?xml version="1.0"?>
<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/tests.xsd"
xml:base="../included/">
<!-- using xml:base on parent element to move to the included directory -->
<xi:include parse="xml"
href="elem.xml"/>
</x>
1.1 xml-xerces/java/tests/xinclude/tests/test35.xml
Index: test35.xml
===================================================================
<?xml version="1.0"?>
<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 back a directory -->
<xi:include xml:base="../"
parse="xml"
href="included/elem.xml"/>
</x>
1.1 xml-xerces/java/tests/xinclude/tests/test34.xml
Index: test34.xml
===================================================================
<?xml version="1.0"?>
<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 parent element to move back a directory -->
<xi:include parse="xml"
href="included/elem.xml"/>
</x>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
