mvp-xml-cvs Mailing List for MVP.XML Library (Page 34)

Brought to you by: chrispels, dcazzulino, don_xml, fumiakiy, and 6 others

mvp-xml-cvs — Mailing list for CVS commit messages.

You can subscribe to this list here.

2004	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (174)	_Nov (85)	_Dec (14)
2005	_Jan (56)	_Feb	_Mar	_Apr	_May (4)	_Jun (1)	_Jul (132)	_Aug (5)	_Sep	_Oct (314)	_Nov (133)	_Dec (18)
2006	_Jan (6)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 38 > >> (Page 34 of 38)

[mvp-xml-cvs] XInclude/v1/test EntryPoint.cs,1.3,1.4 XIncludeReaderTests.cs,1.4,1.5

From: Oleg T. <he...@us...> - 2004-10-20 19:28:24

Update of /cvsroot/mvp-xml/XInclude/v1/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18482/v1/test

Modified Files:
	EntryPoint.cs XIncludeReaderTests.cs 
Log Message:
Working on OuterXml.

Index: EntryPoint.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EntryPoint.cs	19 Oct 2004 16:24:56 -0000	1.3
+++ EntryPoint.cs	20 Oct 2004 19:28:13 -0000	1.4
@@ -14,7 +14,7 @@
             //NistTests rt = new NistTests();
             try 
             {                
-                rt.IncludesItself();
+                rt.DepthTest();
             } 
             catch (Exception e) 
             {

Index: XIncludeReaderTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeReaderTests.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- XIncludeReaderTests.cs	18 Oct 2004 18:19:22 -0000	1.4
+++ XIncludeReaderTests.cs	20 Oct 2004 19:28:13 -0000	1.5
@@ -226,6 +226,58 @@
             RunAndCompare("../../tests/xpointer.xml", "../../results/xpointer.xml");            
         }
 
+        /// <summary>
+        /// ReadOuterXml() test.
+        /// </summary>
+        [Test]
+        public void OuterXmlTest() 
+        {
+            XIncludingReader xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            string outerXml = xir.ReadOuterXml();
+            xir.Close();
+            xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            XmlDocument doc = new XmlDocument();
+            doc.PreserveWhitespace = true;
+            doc.Load(xir);            
+            string outerXml2 = doc.OuterXml;
+            Assert.AreEqual(outerXml, outerXml2);
+        }
+
+        /// <summary>
+        /// ReadInnerXml() test.
+        /// </summary>
+        [Test]
+        public void InnerXmlTest() 
+        {
+            XIncludingReader xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            string innerXml = xir.ReadInnerXml();
+            xir.Close();
+            xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            XmlDocument doc = new XmlDocument();
+            doc.PreserveWhitespace = true;
+            doc.Load(xir);            
+            string innerXml2 = doc.InnerXml;
+            Assert.AreEqual(innerXml, innerXml2);
+        }
+
+        /// <summary>
+        /// Depth test.
+        /// </summary>
+        [Test]
+        public void DepthTest() 
+        {
+            XIncludingReader xir = new XIncludingReader("../../tests/document.xml");
+            while (xir.Read()) 
+            {
+                Console.WriteLine("{0} | {1} | {2} | {3}", 
+                    xir.NodeType, xir.Name, xir.Value, xir.Depth);
+            }
+        }
+
 //        /// <summary>
 //        /// Custom resolver test.
 //        /// </summary>

[mvp-xml-cvs] XInclude/v1/src XIncludingReader.cs,1.12,1.13

From: Oleg T. <he...@us...> - 2004-10-20 19:28:23

Update of /cvsroot/mvp-xml/XInclude/v1/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18482/v1/src

Modified Files:
	XIncludingReader.cs 
Log Message:
Working on OuterXml.

Index: XIncludingReader.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/src/XIncludingReader.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- XIncludingReader.cs	19 Oct 2004 16:24:55 -0000	1.12
+++ XIncludingReader.cs	20 Oct 2004 19:28:12 -0000	1.13
@@ -596,7 +596,13 @@
                 case XIncludingReaderState.ExposingXmlLangAttrValue:                    
                     return String.Empty;
                 default:                                            
-                    return _reader.ReadInnerXml();			    
+                    StringWriter sw = new StringWriter();
+                    XmlTextWriter xw = new XmlTextWriter(sw);
+                    int depth = Depth;
+                    while (Read() && Depth != depth)
+                        xw.WriteNode(this, false);
+                    xw.Close();
+                    return sw.ToString();                
             }            
         }
 
@@ -613,8 +619,12 @@
                     return @"xml:lang="" + _reader.XmlLang + @"""; 
                 case XIncludingReaderState.ExposingXmlLangAttrValue:                    
                     return String.Empty;
-                default:                                            
-                    return _reader.ReadOuterXml(); 
+                default:                                
+                    StringWriter sw = new StringWriter();
+                    XmlTextWriter xw = new XmlTextWriter(sw);
+                    xw.WriteNode(this, false);
+                    xw.Close();
+                    return sw.ToString();                    
             }
         }

[mvp-xml-cvs] XPointer/v1/src SR.resx,1.2,1.3 XPointerReader.cs,1.3,1.4

From: Oleg T. <he...@us...> - 2004-10-19 16:27:49

Update of /cvsroot/mvp-xml/XPointer/v1/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20411/v1/src

Modified Files:
	SR.resx XPointerReader.cs 
Log Message:


Index: SR.resx
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/SR.resx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SR.resx	4 Oct 2004 19:12:27 -0000	1.2
+++ SR.resx	19 Oct 2004 16:27:38 -0000	1.3
@@ -52,7 +52,7 @@
 		<value>Syntax error in element() scheme data: empty XPointer.</value>
 	</data>
 	<data name="NoSubresourcesIdentifiedException" type="System.String" mimetype="System.String">
-		<value>XPointer doesn't identify any subresource.</value>
+		<value>XPointer doesn't identify any subresources.</value>
 	</data>
 	<data name="InvalidTokenInXmlnsSchemeWhileNCNameExpected" type="System.String" mimetype="System.String">
 		<value>Syntax error in xmlns() scheme data: Invalid token in XmlnsSchemaData, NCName was expected.</value>

Index: XPointerReader.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointerReader.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- XPointerReader.cs	11 Oct 2004 20:56:47 -0000	1.3
+++ XPointerReader.cs	19 Oct 2004 16:27:39 -0000	1.4
@@ -110,8 +110,9 @@
                 vr.ValidationType = ValidationType.None;
             }
             vr.EntityHandling = EntityHandling.ExpandEntities;
-            vr.ValidationEventHandler += new System.Xml.Schema.ValidationEventHandler(ValidationCallback);
+            vr.ValidationEventHandler += new System.Xml.Schema.ValidationEventHandler(ValidationCallback);            
             XPathDocument doc = new XPathDocument(vr, XmlSpace.Preserve);
+            vr.Close();
             Init(doc, xpointer);
         }

[mvp-xml-cvs] XPointer/v1/test XPointerReaderTests.cs,1.3,1.4

From: Oleg T. <he...@us...> - 2004-10-19 16:27:49

Update of /cvsroot/mvp-xml/XPointer/v1/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20411/v1/test

Modified Files:
	XPointerReaderTests.cs 
Log Message:


Index: XPointerReaderTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XPointer/v1/test/XPointerReaderTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- XPointerReaderTests.cs	11 Oct 2004 20:58:00 -0000	1.3
+++ XPointerReaderTests.cs	19 Oct 2004 16:27:39 -0000	1.4
@@ -221,7 +221,8 @@
             FileInfo file = new FileInfo("../../northwind.xml");
             using (FileStream fs = file.OpenRead()) 
             {
-                XPointerReader xpr = new XPointerReader(new Uri(file.FullName), fs, xptr);
+                XPointerReader xpr = new XPointerReader(
+                    new XmlTextReader(file.FullName, fs), xptr);
                 string expected = @"<Item orderID=""o10535"">
                 <OrderDate> 6/13/95</OrderDate>
                 <ShipAddress> Mataderos  2312</ShipAddress>

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite w3cReport.html,NONE,1.1 xinclude.xsl,NONE,1.1 testcases.dtd,1.1,1.2 testdescr.xml,1.1,1.2

From: Oleg T. <he...@us...> - 2004-10-19 16:26:10

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite

Modified Files:
	testcases.dtd testdescr.xml 
Added Files:
	w3cReport.html xinclude.xsl 
Log Message:
XInclude Test Suite updated

--- NEW FILE: w3cReport.html ---
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>XInclude Conformance Tests</title>
<meta content="text/html;charset=utf-8" http-equiv="Content-Type">
<style type="text/css">
		    BODY {
			font-family:	Lucida, Helvetica, Univers, sans-serif;
		    }
		     H2, H3, H4 {
			text-align:	left;
			color:		#0066CC;
		    }
</style>
<style type="text/css">
		    a:hover { 
			color:		white;
			background-color: blue;
[...3506 lines suppressed...]
</table>
</td><td bgcolor="#ccffff">
<p>Test that a non-child sequence in an xpointer is treated as a resource error.</p>
<p>There is an output test associated with this input file.</p>
</td>
</tr>
</table>
<a name="contrib"></a>
<h3>4.  Contributors (Non-normative)</h3>
<p> A team of volunteer members have participated in the
	    development of this work.  Contributions have come from:
	    </p>
<ul>
<li>Sandra I. Martinez, NIST</li>
<li>Daniel Veillard, Red Hat Network</li>
<li>John Evdemon, FourThought</li>
<li>Richard Tobin, University of Edinburgh</li>
</ul>
</body>
</html>

--- NEW FILE: xinclude.xsl ---
<?xml version='1.0'?>
<!--
<<<<<<< xinclude.xsl
    Original version copyright 2002 by W3C.
    All Rights Reserved.
=======
    XSL Stylesheet for documenting XML Inclusions(XInclude) conformance tests.
    Tested against Xalan processor.
>>>>>>> 1.0

    XSL 2002-03-07 Stylesheet for documenting XInclude conformance tests.

    This expects to be run on a document matching the DTD that was
    defined for merging collections of self-descriptive XInclude tests.

    Since all those collections will have (by design) the same test
    architecture, this includes boilerplate describing that design,
    to be used by all test documentation.

    
-->


<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  <xsl:output method="html" indent="yes"/>

    <!-- ROOT:  write an HTML wrapper -->
	<xsl:variable name="root-path">http://xw2k.sdct.itl.nist.gov/carmelo/XInclude/</xsl:variable>
    <xsl:template match="/testsuite">
	
	<!-- XHTML namespace -->
	<html><head>
	    <title>XInclude Conformance Tests</title>
	    <meta http-equiv="Content-Type"
		content="text/html;charset=utf-8"/>
	    <style>
		<xsl:comment>
		    BODY {
			font-family:	Lucida, Helvetica, Univers, sans-serif;
		    }
		     H2, H3, H4 {
			text-align:	left;
			color:		#0066CC;
		    }
		</xsl:comment>
	    </style>
	    <style>
		<xsl:comment>
		    a:hover { 
			color:		white;
			background-color: blue;
		    }
		</xsl:comment>
	    </style>
	</head><body bgcolor='#ffffff'>
            <center><h1><font color="#0066cc">XInclude Test Suite</font></h1></center>



	    <p/>
	    <center>
	    <table border="4" width="90%">
	    <tr >
	    <td>
	    <table>
	    <tr >
	    <td width="35%"><img src="http://www.w3.org/Icons/w3c_home" width="200" height="100"/></td>
	    <td width="30%"/>
	    <td width="35%" align="right"><img src="http://www.nist.gov/itl/div897/images/nist_home.gif" width="350" height="125"/></td>
            </tr>
	    </table>
	    <center>
	    <table>
	    <tr>
	    <td ><b><font size="+2">A Joint Development Effort</font></b></td>
	    </tr>
	    </table>
            </center>
	    </td>
	    </tr>
	    </table>
	    </center>
	    <p/>

	    <h4>W3C XML Core Working Group<br/>XInclude 1.0 Test Suite<br/>13 February 2003</h4>
            <dl>
	    <dt><b>This version:</b></dt>
	    <dd><ul>
	       <li><a href="http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html">
		   http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html</a>		 
	       </li>
	    </ul>
	    </dd>
	    <p/>
	    <dt><b>Current version:</b></dt>
	    <dd><ul>
	       <li><a href="http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html">
		   http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html</a>
	       </li>
	    </ul>
	    </dd>
	    <p/>
	    <dt><b>Test Archive:</b></dt>
	    <dd><ul>
	    <li><a href="http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude0322.zip">http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude0322.zip</a>
	    </li>
	    </ul></dd>
	    <p/>
	    <dt><b>W3C XML Core Working Group:</b></dt> 	
	    <dd><ul><li><a href="http://www.w3.org/">http://www.w3.org/</a>
	    </li></ul></dd>
	    <p/>
	    <dt><b>XML Inclusions(XInclude) Version 1.0:</b></dt> 	
	    <dd><ul><li><a href="http://www.w3.org/TR/xinclude">http://www.w3.org/TR/xinclude</a>
	    </li></ul></dd>
	    <p/>
	    <dt><b>Comments:</b></dt> 	
	    <dd><ul><li>Sandra Martinez, NIST <a href="mailto:san...@ni...">&lt;san...@ni...&gt;</a>
	    </li></ul></dd>
	    <p/>
	    </dl>
	    <a name="contents"/>
            <h2>Table of Contents</h2>
	    <ol >
		<li><a href="#intro">Introduction</a></li>
		<li><a href="#categories">Test Case Descriptions</a></li>
                <li><a href="#contrib">Contributors</a></li>
	    </ol>
	    <a name="intro"/>
	    <h2>1. Introduction </h2>
	    <p> XInclude is a generic mechanism that is used to merge XML documents. XInclude uses
                elements, attributes and URI references which are existing XML constructs.</p>
	    <p>
	    Conformance tests can be used by developers, content creators, and 
            users alike to increase their level of confidence in product quality. In
	    circumstances where interoperability is necessary, these tests can also
	    be used to determine that differing implementations support the same set
            of features. </p>
           
            <p>This report provides supporting documentation for all of the tests
            contributed by members of the <i>W3C</i> XML Core Working Group. 
	    Sources from which these tests have been collected
	    include: <em>
		<xsl:for-each select="testcases">
		    <xsl:value-of select="@creator"/>
		    <xsl:text>; </xsl:text>
		</xsl:for-each>
	    </em>.  It is anticipated that this report will supplement the actual tests.</p>  

	    <p>Comments/suggestions should be 
            forwarded to <a href="mailto:www...@w3...">public XInclude comments mailing list</a>.</p> 

	    <a name="categories"/>
	    <h2>2.  Test Case Description</h2>

	    <p> This section of this report contains descriptions of test cases, 
		each test case includes a binary test. The test suite consists of a 
		series of simple binary conformance tests, whereby a processor is deemed 
		either to accept  (a positive test) or reject  (a negative test) the test. 
		An expected result document is provided for the positive tests to compare 
		the output of the processor with the reference file. 
		Expected results are as accurate as possible, it is conceivable that a 
		few files may diverge somewhat from the testcase description, however 
		the idea is still captured. Negative tests are intended to 
		identify expected errors as defined by the specification. Negative test are not 
		accompanied by expected results.</p>
	      <p>For an implementation to claim conformance it must pass all positive and negative 
		tescases, which means that the implementation performed exactly as expected. </p>

		<p>A description for each test is presented in the following table as well as a 
		section identifier from the Xinclude recommendation and the Colletion from 
		which the test was originated. The test description is intended to have enough 
		detail to evaluate diagnostic messages. Given the Test ID and the Collection, 
		each test can be uniquely identified.</p>

		<xsl:apply-templates select="testcases"/>
                   


	    <a name="contrib"/>
	    <h3>4.  Contributors (Non-normative)</h3>

	    <p> A team of volunteer members have participated in the
	    development of this work.  Contributions have come from:
	    </p>
	    <ul>
                <li>Sandra I. Martinez, NIST</li>
		<li>Daniel Veillard, Red Hat Network</li>
                <li>John Evdemon, FourThought</li>
            </ul>

	</body></html>
    </xsl:template>


    <xsl:template match="testcases">
       
       <xsl:variable name="num-of-tests">
           <xsl:value-of select="count(testcase)"/>
       </xsl:variable>

       <xsl:choose>
         <xsl:when test="$num-of-tests=0">
	   <table>
	     <tr>
		<td bgcolor="#ffffcc">Currently there ARE NOT any tests for this test suite</td>
	    </tr>
	   </table>
 
         </xsl:when>

    <xsl:otherwise>          
         <xsl:for-each select="testcase">
		
                <table width="100%">
                    <tr valign="top">
	                <td width='40%'><table bgcolor='#eeeeff' border='1' width='100%'>
		    <tr>
		    <td width='50%'><b>Sections [Rules]:</b></td>
		    <td bgcolor='#ffffcc'>
			    <xsl:value-of select="section"/></td>
		    </tr>
		    <tr valign="top">
		        <td width='50%'><b>Test ID:</b></td>
		         <td bgcolor='#ffffcc'>
			 <xsl:variable name="test-path"><xsl:value-of select="concat(../@creator,'/',@href)"/></xsl:variable>
			    	<a href="{$root-path}{$test-path}"><xsl:value-of select="@id"/></a>		
			</td>   
		    </tr>
                    <tr valign="top">
			    <td width='50%'><b>Collection:</b></td>
			    <td bgcolor='#ffffcc'><xsl:value-of select="../@creator"/></td>
                        </tr>
	        </table>
                </td>
	        <td bgcolor='#ccffff'>
		   <p><xsl:value-of select="description"/></p>
		   <xsl:if test="output">
		      <p>There is an output test associated with this input file.</p>
		   </xsl:if>
	        </td>
	    </tr>
	    </table>
            </xsl:for-each>
         </xsl:otherwise>         
         </xsl:choose>      
</xsl:template>


    <xsl:template match="EM">
	<em><xsl:apply-templates/></em>
    </xsl:template>
    <xsl:template match="B">
	<b><xsl:apply-templates/></b>
    </xsl:template>
</xsl:stylesheet>

Index: testcases.dtd
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/testcases.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- testcases.dtd	29 Sep 2004 07:46:16 -0000	1.1
+++ testcases.dtd	19 Oct 2004 16:24:58 -0000	1.2
@@ -50,6 +50,8 @@
 		xpointer-scheme:     requires the xpointer scheme
 		unexpanded-entities: requires the parser to not expand external
 		                     entities
+		unparsed-entities:   requires unparsed entity support
+		lang-fixup:          requires xml:lang fixup support
 
 	qualifier:		Indicates date of creation or modification of the test.
 

Index: testdescr.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/testdescr.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- testdescr.xml	29 Sep 2004 07:46:16 -0000	1.1
+++ testdescr.xml	19 Oct 2004 16:24:58 -0000	1.2
@@ -643,7 +643,7 @@
 		</testcase>
 
 		<testcase id="Nist-include-55" href="nist-include-55.xml"
-		          type="success">
+		          type="success" features="unparsed-entities">
 			<contributor>Sandra I. Martinez</contributor>
 			<section resource="http://www.w3.org/TR/xinclude/#unparsed-entities">4.5.1</section>
 			<date qualifier="created">January, 2003</date>
@@ -653,7 +653,7 @@
 		</testcase>
 
 		<testcase id="Nist-include-56" href="nist-include-56.xml"
-		          type="error">
+		          type="error" features="unparsed-entities">
 			<contributor>Sandra I. Martinez</contributor>
 			<section resource="http://www.w3.org/TR/xinclude/#unparsed-entities">4.5.1</section>
 			<date qualifier="created">January, 2003</date>
@@ -687,14 +687,900 @@
 		</testcase>
 
 		<testcase id="eduni-2" href="extract.xml"
-		          type="success" features="xpointer-scheme">
+		          type="success">
 			<contributor>Richard Tobin</contributor>
 			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
 			<date qualifier="created">30-Jun-2004</date>
-			<description>Verify that xi:include elements in the target have been processed in the acquired infoset, ie before the xpointer is applied.</description>	
+			<description>Verify that xi:include elements in the target have been processed in the acquired infoset, ie before the xpointer is applied.</description>
 			<output>../result/extract.xml</output>
 		</testcase>
 
+		<testcase id="eduni-3" href="lang.xml"
+		          type="success" features="lang-fixup">
+			<contributor>Richard Tobin</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#language">4.2</section>
+			<date qualifier="created">1-Sep-2004</date>
+			<description>Check xml:lang fixup</description>
+			<output>../result/lang.xml</output>
+		</testcase>
+
+	</testcases>
+	
+	<testcases creator="Elliotte Rusty Harold" basedir="Harold/test">
+  
+		<testcase id="harold-01" href="xmlbasetest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include-location">4.1</section>
+			<date qualifier="created">31-Aug-2004</date>
+			<description>xml:base attribute is used to resolve relative URLs in href attributes</description>	
+			<output>../result/xmlbasetest.xml</output>
+		</testcase>
+
+    <testcase id="harold-02" href="resolvethruxpointer.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#elements">4.2.5</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Use XPointer to include an include element in another document,
+    and make sure that's fully resolved too</description>	
+			<output>../result/resolvethruxpointer.xml</output>
+		</testcase>
+ 
+    <testcase id="harold-03" href="xmlbasetest2.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include-location">4.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>xml:base attribute on the xi:include element is used to resolve relative URL in href</description>	
+			<output>../result/xmlbasetest2.xml</output>
+		</testcase>
+    
+    <testcase id="harold-04" href="xmlbasetest3.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include-location">4.1</section>
+       <date qualifier="created">31-Aug-2004</date>
+			<description>xml:base attribute from an unincluded element 
+			still applies to its included descendants</description>	
+			<output>../result/xmlbasetest3.xml</output>
+		</testcase>
+   
+    <testcase id="harold-05" href="marshtest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An include element includes its following sibling element, which has a child 
+      include element including the sibling element after that one.</description>	
+			<output>../result/marshtest.xml</output>
+		</testcase>
+
+       <testcase id="harold-06" href="includedocumentwithintradocumentreferences.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Include a document that uses XPointers to reference various parts of itself</description>	
+			<output>../result/includedocumentwithintradocumentreferences.xml</output>
+		</testcase>
+    
+    <testcase id="harold-07" href="langtest1.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#language">4.5.6</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>xml:lang attribute from including document does not override xml:lang attribute in included document</description>	
+			<output>../result/langtest1.xml</output>
+		</testcase>
+    
+    <testcase id="harold-08" href="langtest2.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#language">4.5.6</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>xml:lang attribute is added to retain the included element's language, even
+        though the language was originaly declared on an unincluded element</description>	
+			<output>../result/langtest2.xml</output>
+		</testcase>
+    
+    <testcase id="harold-09" href="langtest3.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#language">4.5.6</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>xml:lang='' is added when the included document does not declare a language
+      and the including element does</description>	
+			<output>../result/langtest3.xml</output>
+		</testcase>
+    
+    
+    <testcase id="harold-10" href="marshtestwithxmlbase.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include-location">4.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Test that the 
+      xml:base attribute is not used to resolve a missing href.
+      According to RFC 2396 empty string URI always refers to the  current document irrespective of base URI.</description>
+			<output>../result/marshtestwithxmlbase.xml</output>
+		</testcase>
+    
+    
+    <testcase id="harold-11" href="marshtestwithxmlbaseandemptyhref.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>There's no difference between href="" and no href attribute.</description>	
+			<output>../result/marshtestwithxmlbase.xml</output>
+		</testcase>
+
+    
+    <testcase id="harold-12" href="includefromsamedocumentwithbase.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#base">4.5.5</section>
+  
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Make sure base URIs are preserved when including from the same document.</description>	
+			<output>../result/includefromsamedocumentwithbase.xml</output>
+		</testcase>
+		
+    <testcase id="harold-13" href="badiri.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Syntactically incorrect IRI is a fatal error (Eitehr I'm missing something or the spec needs to state this prinicple more clearly.)</description>	
+		</testcase>
+		
+    <testcase id="harold-14" href="badiri2.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Syntactically incorrect IRI with an unrecognized scheme is a fatal error</description>	
+		</testcase>
+		
+    <testcase id="harold-15" href="goodiri.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+<description>Syntactically correct IRI with an unrecognized scheme is a resource error</description>				
+<output>../result/goodiri.xml</output>
+		</testcase>
+		
+		<testcase id="harold-16" href="badaccept1.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>accept attribute contains carriage-return/linefeed pair</description>	
+		</testcase>
+    
+    <testcase id="harold-17" href="badaccept2.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>accept attribute contains Latin-1 character (non-breaking space)</description>	
+		</testcase>
+		
+    <testcase id="harold-18" href="extraattributes.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Unprefixed, unrecognized attributes on an include element are ignored</description>	
+			<output>../result/c1.xml</output>
+		</testcase>    
+    
+    <testcase id="harold-19" href="emptyfallback.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback_element">3.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Fallback elements can be empty</description>	
+			<output>../result/emptyfallback.xml</output>
+		</testcase>
+		
+    <testcase id="harold-20" href="metafallbacktest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Included documents can themselves use fallbacks</description>	
+			<output>../result/metafallbacktest.xml</output>
+		</testcase>
+		
+    <testcase id="harold-21" href="metafallbacktest6.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An included document can use a fallback that points into the included document</description>	
+			<output>../result/metafallbacktest6.xml</output>
+		</testcase>
+		
+    <testcase id="harold-22" href="metafallbacktest2.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An included document can use a fallback that includes another document as text</description>	
+			<output>../result/metafallbacktest2.xml</output>
+		</testcase>
+        
+    <testcase id="harold-23" href="metafallbacktest3.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A fallback element in an included document contains an include element with a parse attribute with an illegal value.</description>	
+		</testcase>
+		
+    <testcase id="harold-24" href="metafallbacktest4.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A fallback element in an included document contains an include element with neither an xpointer nor an href attribute.</description>	
+		</testcase>
+		
+ 
+    <testcase id="harold-25" href="metafallbacktestwithfragmentid.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A fallback element in an included document contains an include element whose href attribute has a fragment ID.</description>	
+		</testcase>    
+    
+    <testcase id="harold-26" href="metafallbacktest5.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>The XPointer does not select anything in the acquired infoset, but does select something in the source infoset.</description>	
+		</testcase>
+		
+    <testcase id="harold-27" href="metafallbacktotexttest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A fallback in an included document contains some text and a comment, but no elements.</description>	
+			<output>../result/metafallbacktotexttest.xml</output>
+		</testcase>
+    
+    <testcase id="harold-28" href="metafallbacktestwithxpointer.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Include element points to another include element, which has a missing resource 
+      and therefore activates a fallback.</description>	
+			<output>../result/metafallbacktestwithxpointer.xml</output>
+		</testcase>
+		
+    <testcase id="harold-29" href="metafallbacktestwithxpointer2.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An include element can include another include element that
+      then uses a fallback.</description>	
+			<output>../result/metafallbacktestwithxpointer2.xml</output>
+		</testcase>
+    
+    <testcase id="harold-30" href="metamissingfallbacktestwithxpointer.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An include element can include another include element that
+      then fails to find a resource, which is a fatal error if there's no fallback.</description>	
+		</testcase>
+		
+		<testcase id="harold-31" href="metafallbackwithbadxpointertest.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An include element can include another include element that
+      then fails to find a resource, but it has a fallback, which itself has an include child, which then throws a fatal error.</description>	
+		</testcase>
+		
+    <testcase id="harold-32" href="parseequalxml.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Basic test from XInclude spec</description>	
+			<output>../result/c1.xml</output>
+		</testcase>
+    
+    <testcase id="harold-33" href="legalcircle.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#loops">4.2.7</section>
+      <date qualifier="created">31-Aug-2004</date>
+      <description>An include element points to a document that includes it, using an xpointer to select part of that document.</description>	
+		</testcase>    
+    
+    <testcase id="harold-34" href="recursewithinsamedocument.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An include element points to another include element in the same document.</description>	
+			<output>../result/recursewithinsamedocument.xml</output>
+		</testcase>    
+    
+    <testcase id="harold-35" href="paralleltest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Include elements can be siblings</description>	
+			<output>../result/paralleltest.xml</output>
+		</testcase>
+		
+    <testcase id="harold-36" href="namespacetest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#processing">4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Namespaces (and lack thereof) must be preserved in included documents</description>	
+			<output>../result/namespacetest.xml</output>
+		</testcase>
+		
+    <testcase id="harold-37" href="internalcircular.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#loops">4.2.7</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Detect an inclusion loop when an include element refers to itself</description>	
+		</testcase>
+		
+    <testcase id="harold-38" href="internalcircularviaancestor.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#loops">4.2.7</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Detect an inclusion loop when an include element refers to its  ancestor element
+      in the same document</description>	
+		</testcase>
+		
+    <testcase id="harold-39" href="latin1.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#processing">4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Processing a document that contains no include elements produces the same document.</description>	
+			<output>../result/latin1.xml</output>
+		</testcase>
+		
+    <testcase id="harold-40" href="simple.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#processing">4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Basic inclusion</description>	
+			<output>../result/simple.xml</output>
+		</testcase>
+    
+    <testcase id="harold-41" href="roottest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>The root element of a document can be an include element.</description>	
+			<output>../result/roottest.xml</output>
+		</testcase>
+
+      <testcase id="harold-42" href="roottest2.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>The root element of a document can be an include element.
+      In this test the included document has a prolog and an epilog and the root element is replaced</description>	
+			<output>../result/roottest2.xml</output>
+		</testcase>
+
+    <testcase id="harold-43" href="nestedxinclude.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>testIncludeElementsCannotHaveIncludeChildren</description>	
+		</testcase>
+
+    <testcase id="harold-44" href="nestedxincludenamespace.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Include elements cannot have children from the xinclude namespace except for fallback.</description>	
+		</testcase>
+
+    <testcase id="harold-45" href="nakedfallback.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback_element">3.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Fallback can only be a child of xinclude element</description>	
+		</testcase>
+
+    <testcase id="harold-46" href="fallbackcontainsfallback.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback_element">3.2</section>
+
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A fallback element cannot have a fallback child element.</description>	
+		</testcase>
+
+    <testcase id="harold-47" href="multiplefallbacks.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>"The appearance of more than one xi:fallback element, an xi:include element, 
+      or any other element from the XInclude namespace is a fatal error."
+      In this test the fallback is activated.</description>	
+		</testcase>
+
+    <testcase id="harold-48" href="multiplefallbacks2.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>"The appearance of more than one xi:fallback element, an xi:include element, 
+      or any other element from the XInclude namespace is a fatal error."
+      In this test the fallback is not activated.</description>	
+		</testcase>
+    
+    <testcase id="harold-49" href="circle1.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#loops">4.2.7</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A document cannot include itself</description>	
+		</testcase>
+
+    <testcase id="harold-50" href="circle2a.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#loops">4.2.7</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Document A includes document B which includes document A</description>	
+		</testcase>
+    
+    <testcase id="harold-51" href="missinghref.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Include element is missing an href and xpointer attribute</description>	
+		</testcase>
+    
+    <testcase id="harold-52" href="badparseattribute.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>parse attribute must have value xml or text</description>	
+		</testcase>
+    
+    <testcase id="harold-53" href="missingfile.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Missing resource is fatal when there's no fallback</description>	
+		</testcase>
+    
+    <testcase id="harold-54" href="fallbacktest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback">4.4</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Missing resource is non-fatal when there's a fallback</description>	
+			<output>../result/fallbacktest.xml</output>
+		</testcase>
+    
+    <testcase id="harold-55" href="fallbacktest2.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#fallback_element">3.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Fallback elements can themselves contain include elements</description>	
+			<output>../result/fallbacktest2.xml</output>
+		</testcase>
+
+    <testcase id="harold-56" href="utf16.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>encoding="UTF-16"</description>	
+			<output>../result/utf16.xml</output>
+		</testcase>
+    
+    <testcase id="harold-57" href="xptridtest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A shorthand XPointer</description>	
+			<output>../result/xptridtest.xml</output>
+		</testcase>
+    
+    <testcase id="harold-58" href="xptridtest2.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>XPointer that selects nothing is a resource error, and fatal because there's no fallback.</description>	
+		</testcase>
+    
+    <testcase id="harold-59" href="xptrtumblertest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>XPointers of the forms described in [XPointer Framework] and [XPointer element() scheme] must be supported. </description>	
+			<output>../result/xptrtumblertest.xml</output>
+		</testcase>
+
+    <testcase id="harold-60" href="colonizedschemename.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Unrecognized colonized XPointer schemes are skipped, and the following scheme is used.</description>	
+			<output>../result/xptrtumblertest.xml</output>
+		</testcase>
+
+    <testcase id="harold-61" href="laterfailure.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Even if the first XPointer part locates a resource, a syntax error in
+      the second XPointer part is still a fatal error.</description>	
+		</testcase>
+
+    <testcase id="harold-62" href="laterfailure2.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Even if the first XPointer part locates a resource, a syntax error in
+      the second XPointer part is still a fatal error.</description>	
+		</testcase>
+
+    <testcase id="harold-63" href="onlyxpointer.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>You can include another element from the same document without an href attribute.</description>	
+			<output>../result/onlyxpointer.xml</output>
+		</testcase>
+
+      <testcase id="harold-64" href="xptr2tumblertest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description> Test with 3 element schemes in the XPointer.
+    The first and second one point to nothing. The third one
+    selects something. XPointer parts are evaluated from left to right until one finds something.</description>	
+			<output>../result/xptrtumblertest.xml</output>
+		</testcase>
+
+    <testcase id="harold-65" href="xptrtumblertest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Test with 2 element schemes in the XPointer.
+     The first one uses an ID that doesn't exist 
+    and points to nothing. The second one
+     selects something.</description>	
+			<output>../result/xptrtumblertest.xml</output>
+		</testcase>
+
+      <testcase id="harold-66" href="xptrtumblerfailsbutfallback.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>  Make sure XPointer syntax errors are treated as a resource 
+    error, not a fatal error; and thus fallbacks are applied</description>	
+			<output>../result/xptrtumblertest.xml</output>
+		</testcase>
+
+    <testcase id="harold-67" href="xptrsyntaxerrorbutfallback.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>  Make sure XPointer syntax errors are treated as a resource 
+    error, not a fatal error; and thus fallbacks are applied</description>	
+			<output>../result/xptrtumblertest.xml</output>
+		</testcase>
+
+    <testcase id="harold-68" href="xptrtumblertest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>  
+      <date qualifier="created">31-Aug-2004</date>
+			<description> Test with 3 element schemes in the XPointer, separated by white space.
+    The first one points to nothing. The third one
+    selects something.</description>	
+			<output>../result/xptrtumblertest.xml</output>
+		</testcase>
+
+    <testcase id="harold-69" href="xptrtumblertest2.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>An XPointer that doesn't point to anything is a resource error; and fatal because there's no fallback</description>	
+		</testcase>
+    
+    <testcase id="harold-70" href="badxptr.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Syntax error in an XPointer is a resource error; and fatal because there's no fallback</description>	
+		</testcase>
+    
+    <testcase id="harold-71" href="badxptr2.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items?">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Syntax error in an XPointer is a resource error; and fatal because there's no fallback</description>	
+		</testcase>
+    
+    <testcase id="harold-72" href="xptrfallback.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Unrecognized XPointer scheme activates fallback</description>	
+			<output>../result/xptrfallback.xml</output>
+		</testcase>
+    
+    <testcase id="harold-73" href="xptridandtumblertest.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>XPointer uses an element scheme where the first part is an ID</description>	
+			<output>../result/xptridandtumblertest.xml</output>
+		</testcase>
+
+    <testcase id="harold-74" href="UTF16BigEndianWithByteOrderMark.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Can autodetect UTF16 big endian files with a with a byte order mark when parse="text"</description>	
+			<output>../result/UTF16BigEndianWithByteOrderMark.xml</output>
+		</testcase>
+
+    <testcase id="harold-75" href="UTF16LittleEndianWithByteOrderMark.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Can autodetect UTF16 little endian files with a with a byte order mark when parse="text"</description>	
+			<output>../result/UTF16LittleEndianWithByteOrderMark.xml</output>
+		</testcase>
+
+    <testcase id="harold-76" href="UTF8WithByteOrderMark.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Can autodetect UTF-8 files with a with a byte order mark when parse="text"</description>	
+			<output>../result/UTF8WithByteOrderMark.xml</output>
+		</testcase>
+
+    <testcase id="harold-77" href="UnicodeBigUnmarked.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Can autodetect UCS2 big endian files with a without a byte order mark when parse="text"</description>	
+			<output>../result/UnicodeBigUnmarked.xml</output>
+		</testcase>
+
+    <testcase id="harold-78" href="UnicodeLittleUnmarked.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Can autodetect UCS2 little endian files with a without a byte order mark when parse="text"</description>	
+			<output>../result/UnicodeLittleUnmarked.xml</output>
+		</testcase>
+    
+      <testcase id="harold-79" href="EBCDIC.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Can autodetect EBCDIC files with a without a byte order mark when parse="text"</description>	
+			<output>../result/EBCDIC.xml</output>
+		</testcase>
+
+    <testcase id="harold-80" href="badxptr3.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Syntax error in an XPointer is a resource error; and fatal becaue there's no fallback</description>	
+		</testcase>
+
+    <testcase id="harold-81" href="badxptr4.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Syntax error in an XPointer is a resource error; and fatal becaue there's no fallback</description>	
+		</testcase>
+
+    <testcase id="harold-82" href="circlepointer1.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#loops">4.2.7</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Circular references via xpointer are fatal</description>	
+		</testcase>
+    
+    <testcase id="harold-83" href="xpointeroverridesfragmentid.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>href attribute with fragment ID is a fatal error even when there's an xpointer attribute</description>	
+		</testcase>
+    
+    <testcase id="harold-84" href="ignoresfragmentid.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>href attribute with fragment ID is a fatal error</description>	
+		</testcase>
+    
+    <testcase id="harold-85" href="lineends.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#text-included-items">4.3</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Line breaks must be preserved verbatim when including a document with parse="text"</description>	
+			<output>../result/lineends.xml</output>
+		</testcase>
+    
+    <testcase id="harold-86" href="meaninglessfragmentid.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>A fragment identifier is semantically bad; but still meets the
+    syntax of fragment IDs from RFC 2396. </description>
+		</testcase>
+    
+    <testcase id="harold-87" href="acceptfrench.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>accept-language="fr"
+			 This test connects to IBiblio to load the included
+data. This is necessary because file URLs don't support
+content negotiation</description>	
+			<output>../result/acceptfrench.xml</output>
+		</testcase>
+    
+    <testcase id="harold-88" href="acceptenglish.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>accept-language="en"
+      This test connects to IBiblio to load the included
+data. This is necessary because file URLs don't support
+content negotiation</description>	
+			<output>../result/acceptenglish.xml</output>
+		</testcase>
+    
+    <testcase id="harold-89" href="acceptplaintext.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>accept="text/plain"
+      This test connects to IBiblio to load the included
+data. This is necessary because file URLs don't support
+content negotiation</description>	
+			<output>../result/acceptplaintext.xml</output>
+		</testcase>
+    
+    <testcase id="harold-90" href="accepthtml.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>accept="text/html"
+      This test connects to IBiblio to load the included
+data. This is necessary because file URLs don't support
+content negotiation</description>	
+			<output>../result/accepthtml.xml</output>
+		</testcase>
+
+    <testcase id="harold-91" href="unrecognizedscheme.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Unrecognized scheme in XPointer is a fatal error if there's no fallback</description>	
+		</testcase>
+     
+    <testcase id="harold-92" href="unrecognizedschemewithfallback.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section>
+      <date qualifier="created">31-Aug-2004</date>
+      <description>Unrecognized scheme in XPointer is a resource error so fallbacks apply</description>
+      <output>../result/unrecognizedschemewithfallback.xml</output>
+		</testcase>
+     
+    <testcase id="harold-93" href="test.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#creating-result">4.5</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Basic inclusions as XML and text</description>	
+			<output>../result/test.xml</output>
+	</testcase>    
+
+    <testcase id="harold-94" href="toplevel.xml"
+		          type="error">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">31-Aug-2004</date>
+			<description>Included document has an include element with neither href nor xpointer attribute</description>	
+	</testcase>
+		
+    <testcase id="harold-95" href="tobintop.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">12-Sep-2004</date>
+			<description>XPointers are resolved against the acquired infoset, not thge source infoset</description>	
+			<output>../result/tobintop.xml</output>
+		</testcase>
+    
+    <testcase id="harold-96" href="badelementschemedata.xml"
+		          type="success">
+			<contributor>Elliotte Rusty Harold</contributor>
+			<section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section>
+      <date qualifier="created">12-Sep-2004</date>
+			<description>Test that a non-child sequence in an xpointer is treated as a resource error.</description>	
+			<output>../result/badelementschemedata.xml</output>
+		</testcase>
+    
 	</testcases>
 </testsuite>

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Nist/result nist-include-21.xml,1.2,1.3 nist-include-28.xml,1.2,1.3 nist-include-29.xml,1.2,1.3 nist-include-30.xml,1.2,1.3 nist-include-34.xml,1.1,1.2 nist-include-51.xml,1.1,1.2 nist-include-52.xml,1.1,1.2 nist-include-55.xml,1.2,1.3

From: Oleg T. <he...@us...> - 2004-10-19 16:26:10

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Nist/result

Modified Files:
	nist-include-21.xml nist-include-28.xml nist-include-29.xml 
	nist-include-30.xml nist-include-34.xml nist-include-51.xml 
	nist-include-52.xml nist-include-55.xml 
Log Message:
XInclude Test Suite updated

Index: nist-include-30.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-30.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nist-include-30.xml	18 Oct 2004 18:19:23 -0000	1.2
+++ nist-include-30.xml	19 Oct 2004 16:24:57 -0000	1.3
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE x [
-    <!ELEMENT x (family*)>
-    <!ELEMENT family (#PCDATA)>
-    <!ATTLIST family fnumber ID #REQUIRED>
-    <!ATTLIST family father IDREF #IMPLIED>
-    <!ATTLIST family mother IDREF #IMPLIED>
+<!ELEMENT x (family)*>
+<!ELEMENT family (#PCDATA)>
+<!ATTLIST family fnumber ID #REQUIRED>
+<!ATTLIST family father IDREF #IMPLIED>
+<!ATTLIST family mother IDREF #IMPLIED>
 ]>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including another XML document with ids using a shorthand pointer. -->

Index: nist-include-28.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-28.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nist-include-28.xml	17 Oct 2004 21:01:13 -0000	1.2
+++ nist-include-28.xml	19 Oct 2004 16:24:57 -0000	1.3
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE book [
-<!ELEMENT book (doc*)>
-<!ELEMENT doc (isid*)>
+<!ELEMENT book (doc)*>
+<!ELEMENT doc (isid)*>
 <!ELEMENT isid EMPTY>
 <!ATTLIST isid myid ID #IMPLIED>
 ]>

Index: nist-include-29.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-29.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nist-include-29.xml	18 Oct 2004 18:19:23 -0000	1.2
+++ nist-include-29.xml	19 Oct 2004 16:24:57 -0000	1.3
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE x [
-    <!ELEMENT x (family*)>
-    <!ELEMENT family (#PCDATA)>
-    <!ATTLIST family fnumber ID #REQUIRED>
-    <!ATTLIST family father IDREF #IMPLIED>
-    <!ATTLIST family mother IDREF #IMPLIED>
+<!ELEMENT x (family)*>
+<!ELEMENT family (#PCDATA)>
+<!ATTLIST family fnumber ID #REQUIRED>
+<!ATTLIST family father IDREF #IMPLIED>
+<!ATTLIST family mother IDREF #IMPLIED>
 ]>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including another XML document with ids using a shorthand pointer. -->

Index: nist-include-51.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-51.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-51.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-51.xml	19 Oct 2004 16:24:57 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Test an include location identifying a comment. In this case
 	the set of top level include items  consist of the 

Index: nist-include-21.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-21.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nist-include-21.xml	17 Oct 2004 21:01:13 -0000	1.2
+++ nist-include-21.xml	19 Oct 2004 16:24:57 -0000	1.3
@@ -1,10 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE x [
- <!ELEMENT x (view*)>
- <!ELEMENT view EMPTY>
- <!ATTLIST view sun ENTITY #IMPLIED>
- <!NOTATION jpg SYSTEM "jpg">
- <!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
+<!ELEMENT x (view)*>
+<!ELEMENT view EMPTY>
+<!ATTLIST view sun ENTITY #IMPLIED>
+<!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
 ]>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including an XML document with an unparsed entity.  -->

Index: nist-include-52.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-52.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-52.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-52.xml	19 Oct 2004 16:24:57 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Test an include location identifying a processing instruction. In this case
 	the set of top level included items  consist of the 

Index: nist-include-55.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-55.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nist-include-55.xml	17 Oct 2004 21:01:13 -0000	1.2
+++ nist-include-55.xml	19 Oct 2004 16:24:57 -0000	1.3
@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
 <!DOCTYPE x [
-<!ELEMENT x (xinclude:include*, view*)>
+<!ELEMENT x (xinclude:include* , view*)>
 <!ELEMENT xinclude:include EMPTY>
-<!ATTLIST xinclude:include
-	xmlns:xinclude CDATA #FIXED "http://www.w3.org/2001/XInclude"
-	href	CDATA #REQUIRED
-	parse	(xml|text) "xml"
-	encoding CDATA #IMPLIED>
- <!ELEMENT view EMPTY>
- <!NOTATION jpg SYSTEM "jpg">
- <!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
- <!ATTLIST view sun ENTITY #IMPLIED>
+<!ATTLIST xinclude:include xmlns:xinclude CDATA #FIXED "http://www.w3.org/2001/XInclude">
+<!ATTLIST xinclude:include href CDATA #REQUIRED>
+<!ATTLIST xinclude:include parse (xml | text) "xml">
+<!ATTLIST xinclude:include encoding CDATA #IMPLIED>
+<!ELEMENT view EMPTY>
+<!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
+<!ATTLIST view sun ENTITY #IMPLIED>
 ]>
 <!-- Including a duplicate unparsed entity. Test should ignore duplicate unparsed entity. -->
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">

Index: nist-include-34.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-34.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-34.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-34.xml	19 Oct 2004 16:24:57 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including another XML document with ids using XPointer element schema. -->
    <family fnumber="f1" xml:base="../ents/idtst.xml">Lopez</family>

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Nist/test/ents idtst.xml,1.2,1.3

From: Oleg T. <he...@us...> - 2004-10-19 16:26:08

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/test/ents
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Nist/test/ents

Modified Files:
	idtst.xml 
Log Message:
XInclude Test Suite updated

Index: idtst.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/test/ents/idtst.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- idtst.xml	18 Oct 2004 18:19:23 -0000	1.2
+++ idtst.xml	19 Oct 2004 16:24:58 -0000	1.3
@@ -1,7 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE doc [
     <!ELEMENT doc (family*)>
-    <!ELEMENT family (#PCDATA)>
     <!ATTLIST family fnumber ID #REQUIRED>
     <!ATTLIST family father IDREF #IMPLIED>
     <!ATTLIST family mother IDREF #IMPLIED>

[mvp-xml-cvs] XInclude/v1/test Elliotte_Rusty_HaroldTests.cs,NONE,1.1 LTG_Edinburgh_UnivTests.cs,NONE,1.1 RedhatTests.cs,NONE,1.1 TestsGen.xslt,NONE,1.1 generate-tests.cmd,NONE,1.1 EntryPoint.cs,1.2,1.3 FourThoughtTests.cs,1.1,1.2 NistTests.cs,1.2,1.3 XIncludeTest.csproj,1.5,1.6 EdUniTests.cs,1.1,NONE ImaqTests.cs,1.1,NONE

From: Oleg T. <he...@us...> - 2004-10-19 16:26:08

Update of /cvsroot/mvp-xml/XInclude/v1/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test

Modified Files:
	EntryPoint.cs FourThoughtTests.cs NistTests.cs 
	XIncludeTest.csproj 
Added Files:
	Elliotte_Rusty_HaroldTests.cs LTG_Edinburgh_UnivTests.cs 
	RedhatTests.cs TestsGen.xslt generate-tests.cmd 
Removed Files:
	EdUniTests.cs ImaqTests.cs 
Log Message:
XInclude Test Suite updated

--- ImaqTests.cs DELETED ---

Index: XIncludeTest.csproj
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- XIncludeTest.csproj	17 Oct 2004 21:01:12 -0000	1.5
+++ XIncludeTest.csproj	19 Oct 2004 16:24:56 -0000	1.6
@@ -95,7 +95,7 @@
         <Files>
             <Include>
                 <File
-                    RelPath = "EdUniTests.cs"
+                    RelPath = "Elliotte_Rusty_HaroldTests.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
@@ -110,16 +110,29 @@
                     BuildAction = "Compile"
                 />
[...985 lines suppressed...]
+                <File
+                    RelPath = "XInclude-Test-Suite\Harold\test\text\UnicodeLittleUnmarked.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "XInclude-Test-Suite\Harold\test\text\UTF32BE.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "XInclude-Test-Suite\Harold\test\text\UTF32LE.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "XInclude-Test-Suite\Harold\test\text\UTF8.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "XInclude-Test-Suite\Imaq\result\XInclude\docids.xml"
                     BuildAction = "Content"
                 />

--- EdUniTests.cs DELETED ---

--- NEW FILE: Elliotte_Rusty_HaroldTests.cs ---
(This appears to be a binary file; contents omitted.)

Index: FourThoughtTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/FourThoughtTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FourThoughtTests.cs	16 Oct 2004 21:03:15 -0000	1.1
+++ FourThoughtTests.cs	19 Oct 2004 16:24:56 -0000	1.2
@@ -1,4 +1,4 @@
-using System;
+ï»¿using System;
 using System.Diagnostics;
 using System.Xml;
 using System.IO;
@@ -10,7 +10,7 @@
 namespace Mvp.Xml.XInclude.Test
 {
 	/// <summary>
-	/// FourThough test cases from the XInclude Test suite.
+	/// Edinburgh University test cases from the XInclude Test suite.
 	/// </summary>
 	[TestFixture]
 	public class FourThoughtTests
@@ -27,70 +27,87 @@
         {
             XIncludeReaderTests.RunAndCompare(
                 "../../XInclude-Test-Suite/FourThought/test/XInclude/docs/" + source, 
-                "../../XInclude-Test-Suite/FourThought/result/XInclude/" + result);
+                "../../XInclude-Test-Suite/FourThought/test/XInclude/docs/" + result);
         }
-
+        
+		
         /// <summary>
-        /// Simple test of including another XML document.
+        /// Simple test of including another XML document.        
         /// </summary>
         [Test]
-        public void Test1() 
+        public void FourThought_include_01() 
         {
-            RunAndCompare("ft-include1.xml", "include1.xml");            
-        }
-
+            RunAndCompare("ft-include1.xml", "../../../result/XInclude/include1.xml");            
+        }  
+  
+		
+		
         /// <summary>
-        /// Test recursive inclusion.
+        /// Test recursive inclusion.        
         /// </summary>
         [Test]
-        public void Test2() 
+        public void FourThought_include_02() 
         {
-            RunAndCompare("ft-include2.xml", "include2.xml");            
-        }
+            RunAndCompare("ft-include2.xml", "../../../result/XInclude/include2.xml");            
+        }  
+  
 
+		
+		
         /// <summary>
-        /// Simple test of including another text document.
+        /// Simple test of including another text document.        
         /// </summary>
         [Test]
-        public void Test3() 
+        public void FourThought_include_03() 
         {
-            RunAndCompare("ft-include3.xml", "include3.xml");            
-        }
+            RunAndCompare("ft-include3.xml", "../../../result/XInclude/include3.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Simple test of including a set of nodes from an XML document.
+        /// Simple test of including a set of nodes from an XML document.        
         /// </summary>
         [Test]
-        public void Test4() 
+        public void FourThought_include_04() 
         {
-            RunAndCompare("ft-include4.xml", "include4.xml");            
-        }
+            RunAndCompare("ft-include4.xml", "../../../result/XInclude/include4.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Simple test of including a set of nodes from an XML document.
+        /// Simple test of including a set of nodes from an XML document.        
         /// </summary>
         [Test]
-        public void Test5() 
+        public void FourThought_include_05() 
         {
-            RunAndCompare("ft-include5.xml", "include5.xml");            
-        }
+            RunAndCompare("ft-include5.xml", "../../../result/XInclude/include5.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Simple test of including a set of nodes from an XML document.
+        /// Simple test of including a set of nodes from an XML document.        
         /// </summary>
         [Test]
-        public void Test6() 
+        public void FourThought_include_06() 
         {
-            RunAndCompare("ft-include6.xml", "include6.xml");            
-        }
+            RunAndCompare("ft-include6.xml", "../../../result/XInclude/include6.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Simple test of including a set of nodes from an XML document.
+        /// Simple test of including a set of nodes from an XML document.        
         /// </summary>
         [Test]
-        public void Test7() 
+        public void FourThought_include_07() 
         {
-            RunAndCompare("ft-include7.xml", "include7.xml");            
-        }
+            RunAndCompare("ft-include7.xml", "../../../result/XInclude/include7.xml");            
+        }  
+  
+		
+	
 	}
 }

--- NEW FILE: RedhatTests.cs ---
(This appears to be a binary file; contents omitted.)

Index: NistTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/NistTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NistTests.cs	18 Oct 2004 18:19:22 -0000	1.2
+++ NistTests.cs	19 Oct 2004 16:24:56 -0000	1.3
@@ -1,4 +1,4 @@
-using System;
+ï»¿using System;
 using System.Diagnostics;
 using System.Xml;
 using System.IO;
@@ -9,16 +9,16 @@
 
 namespace Mvp.Xml.XInclude.Test
 {
-    /// <summary>
-    /// NIST test cases from the XInclude Test suite.
-    /// </summary>
-    [TestFixture]
-    public class NistTests
-    {
-        public NistTests()
-        {
-            Debug.Listeners.Add(new TextWriterTraceListener(Console.Error));
-        }
+	/// <summary>
+	/// Edinburgh University test cases from the XInclude Test suite.
+	/// </summary>
+	[TestFixture]
+	public class NISTTests
+	{
+		public NISTTests()
+		{
+			Debug.Listeners.Add(new TextWriterTraceListener(Console.Error));
+		}
 
         /// <summary>
         /// Utility method for running tests.
@@ -27,535 +27,686 @@
         {
             XIncludeReaderTests.RunAndCompare(
                 "../../XInclude-Test-Suite/Nist/test/docs/" + source, 
-                "../../XInclude-Test-Suite/Nist/result/" + result);
+                "../../XInclude-Test-Suite/Nist/test/docs/" + result);
         }
-
+        
+		
         /// <summary>
-        /// 
+        /// Test the inclusion of another XML document.        
         /// </summary>
         [Test]
-        public void Test1() 
+        public void Nist_include_01() 
         {
-            RunAndCompare("nist-include-01.xml", "nist-include-01.xml");            
-        }
+            RunAndCompare("nist-include-01.xml", "../../result/nist-include-01.xml");            
+        }  
+  
+
+		
         /// <summary>
-        /// 
+        /// Test that the encoding attribute in the Xinclude element has no effect when parse="xml".        
         /// </summary>
         [Test]
-        public void Test2() 
+        public void Nist_include_02() 
         {
-            RunAndCompare("nist-include-02.xml", "nist-include-02.xml");            
-        }
+            RunAndCompare("nist-include-02.xml", "../../result/nist-include-02.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Test that values other than "xml" and "text" in the parse 
-        /// attribute of the XInclude element will generate a fatal error. 
-        /// Negative test.
+        /// Test that values other than xml or text, in the parse attribute of the XInclude
+        /// element, result in fatal errors.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(UnknownParseAttributeValueException))]
-        public void Test3() 
+        public void Nist_include_03() 
         {
-            RunAndCompare("nist-include-03.xml", "nist-include-03.xml");            
-        }
+            RunAndCompare("nist-include-03.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test of fallback element appearing as a child of an xinclude element.        
         /// </summary>
         [Test]
-        public void Test4() 
+        public void Nist_include_04() 
         {
-            RunAndCompare("nist-include-04.xml", "nist-include-04.xml");            
-        }
+            RunAndCompare("nist-include-04.xml", "../../result/nist-include-04.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Test a fallback element not appearing as a direct child of 
-        /// an xinclude element. A fatal error should be generated.
+        /// Test a fallback element not appearing as a direct
+        /// child of an xinclude element. A fatal error should be generated.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XIncludeSyntaxError))]
-        public void Test5() 
+        public void Nist_include_05() 
         {
-            RunAndCompare("nist-include-05.xml", "nist-include-05.xml");            
-        }
+            RunAndCompare("nist-include-05.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test a fallback when a resource error occurs.        
         /// </summary>
         [Test]
-        public void Test6() 
+        public void Nist_include_06() 
         {
-            RunAndCompare("nist-include-06.xml", "nist-include-06.xml");            
-        }
+            RunAndCompare("nist-include-06.xml", "../../result/nist-include-06.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test an empty fallback element. The xinclude element is
+        /// removed from the results.        
         /// </summary>
         [Test]
-        public void Test7() 
+        public void Nist_include_07() 
         {
-            RunAndCompare("nist-include-07.xml", "nist-include-07.xml");            
-        }
+            RunAndCompare("nist-include-07.xml", "../../result/nist-include-07.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Test that when the fallback element is missing, from the 
-        /// include element, a resource error results in a fatal error. 
-        /// Negative test.
+        /// Test of a fallback element missing from the
+        /// include element. A resource error results in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(FatalResourceException))]
-        public void Test8() 
+        public void Nist_include_08() 
         {
-            RunAndCompare("nist-include-08.xml", "nist-include-08.xml");            
-        }
-
+            RunAndCompare("nist-include-08.xml", "");            
+        }  
+  
+		
         /// <summary>
-        /// 
+        /// Test unqualified attributes in the include element. They must be ignored.        
         /// </summary>
         [Test]
-        public void Test9() 
+        public void Nist_include_09() 
         {
-            RunAndCompare("nist-include-09.xml", "nist-include-09.xml");            
-        }
+            RunAndCompare("nist-include-09.xml", "../../result/nist-include-09.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test content other than the fallback, in the xinclude element.
+        /// This content must be ignored.        
         /// </summary>
         [Test]
-        public void Test10() 
+        public void Nist_include_10() 
         {
-            RunAndCompare("nist-include-10.xml", "nist-include-10.xml");            
-        }
+            RunAndCompare("nist-include-10.xml", "../../result/nist-include-10.xml");            
+        }  
+  
+
 
+		
         /// <summary>
-        /// Test a resource containing non-well-formed XML. 
-        /// The inclusion results in a fatal error.
+        /// Test a resource containing non-well-formed XML. The inclusion results in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(FatalResourceException))]
-        public void Test11() 
+        public void Nist_include_11() 
         {
-            RunAndCompare("nist-include-11.xml", "nist-include-11.xml");            
-        }
+            RunAndCompare("nist-include-11.xml", "");            
+        }  
+  
+
+		
         /// <summary>
-        /// Test that is a fatal error for an include element to contain more 
-        /// than one fallback elements.
+        /// Test that is a fatal error for an include element to contain more than one fallback elements.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XIncludeSyntaxError))]
-        public void Test12() 
+        public void Nist_include_12() 
         {
-            RunAndCompare("nist-include-12.xml", "nist-include-12.xml");            
-        }
+            RunAndCompare("nist-include-12.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test a fallback element containing markup when parse="text".        
         /// </summary>
         [Test]
-        public void Test13() 
+        public void Nist_include_13() 
         {
-            RunAndCompare("nist-include-13.xml", "nist-include-13.xml");            
-        }
+            RunAndCompare("nist-include-13.xml", "../../result/nist-include-13.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test a fallback element containing markup when parse="text".        
         /// </summary>
         [Test]
-        public void Test14() 
+        public void Nist_include_14() 
         {
-            RunAndCompare("nist-include-14.xml", "nist-include-14.xml");            
-        }
+            RunAndCompare("nist-include-14.xml", "../../result/nist-include-14.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// It is illegal for an include element to point to itself, 
-        /// when parse="xml".
+        /// It is illegal for an include element to point to itself, when parse="xml".        
         /// </summary>
         [Test]
         [ExpectedException(typeof(CircularInclusionException))]
-        public void Test15() 
+        public void Nist_include_15() 
         {
-            RunAndCompare("nist-include-15.xml", "nist-include-15.xml");            
-        }
+            RunAndCompare("nist-include-15.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test a document type declaration information item child
+        /// in the resource information set. the DTD should be excluded for inclusion in the source infoset.        
         /// </summary>
         [Test]
-        public void Test16() 
+        public void Nist_include_16() 
         {
-            RunAndCompare("nist-include-16.xml", "nist-include-16.xml");            
-        }
+            RunAndCompare("nist-include-16.xml", "../../result/nist-include-16.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test intra-document reference within include elements.        
         /// </summary>
         [Test]
-        public void Test17() 
+        public void Nist_include_17() 
         {
-            RunAndCompare("nist-include-17.xml", "nist-include-17.xml");            
-        }
+            RunAndCompare("nist-include-17.xml", "../../result/nist-include-17.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Simple test of including a set of nodes from an XML document.        
         /// </summary>
         [Test]
-        public void Test18() 
+        public void Nist_include_18() 
         {
-            RunAndCompare("nist-include-18.xml", "nist-include-18.xml");            
-        }
-
+            RunAndCompare("nist-include-18.xml", "../../result/nist-include-18.xml");            
+        }  
+  
+		
         /// <summary>
-        /// 
+        /// Test the inclusion of a set of nodes from an XML document.        
         /// </summary>
         [Test]
-        public void Test19() 
+        public void Nist_include_19() 
         {
-            RunAndCompare("nist-include-19.xml", "nist-include-19.xml");            
-        }
+            RunAndCompare("nist-include-19.xml", "../../result/nist-include-19.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test an include location identifying a document information item with
+        /// an xpointer locating the document root. In this case
+        /// the set of top level include items is the children of acquired infoset's
+        /// document information item, except for the document type information
+        /// item.        
         /// </summary>
         [Test]
-        public void Test20() 
+        public void Nist_include_20() 
         {
-            RunAndCompare("nist-include-20.xml", "nist-include-20.xml");            
-        }
+            RunAndCompare("nist-include-20.xml", "../../result/nist-include-20.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including an XML document with an unparsed entity.        
         /// </summary>
         [Test]
-        public void Test21() 
+        public void Nist_include_21() 
         {
-            RunAndCompare("nist-include-21.xml", "nist-include-21.xml");            
-        }
+            RunAndCompare("nist-include-21.xml", "../../result/nist-include-21.xml");            
+        }  
+  
+
+		
         /// <summary>
-        /// 
+        /// Testing when the document (top level) element in the source infoset is an
+        /// include element.        
         /// </summary>
         [Test]
-        public void Test22() 
+        public void Nist_include_22() 
         {
-            RunAndCompare("nist-include-22.xml", "nist-include-22.xml");            
-        }
+            RunAndCompare("nist-include-22.xml", "../../result/nist-include-22.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// Testing an include element in the document (top-level) element 
-        /// in the source doc.
-        /// Test should fail because is including more than one element.
+        /// Testing an include element in the document (top-level) element in the source doc.
+        /// Test should fail because is including more than one element.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(MalformedXInclusionResultError))]
-        public void Test23() 
+        public void Nist_include_23() 
         {
-            RunAndCompare("nist-include-23.xml", "nist-include-23.xml");            
-        }
+            RunAndCompare("nist-include-23.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Testing an include element in the document (top-level) element in the source doc.
+        /// Test should fail because is including only a processing instruction.        
         /// </summary>
         [Test]
-        public void Test24() 
+        [ExpectedException(typeof(Exception))]
+        public void Nist_include_24() 
         {
-            RunAndCompare("nist-include-24.xml", "nist-include-24.xml");            
-        }
+            RunAndCompare("nist-include-24.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Testing an include element in the document (top-level) element in the source doc.
+        /// Test should fail because is including only a comment.        
         /// </summary>
         [Test]
-        public void Test25() 
+        [ExpectedException(typeof(Exception))]
+        public void Nist_include_25() 
         {
-            RunAndCompare("nist-include-25.xml", "nist-include-25.xml");            
-        }
+            RunAndCompare("nist-include-25.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test relative URI references in the included infoset.        
         /// </summary>
         [Test]
-        public void Test26() 
+        public void Nist_include_26() 
         {
-            RunAndCompare("nist-include-26.xml", "nist-include-26.xml");            
-        }
-
+            RunAndCompare("nist-include-26.xml", "../../result/nist-include-26.xml");            
+        }  
+  
+		
+		
         /// <summary>
-        /// 
+        /// Test that the encoding attribute when parse="xml" does not translate the incoming document.        
         /// </summary>
         [Test]
-        public void Test27() 
+        public void Nist_include_27() 
         {
-            RunAndCompare("nist-include-27.xml", "nist-include-27.xml");            
-        }
+            RunAndCompare("nist-include-27.xml", "../../result/nist-include-27.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// including another XML document with IDs, using a shorthand pointer.        
         /// </summary>
         [Test]
-        public void Test28() 
+        public void Nist_include_28() 
         {
-            RunAndCompare("nist-include-28.xml", "nist-include-28.xml");            
-        }
+            RunAndCompare("nist-include-28.xml", "../../result/nist-include-28.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// including another XML document with IDs, using a shorthand pointer.        
         /// </summary>
         [Test]
-        public void Test29() 
+        public void Nist_include_29() 
         {
-            RunAndCompare("nist-include-29.xml", "nist-include-29.xml");            
-        }
+            RunAndCompare("nist-include-29.xml", "../../result/nist-include-29.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including another XML document with IDs, using a shorthand pointer.        
         /// </summary>
         [Test]
-        public void Test30() 
+        public void Nist_include_30() 
         {
-            RunAndCompare("nist-include-30.xml", "nist-include-30.xml");            
-        }
+            RunAndCompare("nist-include-30.xml", "../../result/nist-include-30.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including an XML document using an XPointer element scheme.        
         /// </summary>
         [Test]
-        public void Test31() 
+        public void Nist_include_31() 
         {
-            RunAndCompare("nist-include-31.xml", "nist-include-31.xml");            
-        }
+            RunAndCompare("nist-include-31.xml", "../../result/nist-include-31.xml");            
+        }  
+  
+
+		
         /// <summary>
-        /// 
+        /// Including an XML document using an XPointer element scheme.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(FatalResourceException))]
-        public void Test32() 
+        public void Nist_include_32() 
         {
-            RunAndCompare("nist-include-32.xml", "nist-include-32.xml");            
-        }
+            RunAndCompare("nist-include-32.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including an XML document using an XPointer element scheme.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(FatalResourceException))]
-        public void Test33() 
+        public void Nist_include_33() 
         {
-            RunAndCompare("nist-include-33.xml", "nist-include-34.xml");            
-        }
+            RunAndCompare("nist-include-33.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including another XML document with ids using XPointer element scheme.        
         /// </summary>
         [Test]
-        public void Test35() 
+        public void Nist_include_34() 
         {
-            RunAndCompare("nist-include-35.xml", "nist-include-35.xml");            
-        }
+            RunAndCompare("nist-include-34.xml", "../../result/nist-include-34.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including an XML document using an XPointer element scheme.        
         /// </summary>
         [Test]
-        public void Test36() 
+        public void Nist_include_35() 
         {
-            RunAndCompare("nist-include-36.xml", "nist-include-36.xml");            
-        }
+            RunAndCompare("nist-include-35.xml", "../../result/nist-include-35.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including an XML document using an XPointer element scheme.        
         /// </summary>
         [Test]
-        public void Test37() 
+        public void Nist_include_36() 
         {
-            RunAndCompare("nist-include-37.xml", "nist-include-37.xml");            
-        }
+            RunAndCompare("nist-include-36.xml", "../../result/nist-include-36.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including another XML document using XPointer Framework scheme-base pointer.
+        /// If the processor does not support the scheme used in a pointer part, it skip that pointer part.        
         /// </summary>
         [Test]
-        public void Test38() 
+        public void Nist_include_37() 
         {
-            RunAndCompare("nist-include-38.xml", "nist-include-38.xml");            
-        }
+            RunAndCompare("nist-include-37.xml", "../../result/nist-include-37.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including another XML document using XPointer Framework.
+        /// If the processor does not support the scheme used in a pointer part, it skip that pointer part.        
         /// </summary>
         [Test]
-        public void Test39() 
+        public void Nist_include_38() 
         {
-            RunAndCompare("nist-include-39.xml", "nist-include-39.xml");            
-        }
+            RunAndCompare("nist-include-38.xml", "../../result/nist-include-38.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Testing the content of the xinclude element.
+        /// The comment should be ignored .        
         /// </summary>
         [Test]
-        public void Test40() 
+        public void nist_include_39() 
         {
-            RunAndCompare("nist-include-40.xml", "nist-include-40.xml");            
-        }
+            RunAndCompare("nist-include-39.xml", "../../result/nist-include-39.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// The content of the include element is another
-        /// include element, this test should result in a fatal error.
+        /// Testing the content of the xinclude element.
+        /// The element should be ignored .        
+        /// </summary>
+        [Test]
+        public void nist_include_40() 
+        {
+            RunAndCompare("nist-include-40.xml", "../../result/nist-include-40.xml");            
+        }  
+  
+
+		
+        /// <summary>
+        /// Testing the content of the xinclude element.
+        /// This test should result in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XIncludeSyntaxError))]
-        public void Test41() 
+        public void nist_include_41() 
         {
-            RunAndCompare("nist-include-41.xml", "nist-include-41.xml");            
-        }
+            RunAndCompare("nist-include-41.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// Testing the content of the xinclude element. This test should result 
-        /// in a fatal error.
+        /// Testing the content of the xinclude element.
+        /// The xinclude element may contain a fallback element;
+        /// other elements from the xinclude namespace result in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XIncludeSyntaxError))]
-        public void Test42() 
+        public void Nist_include_42() 
         {
-            RunAndCompare("nist-include-42.xml", "nist-include-42.xml");            
-        }
+            RunAndCompare("nist-include-42.xml", "");            
+        }  
+  
+
+		
         /// <summary>
-        /// Testing the content of the xinclude element. This test 
-        /// should result in a fatal error. The content must be one fallback.
+        /// Testing the content of the xinclude element.
+        /// The content must be one fallback. This test should result in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XIncludeSyntaxError))]
-        public void Test43() 
+        public void Nist_include_43() 
         {
-            RunAndCompare("nist-include-43.xml", "nist-include-43.xml");            
-        }
+            RunAndCompare("nist-include-43.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// Test a resource that contains not-well-formed XML. 
-        /// This test should result in a fatal error.
+        /// Test a resource that contains not-well-formed XML.
+        /// This test should result in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XmlException))]
-        public void Test44() 
+        public void Nist_include_44() 
         {
-            RunAndCompare("nist-include-44.xml", "nist-include-44.xml");            
-        }
+            RunAndCompare("nist-include-44.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// Test a resource that contains not-well-formed XML. 
-        /// This test should result in a fatal error.
+        /// Test a resource that contains not-well-formed XML.
+        /// This test should result in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XmlException))]
-        public void Test45() 
+        public void Nist_include_45() 
         {
-            RunAndCompare("nist-include-45.xml", "nist-include-45.xml");            
-        }
+            RunAndCompare("nist-include-45.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// Testing the content of the xinclude element. The xinclude element 
-        /// may contain a fallback element; other elements from the 
-        /// xinclude namespace result in a fatal error.
+        /// Testing the content of the xinclude element.
+        /// The xinclude element may contain a fallback element; other elements from the xinclude namespace result in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XIncludeSyntaxError))]
-        public void Test46() 
+        public void Nist_include_46() 
         {
-            RunAndCompare("nist-include-46.xml", "nist-include-46.xml");            
-        }
+            RunAndCompare("nist-include-46.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// Testing the content of the xinclude element. The xinclude 
-        /// element may contain a fallback element; other elements from 
-        /// the xinclude namespace result in a fatal error.
+        /// Testing the content of the xinclude element.
+        /// The xinclude element may contain a fallback element; other elements from the xinclude namespace result in a fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(XIncludeSyntaxError))]
-        public void Test47() 
+        public void Nist_include_47() 
         {
-            RunAndCompare("nist-include-47.xml", "nist-include-47.xml");            
-        }
+            RunAndCompare("nist-include-47.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// It is a fatal error to resolve an xpointer scheme on a document
+        /// that contains unexpanded entity reference information items.        
         /// </summary>
         [Test]
-        public void Test48() 
+        [ExpectedException(typeof(Exception))]
+        public void Nist_include_48() 
         {
-            RunAndCompare("nist-include-48.xml", "nist-include-48.xml");            
-        }
+            RunAndCompare("nist-include-48.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// The unexpanded entity reference information items, if present in the source infoset,
+        /// will appear in the result infoset.        
         /// </summary>
         [Test]
-        public void Test49() 
+        public void Nist_include_49() 
         {
-            RunAndCompare("nist-include-49.xml", "nist-include-49.xml");            
-        }
+            RunAndCompare("nist-include-49.xml", "../../result/nist-include-49.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test an include location identifying the document information item without an Xpointer,
+        /// The set of top-level included items should be the children of the acquired inforset's document
+        /// information item, except for the document type declaration information item.        
         /// </summary>
         [Test]
-        public void Test50() 
+        public void Nist_include_50() 
         {
-            RunAndCompare("nist-include-50.xml", "nist-include-50.xml");            
-        }
+            RunAndCompare("nist-include-50.xml", "../../result/nist-include-50.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test an include location having an XPointer identifying a comment.
+        /// The set of top-level included items should consist of the information item corresponding
+        /// to the comment node in the acquired infoset.        
         /// </summary>
         [Test]
-        public void Test51() 
+        public void Nist_include_51() 
         {
-            RunAndCompare("nist-include-51.xml", "nist-include-51.xml");            
-        }
+            RunAndCompare("nist-include-51.xml", "../../result/nist-include-51.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Test an include location having an XPointer identifying a processing instruction.
+        /// The set of top-level included items should consist of the information item corresponding
+        /// to the processing instruction node in the acquired infoset.        
         /// </summary>
         [Test]
-        public void Test52() 
+        public void Nist_include_52() 
         {
-            RunAndCompare("nist-include-52.xml", "nist-include-52.xml");            
-        }
+            RunAndCompare("nist-include-52.xml", "../../result/nist-include-52.xml");            
+        }  
+  
+
+		
         /// <summary>
-        /// Test that an include location identifying an attribute node 
-        /// will result in a fatal error.
+        /// Test that an include location identifying an attribute node will result in a
+        /// fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(AttributeOrNamespaceInIncludeLocationError))]
-        public void Test53() 
+        public void Nist_include_53() 
         {
-            RunAndCompare("nist-include-53.xml", "nist-include-53.xml");            
-        }
+            RunAndCompare("nist-include-53.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// Test that an include location identifying an attribute node 
-        /// will result in a fatal error.
+        /// Test that an include location identifying an attribute node will result in a
+        /// fatal error.        
         /// </summary>
         [Test]
         [ExpectedException(typeof(AttributeOrNamespaceInIncludeLocationError))]
-        public void Test54() 
+        public void Nist_include_54() 
         {
-            RunAndCompare("nist-include-54.xml", "nist-include-54.xml");            
-        }
+            RunAndCompare("nist-include-54.xml", "");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including a duplicate unparsed entity.
+        /// Test should ignore duplicate unparsed entity.        
         /// </summary>
         [Test]
-        public void Test55() 
+        public void Nist_include_55() 
         {
-            RunAndCompare("nist-include-55.xml", "nist-include-55.xml");            
-        }
+            RunAndCompare("nist-include-55.xml", "../../result/nist-include-55.xml");            
+        }  
+  
 
+		
         /// <summary>
-        /// 
+        /// Including an unparsed entity with same name,
+        /// but different sysid. Test should fail.        
         /// </summary>
         [Test]
-        public void Test56() 
+        [ExpectedException(typeof(Exception))]
+        public void Nist_include_56() 
         {
-            RunAndCompare("nist-include-56.xml", "nist-include-56.xml");            
-        }        
-    }
+            RunAndCompare("nist-include-56.xml", "");            
+        }  
+  
+
+
+
+	
+	}
 }

--- NEW FILE: LTG_Edinburgh_UnivTests.cs ---
(This appears to be a binary file; contents omitted.)

Index: EntryPoint.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EntryPoint.cs	18 Oct 2004 18:19:21 -0000	1.2
+++ EntryPoint.cs	19 Oct 2004 16:24:56 -0000	1.3
@@ -9,12 +9,12 @@
     {
         public static void Main() 
         {            
-            //XIncludeReaderTests rt = new XIncludeReaderTests();
+            XIncludeReaderTests rt = new XIncludeReaderTests();
             //EdUniTests rt = new EdUniTests();
-            NistTests rt = new NistTests();
+            //NistTests rt = new NistTests();
             try 
             {                
-                rt.Test24();
+                rt.IncludesItself();
             } 
             catch (Exception e) 
             {

--- NEW FILE: TestsGen.xslt ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:exsl="http://exslt.org/common" xmlns:str="http://exslt.org/strings" exclude-result-prefixes="exsl str">
  <xsl:template match="testsuite">
    <xsl:apply-templates select="testcases"/>
  </xsl:template>
  <xsl:template match="testcases">
    <xsl:variable name="creator" select="translate(@creator, ' ,', '_')"/>
    <exsl:document href="{$creator}Tests.cs" method="text" encoding="UTF-8">using System;
using System.Diagnostics;
using System.Xml;
using System.IO;
using System.Text;

using Mvp.Xml.XInclude;
using NUnit.Framework;

namespace Mvp.Xml.XInclude.Test
{
	/// &lt;summary>
	/// Edinburgh University test cases from the XInclude Test suite.
	/// &lt;/summary>
	[TestFixture]
	public class <xsl:value-of select="$creator"/>Tests
	{
		public <xsl:value-of select="$creator"/>Tests()
		{
			Debug.Listeners.Add(new TextWriterTraceListener(Console.Error));
		}

        /// &lt;summary>
        /// Utility method for running tests.
        /// &lt;/summary>        
        public static void RunAndCompare(string source, string result) 
        {
            XIncludeReaderTests.RunAndCompare(
                "../../XInclude-Test-Suite/<xsl:value-of select="@basedir"/>/" + source, 
                "../../XInclude-Test-Suite/<xsl:value-of select="@basedir"/>/" + result);
        }
        <xsl:apply-templates/>
	}
}
</exsl:document>
  </xsl:template>
  <xsl:template match="testcase">
        /// &lt;summary><xsl:for-each select="str:split(description, '&#xA;')">
        /// <xsl:value-of select="normalize-space(.)"/></xsl:for-each>        
        /// &lt;/summary>
        [Test]<xsl:if test="@type='error'">
        [ExpectedException(typeof(Exception))]</xsl:if>
        public void <xsl:value-of select="translate(@id, '-', '_')"/>() 
        {
            RunAndCompare("<xsl:value-of select="@href"/>", "<xsl:value-of select="output"/>");            
        }  
  </xsl:template>
</xsl:stylesheet>

  
--- NEW FILE: generate-tests.cmd ---
nxslt XInclude-Test-Suite\testdescr.xml TestsGen.xslt -mo

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/EdUni/test lang-samples.xml,NONE,1.1 lang.xml,NONE,1.1 book.xml,1.2,1.3

From: Oleg T. <he...@us...> - 2004-10-19 16:26:06

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/EdUni/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/EdUni/test

Modified Files:
	book.xml 
Added Files:
	lang-samples.xml lang.xml 
Log Message:
XInclude Test Suite updated

--- NEW FILE: lang.xml ---
<sentences xmlns:xi="http://www.w3.org/2001/XInclude">
  <sentence>The cat sat on the mat.</sentence>
  <sentence xml:lang="en-gb">Jackdaws love my big sphinx of quartz.</sentence>
  <xi:include href="lang-samples.xml" xpointer="none"/>
  <xi:include href="lang-samples.xml" xpointer="none2"/>
  <xi:include href="lang-samples.xml" xpointer="english"/>
  <xi:include href="lang-samples.xml" xpointer="english2"/>
  <xi:include href="lang-samples.xml" xpointer="french"/>
  <xi:include href="lang-samples.xml" xpointer="german"/>
  <xi:include href="lang-samples.xml" xpointer="australian"/>
  <sentences xml:lang="en-gb">
    <xi:include href="lang-samples.xml" xpointer="none"/>
    <xi:include href="lang-samples.xml" xpointer="none2"/>
    <xi:include href="lang-samples.xml" xpointer="english"/>
    <xi:include href="lang-samples.xml" xpointer="english2"/>
    <xi:include href="lang-samples.xml" xpointer="french"/>
    <xi:include href="lang-samples.xml" xpointer="german"/>
    <xi:include href="lang-samples.xml" xpointer="australian"/>
  </sentences>
</sentences>

--- NEW FILE: lang-samples.xml ---
<!DOCTYPE sentences [
<!ATTLIST sentence id ID #IMPLIED>
]>
<sentences>
 <sentence id="none">Hi.</sentence>
 <sentence id="english" xml:lang="en-gb">Hello.</sentence>
 <sentence id="french" xml:lang="fr">Bonjour.</sentence>
 <sentences xml:lang="en-gb">
   <sentence id="english2">Hello.</sentence>
 </sentences>
 <sentences xml:lang="de">
   <sentence id="german">Guten Tag.</sentence>
   <sentences xml:lang="en-au">
     <sentence id="australian">G'day mate.</sentence>
   </sentences>
   <sentences xml:lang="">
     <sentence id="none2">Yo..</sentence>
   </sentences>
 </sentences>
</sentences>

Index: book.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/EdUni/test/book.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- book.xml	18 Oct 2004 18:19:22 -0000	1.2
+++ book.xml	19 Oct 2004 16:24:56 -0000	1.3
@@ -1,9 +1,6 @@
 <!DOCTYPE book [
-<!ELEMENT book (intro, include*)>
 <!ATTLIST intro   id       ID    #IMPLIED>
 <!ATTLIST include xmlns    CDATA #FIXED "http://www.w3.org/2001/XInclude">
-<!ELEMENT intro (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
 ]>
 <book>
 <intro id="intro">

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/EdUni/result lang.xml,NONE,1.1 book.xml,1.3,1.4 extract.xml,1.2,1.3

From: Oleg T. <he...@us...> - 2004-10-19 16:26:05

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/EdUni/result
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/EdUni/result

Modified Files:
	book.xml extract.xml 
Added Files:
	lang.xml 
Log Message:
XInclude Test Suite updated

--- NEW FILE: lang.xml ---
<sentences xmlns:xi="http://www.w3.org/2001/XInclude">
  <sentence>The cat sat on the mat.</sentence>
  <sentence xml:lang="en-gb">Jackdaws love my big sphinx of quartz.</sentence>
  <sentence id="none" xml:base="lang-samples.xml">Hi.</sentence>
  <sentence id="none2" xml:base="lang-samples.xml">Yo..</sentence>
  <sentence xml:lang="en-gb" id="english" xml:base="lang-samples.xml">Hello.</sentence>
  <sentence xml:lang="en-gb" id="english2" xml:base="lang-samples.xml">Hello.</sentence>
  <sentence xml:lang="fr" id="french" xml:base="lang-samples.xml">Bonjour.</sentence>
  <sentence xml:lang="de" id="german" xml:base="lang-samples.xml">Guten Tag.</sentence>
  <sentence xml:lang="en-au" id="australian" xml:base="lang-samples.xml">G'day mate.</sentence>
  <sentences xml:lang="en-gb">
    <sentence xml:lang="" id="none" xml:base="lang-samples.xml">Hi.</sentence>
    <sentence xml:lang="" id="none2" xml:base="lang-samples.xml">Yo..</sentence>
    <sentence xml:lang="en-gb" id="english" xml:base="lang-samples.xml">Hello.</sentence>
    <sentence id="english2" xml:base="lang-samples.xml">Hello.</sentence>
    <sentence xml:lang="fr" id="french" xml:base="lang-samples.xml">Bonjour.</sentence>
    <sentence xml:lang="de" id="german" xml:base="lang-samples.xml">Guten Tag.</sentence>
    <sentence xml:lang="en-au" id="australian" xml:base="lang-samples.xml">G'day mate.</sentence>
  </sentences>
</sentences>

Index: book.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/EdUni/result/book.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- book.xml	18 Oct 2004 18:19:22 -0000	1.3
+++ book.xml	19 Oct 2004 16:24:56 -0000	1.4
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE book [
-<!ELEMENT book (intro, include*)>
 <!ATTLIST intro   id       ID    #IMPLIED>
 <!ATTLIST include xmlns    CDATA #FIXED "http://www.w3.org/2001/XInclude">
-<!ELEMENT intro (#PCDATA)>
-<!ELEMENT include (#PCDATA)>
 ]>
 <book>
 <intro id="intro">

Index: extract.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/EdUni/result/extract.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extract.xml	17 Oct 2004 21:01:12 -0000	1.2
+++ extract.xml	19 Oct 2004 16:24:56 -0000	1.3
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE extract [
-<!ATTLIST include xmlns    CDATA #FIXED "http://www.w3.org/2001/XInclude">
-]>
 <extract>
 <intro id="intro" xml:base="book.xml">
 You will enjoy this book.

[mvp-xml-cvs] XInclude/v1/src XIncludingReader.cs,1.11,1.12

From: Oleg T. <he...@us...> - 2004-10-19 16:26:05

Update of /cvsroot/mvp-xml/XInclude/v1/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/src

Modified Files:
	XIncludingReader.cs 
Log Message:
XInclude Test Suite updated

Index: XIncludingReader.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/src/XIncludingReader.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- XIncludingReader.cs	18 Oct 2004 19:31:24 -0000	1.11
+++ XIncludingReader.cs	19 Oct 2004 16:24:55 -0000	1.12
@@ -44,11 +44,9 @@
         //Current reader
         private XmlReader _reader;				
         //Stack of readers
-        private Stack _readers;
-        //Stack of Base URIs - to prevent circular inclusion
-        private Stack _baseURIs;
+        private Stack _readers;        
         //Top base URI
-        private Uri _topBaseUri;
+        private Uri _topBaseUri;        
         //Top-level included item flag
         private bool _topLevel;
 		//One top-level element has been included already
@@ -142,6 +140,7 @@
 	
         #region XmlReader's overriden members
 	    
+        /// <summary>See <see cref="XmlReader.AttributeCount"/></summary>
         public override int AttributeCount 
         {
             get 
@@ -155,11 +154,13 @@
             }    
         }
 		
+        /// <summary>See <see cref="XmlReader.BaseURI"/></summary>
         public override string BaseURI 
         {
             get { return _reader.BaseURI; }
         }
 		
+        /// <summary>See <see cref="XmlReader.HasValue"/></summary>
         public override bool HasValue 
         {
             get 
@@ -177,6 +178,7 @@
             }
         }               
 		
+        /// <summary>See <see cref="XmlReader.IsDefault"/></summary>
         public override bool IsDefault 
         {
             get 
@@ -195,6 +197,7 @@
             }
         }
 		
+        /// <summary>See <see cref="XmlReader.Name"/></summary>
         public override string Name 
         {
             get 
@@ -214,6 +217,7 @@
             }                
         }
 	
+        /// <summary>See <see cref="XmlReader.LocalName"/></summary>
         public override string LocalName 
         {
             get 
@@ -233,6 +237,7 @@
             }
         }
 		
+        /// <summary>See <see cref="XmlReader.NamespaceURI"/></summary>
         public override string NamespaceURI 
         {
             get 
@@ -251,11 +256,13 @@
             }
         }
 		
+        /// <summary>See <see cref="XmlReader.NameTable"/></summary>
         public override XmlNameTable NameTable
         {
             get{ return _nameTable; }
         }
 		
+        /// <summary>See <see cref="XmlReader.NodeType"/></summary>
         public override XmlNodeType NodeType 
         {
             get 
@@ -274,6 +281,7 @@
             }
         }
 		
+        /// <summary>See <see cref="XmlReader.Prefix"/></summary>
         public override string Prefix 
         {
             get 
@@ -292,6 +300,7 @@
             }   
         }
 		
+        /// <summary>See <see cref="XmlReader.QuoteChar"/></summary>
         public override char QuoteChar 
         {
             get 
@@ -307,6 +316,7 @@
             }               
         }
 		
+        /// <summary>See <see cref="XmlReader.Close"/></summary>
         public override void Close() 
         {
             _reader.Close();
@@ -318,21 +328,25 @@
             }
         }
 		
+        /// <summary>See <see cref="XmlReader.Depth"/></summary>
         public override int Depth 
         {
             get { return _reader.Depth; }
         }
 		
+        /// <summary>See <see cref="XmlReader.EOF"/></summary>
         public override bool EOF 
         {
             get { return _reader.EOF; }
         }
 		
+        /// <summary>See <see cref="XmlReader.GetAttribute"/></summary>
         public override string GetAttribute(int i) 
         {
             return _reader.GetAttribute(i);
         } 
 		
+        /// <summary>See <see cref="XmlReader.GetAttribute"/></summary>
         public override string GetAttribute(string name) 
         {
             if (_topLevel &&
@@ -345,6 +359,7 @@
                 return _reader.GetAttribute(name);
         }
                 
+        /// <summary>See <see cref="XmlReader.GetAttribute"/></summary>
         public override string GetAttribute(string name, string namespaceURI) 
         {        
             if (_topLevel && 
@@ -359,21 +374,25 @@
                 return _reader.GetAttribute(name, namespaceURI);
         }
 		
+        /// <summary>See <see cref="XmlReader.IsEmptyElement"/></summary>
         public override bool IsEmptyElement 
         {
             get { return _reader.IsEmptyElement; }
         }
 		
+        /// <summary>See <see cref="XmlReader.LookupNamespace"/></summary>
         public override String LookupNamespace(String prefix) 
         {
             return _reader.LookupNamespace(prefix);
         } 
-		
+
+		/// <summary>See <see cref="XmlReader.MoveToAttribute"/></summary>
         public override void MoveToAttribute(int i) 
         {
             _reader.MoveToAttribute(i);
         }
 		
+        /// <summary>See <see cref="XmlReader.MoveToAttribute"/></summary>
         public override bool MoveToAttribute(string name) 
         {
             if (_topLevel &&
@@ -392,6 +411,7 @@
                 return _reader.MoveToAttribute(name);
         }
         
+        /// <summary>See <see cref="XmlReader.MoveToAttribute"/></summary>
         public override bool MoveToAttribute(string name, string ns) 
         {
             if (_topLevel &&
@@ -412,11 +432,13 @@
                 return _reader.MoveToAttribute(name, ns);
         }
 		
+        /// <summary>See <see cref="XmlReader.MoveToElement"/></summary>
         public override bool MoveToElement() 
         {
             return _reader.MoveToElement();
         }
 		
+        /// <summary>See <see cref="XmlReader.MoveToFirstAttribute"/></summary>
         public override bool MoveToFirstAttribute() 
         {
             bool res = _reader.MoveToFirstAttribute();
@@ -426,9 +448,10 @@
                 return true;    
             } 
             else
-                return _reader.MoveToFirstAttribute();
+                return res;
         }
         
+        /// <summary>See <see cref="XmlReader.MoveToNextAttribute"/></summary>
         public override bool MoveToNextAttribute() 
         {
             bool res = _reader.MoveToNextAttribute();		    
@@ -467,6 +490,7 @@
                 return res;
         }
 		
+        /// <summary>See <see cref="XmlReader.ReadAttributeValue"/></summary>
         public override bool ReadAttributeValue() 
         {
             switch (_state) 
@@ -476,46 +500,59 @@
                     return true;
                 case XIncludingReaderState.ExposingXmlBaseAttrValue:                    
                     return false;
+                case XIncludingReaderState.ExposingXmlLangAttr:
+                    _state = XIncludingReaderState.ExposingXmlLangAttrValue;
+                    return true;
+                case XIncludingReaderState.ExposingXmlLangAttrValue:                    
+                    return false;
                 default:                    
                     return _reader.ReadAttributeValue();    
             }		    			    
         }    
 		            
+        /// <summary>See <see cref="XmlReader.ReadState"/></summary>
         public override ReadState ReadState 
         {
             get { return _reader.ReadState; }
         }
 		
+        /// <summary>See <see cref="XmlReader.Item"/></summary>
         public override String this [int i] 
         {
             get { return GetAttribute(i); }
         }              	                  
 		
+        /// <summary>See <see cref="XmlReader.Item"/></summary>
         public override string this [string name]
         {
             get { return GetAttribute(name); }
         }
 		
+        /// <summary>See <see cref="XmlReader.Item"/></summary>
         public override string this [string name, string namespaceURI] 
         {
             get { return GetAttribute(name, namespaceURI); }
         }
 
+        /// <summary>See <see cref="XmlReader.ResolveEntity"/></summary>
         public override void ResolveEntity() 
         {
             _reader.ResolveEntity();
         }
 		
+        /// <summary>See <see cref="XmlReader.XmlLang"/></summary>
         public override string XmlLang 
         {
             get { return _reader.XmlLang; }    
         }
 		
+        /// <summary>See <see cref="XmlReader.XmlSpace"/></summary>
         public override XmlSpace XmlSpace 
         {
             get { return _reader.XmlSpace; }                
         }
 		
+        /// <summary>See <see cref="XmlReader.Value"/></summary>
         public override string Value 
         {           
             get 
@@ -526,9 +563,8 @@
                     case XIncludingReaderState.ExposingXmlBaseAttrValue:                                                                     
                         if (_reader.BaseURI == String.Empty) 
                         {
-                            //Stupid reader
-                            Uri baseUri = (Uri)_baseURIs.Peek();							
-                            return baseUri.AbsoluteUri;
+                            //No Base URI? Use previous one's.                            
+                            return ((XmlReader)_readers.Peek()).BaseURI;
                         }
                         if (_relativeBaseUri) 
                         {
@@ -537,12 +573,16 @@
                         } 
                         else                        
                             return _reader.BaseURI;
+                    case XIncludingReaderState.ExposingXmlLangAttr:                        
+                    case XIncludingReaderState.ExposingXmlLangAttrValue:                                                                                             
+                            return _reader.XmlLang;
                     default:                                            
                         return _reader.Value;			    
                 }
             }            
         }
 		
+        /// <summary>See <see cref="XmlReader.ReadInnerXml"/></summary>
         public override string ReadInnerXml() 
         {
             switch (_state) 
@@ -551,11 +591,16 @@
                     return _reader.BaseURI;                   
                 case XIncludingReaderState.ExposingXmlBaseAttrValue:                    
                     return String.Empty;
+                case XIncludingReaderState.ExposingXmlLangAttr:     
+                    return _reader.XmlLang;                   
+                case XIncludingReaderState.ExposingXmlLangAttrValue:                    
+                    return String.Empty;
                 default:                                            
                     return _reader.ReadInnerXml();			    
             }            
         }
 
+        /// <summary>See <see cref="XmlReader.ReadOuterXml"/></summary>
         public override string ReadOuterXml() 
         {
             switch (_state) 
@@ -564,11 +609,16 @@
                     return @"xml:base="" + _reader.BaseURI + @"""; 
                 case XIncludingReaderState.ExposingXmlBaseAttrValue:                    
                     return String.Empty;
+                case XIncludingReaderState.ExposingXmlLangAttr:     
+                    return @"xml:lang="" + _reader.XmlLang + @"""; 
+                case XIncludingReaderState.ExposingXmlLangAttrValue:                    
+                    return String.Empty;
                 default:                                            
                     return _reader.ReadOuterXml(); 
             }
         }
     
+        /// <summary>See <see cref="XmlReader.ReadString"/></summary>
         public override string ReadString() 
         {
             switch (_state) 
@@ -577,11 +627,16 @@
                     return String.Empty; 
                 case XIncludingReaderState.ExposingXmlBaseAttrValue:                    
                     return _reader.BaseURI;
+                case XIncludingReaderState.ExposingXmlLangAttr:     
+                    return String.Empty; 
+                case XIncludingReaderState.ExposingXmlLangAttrValue:                    
+                    return _reader.XmlLang;
                 default:                                            
                     return _reader.ReadString();
             }
         }                   
 				
+        /// <summary>See <see cref="XmlReader.Read"/></summary>
         public override bool Read() 
         {
             //Read internal reader
@@ -684,9 +739,7 @@
                 if (_topLevel)
                     _topLevel = false;
                 if (_readers.Count > 0) 
-                {		        
-                    //Pop BaseURI
-                    _baseURIs.Pop();
+                {		                            
                     _reader.Close();
                     //Pop previous reader
                     _reader = (XmlReader)_readers.Pop();
@@ -743,13 +796,14 @@
         private void Init() 
         {
             _keywords = new XIncludeKeywords(NameTable);
-            _baseURIs = new Stack();
-            _topBaseUri = new Uri(_reader.BaseURI);
-            _baseURIs.Push(_topBaseUri);
+            _topBaseUri = new Uri(_reader.BaseURI);                        
             _readers = new Stack();	
             _state = XIncludingReaderState.Default;		
         }
 
+        /// <summary>
+        /// Checks if given reader is positioned on a xi:include element.
+        /// </summary>        
         private bool IsIncludeElement(XmlReader r) 
         {
             if (
@@ -763,6 +817,11 @@
                 return false;	
         }
 		
+        /// <summary>
+        /// /// Checks if given reader is positioned on a xi:fallback element.
+        /// </summary>
+        /// <param name="r"></param>
+        /// <returns></returns>
         private bool IsFallbackElement(XmlReader r) 
         {
             if (
@@ -776,6 +835,9 @@
                 return false;	
         }
 				
+        /// <summary>
+        /// Fetches resource by URI.
+        /// </summary>        
         internal static Stream GetResource(string href, Uri includeLocation,  
             string accept, string acceptLanguage, out WebResponse response) 
         {
@@ -866,9 +928,7 @@
                     WebResponse wRes;
                     Stream stream =  GetResource(href, includeLocation, 
                         _reader.GetAttribute(_keywords.Accept),						
-                        _reader.GetAttribute(_keywords.AcceptLanguage), out wRes);                                
-                    //Push new base URI to the stack
-                    _baseURIs.Push(includeLocation);
+                        _reader.GetAttribute(_keywords.AcceptLanguage), out wRes);                                                    
                     //Push current reader to the stack
                     _readers.Push(_reader);
                     if (xpointer != null)
@@ -908,9 +968,7 @@
                         //Unsupported type
                         throw new ResourceException(SR.GetString(
                             "CustomXmlResolverReturnedUnsupportedType", 
-                            resource.GetType().ToString()));										
-                    //Push new base URI to the stack
-                    _baseURIs.Push(includeLocation);
+                            resource.GetType().ToString()));										                    
                     //Push current reader to the stack
                     _readers.Push(_reader);						
                     if (xpointer != null)
@@ -926,8 +984,6 @@
                 //Include document as text                            
                 string encoding = GetAttribute(_keywords.Encoding);                
                 Uri includeLocation = ResolveHref(href);
-                //Push new base URI to the stack
-                _baseURIs.Push(includeLocation);
                 //Push current reader to the stack
                 _readers.Push(_reader);
                 _reader = new TextIncludingReader(includeLocation, encoding, 
@@ -951,7 +1007,7 @@
         }
 		
         /// <summary>
-        /// Resolves include locatation.
+        /// Resolves include location.
         /// </summary>
         /// <param name="href">href value</param>
         /// <returns>Include location.</returns>
@@ -973,19 +1029,14 @@
             {
                 throw new ResourceException(SR.GetString("UnresolvableURI", href), e);
             }			
-            //Check circular inclusion
-            if (_baseURIs.Contains(includeLocation)) 
-            {
-                IXmlLineInfo li = _reader as IXmlLineInfo;
-                if (li != null && li.HasLineInfo()) 
-                {								    
-                    throw new CircularInclusionException(includeLocation,
-                        BaseURI.ToString(), 
-                        li.LineNumber, li.LinePosition);
-                } 
-                else
-                    throw new CircularInclusionException(includeLocation);
-            }
+            //Check circular inclusion            
+            if (new Uri(_reader.BaseURI).Equals(includeLocation))
+                ThrowCircularInclusionError(_reader, includeLocation);
+            foreach (XmlReader r in _readers) 
+            {                
+                if (new Uri(r.BaseURI).Equals(includeLocation))                 
+                    ThrowCircularInclusionError(_reader, includeLocation);                
+            }            
             return includeLocation;
         }
 						                        
@@ -1138,6 +1189,31 @@
             }
         } // CheckAndSkipContent()
 		
+        /// <summary>
+        /// Throws CircularInclusionException.
+        /// </summary>        
+        private void ThrowCircularInclusionError(XmlReader reader, Uri url) 
+        {
+            IXmlLineInfo li = reader as IXmlLineInfo;
+            if (li != null && li.HasLineInfo()) 
+            {								    
+                throw new CircularInclusionException(url,
+                    BaseURI.ToString(), 
+                    li.LineNumber, li.LinePosition);
+            } 
+            else
+                throw new CircularInclusionException(url);
+        }
+
+        /// <summary>
+        /// Compares two languages as per IETF RFC 3066.
+        /// </summary>        
+        private bool AreTheSameLangs(string lang1, string lang2) 
+        {
+            //TODO: Wise comparison?
+            return lang1 == lang2;
+        }
+
         #endregion
     }
 }

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/text EBCDIC.xml,NONE,1.1 UTF32BE.xml,NONE,1.1 UTF32LE.xml,NONE,1.1 UTF8.xml,NONE,1.1 UnicodeBigUnmarked.xml,NONE,1.1 UnicodeLittleUnmarked.xml,NONE,1.1

From: Oleg T. <he...@us...> - 2004-10-19 16:25:41

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Harold/test/text

Added Files:
	EBCDIC.xml UTF32BE.xml UTF32LE.xml UTF8.xml 
	UnicodeBigUnmarked.xml UnicodeLittleUnmarked.xml 
Log Message:
XInclude Test Suite updated

--- NEW FILE: UnicodeLittleUnmarked.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: EBCDIC.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: UTF8.xml ---
<?xml version="1.0"?>
<p>data</p>
--- NEW FILE: UTF32BE.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: UTF32LE.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: UnicodeBigUnmarked.xml ---
(This appears to be a binary file; contents omitted.)

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/basedata red.xml,NONE,1.1

From: Oleg T. <he...@us...> - 2004-10-19 16:25:40

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/basedata
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Harold/test/basedata

Added Files:
	red.xml 
Log Message:
XInclude Test Suite updated

--- NEW FILE: red.xml ---
<?xml version="1.0"?>
<red>
  test data
</red>

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test .nautilus-metafile.xml,NONE,1.1 EBCDIC.xml,NONE,1.1 UCS4BE.xml,NONE,1.1 UCS4LE.xml,NONE,1.1 UTF16BigEndianWithByteOrderMark.xml,NONE,1.1 UTF16LittleEndianWithByteOrderMark.xml,NONE,1.1 UTF32BE.xml,NONE,1.1 UTF32LE.xml,NONE,1.1 UTF8WithByteOrderMark.xml,NONE,1.1 UnicodeBigUnmarked.xml,NONE,1.1 UnicodeLittleUnmarked.xml,NONE,1.1 acceptenglish.xml,NONE,1.1 acceptfrench.xml,NONE,1.1 accepthtml.xml,NONE,1.1 acceptplaintext.xml,NONE,1.1 badaccept1.xml,NONE,1.1 badaccept2.xml,NONE,1.1 badelementschemedata.xml,NONE,1.1 badiri.xml,NONE,1.1 badiri2.xml,NONE,1.1 badparseattribute.xml,NONE,1.1 badxptr.xml,NONE,1.1 badxptr2.xml,NONE,1.1 badxptr3.xml,NONE,1.1 badxptr4.xml,NONE,1.1 baseinclude.xml,NONE,1.1 bdisclaimer.xml,NONE,1.1 c1.xml,NONE,1.1 c2.xml,NONE,1.1 c3.xml,NONE,1.1 c5.xml,NONE,1.1 circle1.xml,NONE,1.1 circle2a.xml,NONE,1.1 circle2b.xml,NONE,1.1 circleback.xml,NONE,1.1 circlepointer1.xml,NONE,1.1 circlepointer2.xml,NONE,1.1 circlepointer3.xml,NONE,1.1 colonizedschemename.xml,NONE,1.1 count.txt,NONE,1.1 d1.xml,NONE,1.1 data.xml,NONE,1.1 disclaimer.xml,NONE,1.1 docwithid.xml,NONE,1.1 docwithidandtumbler.xml,NONE,1.1 emptyfallback.xml,NONE,1.1 encodingheuristicstest.xml,NONE,1.1 extraattributes.xml,NONE,1.1 fallbackbadparseattribute.xml,NONE,1.1 fallbackbadxpointer.xml,NONE,1.1 fallbackcontainsfallback.xml,NONE,1.1 fallbackinternalxpointer.xml,NONE,1.1 fallbacknohreforparse.xml,NONE,1.1 fallbacktest.xml,NONE,1.1 fallbacktest2.xml,NONE,1.1 fallbacktest3.xml,NONE,1.1 fallbacktotext.xml,NONE,1.1 fallbackxpointerpointsnowhere.xml,NONE,1.1 french.xml,NONE,1.1 french2.xml,NONE,1.1 goodiri.xml,NONE,1.1 ignoresfragmentid.xml,NONE,1.1 includedocumentwithintradocumentreferences.xml,NONE,1.1 includefromsamedocumentwithbase.xml,NONE,1.1 internalcircular.xml,NONE,1.1 internalcircularviaancestor.xml,NONE,1.1 langtest1.xml,NONE,1.1 langtest2.xml,NONE,1.1 langtest3.xml,NONE,1.1 laterfailure.xml,NONE,1.1 laterfailure2.xml,NONE,1.1 latin1.xml,NONE,1.1 legalcircle.xml,NONE,1.1 lineends.txt,NONE,1.1 lineends.xml,NONE,1.1 marshtest.xml,NONE,1.1 marshtestwithxmlbase.xml,NONE,1.1 marshtestwithxmlbaseandemptyhref.xml,NONE,1.1 meaninglessfragmentid.xml,NONE,1.1 metafallbacktest.xml,NONE,1.1 metafallbacktest2.xml,NONE,1.1 metafallbacktest3.xml,NONE,1.1 metafallbacktest4.xml,NONE,1.1 metafallbacktest5.xml,NONE,1.1 metafallbacktest6.xml,NONE,1.1 metafallbacktestwithfragmentid.xml,NONE,1.1 metafallbacktestwithxpointer.xml,NONE,1.1 metafallbacktestwithxpointer2.xml,NONE,1.1 metafallbacktotexttest.xml,NONE,1.1 metafallbackwithbadxpointertest.xml,NONE,1.1 metamissingfallbacktestwithxpointer.xml,NONE,1.1 missingfile.xml,NONE,1.1 missinghref.xml,NONE,1.1 multiplefallbacks.xml,NONE,1.1 multiplefallbacks2.xml,NONE,1.1 nakedfallback.xml,NONE,1.1 namespaceinner.xml,NONE,1.1 namespacetest.xml,NONE,1.1 nestedxinclude.xml,NONE,1.1 nestedxincludenamespace.xml,NONE,1.1 nofallbacktest.xml,NONE,1.1 nolang.xml,NONE,1.1 onedown.xml,NONE,1.1 onlyxpointer.xml,NONE,1.1 paralleltest.xml,NONE,1.1 parseequalxml.xml,NONE,1.1 recursewithinsamedocument.xml,NONE,1.1 red.dtd,NONE,1.1 resolvethruxpointer.xml,NONE,1.1 rootfailuretest.xml,NONE,1.1 roottest.xml,NONE,1.1 roottest2.xml,NONE,1.1 simple.xml,NONE,1.1 simple2.xml,NONE,1.1 test.xml,NONE,1.1 test0.xml,NONE,1.1 test2.xml,NONE,1.1 test3.xml,NONE,1.1 tobinbottom.xml,NONE,1.1 tobinmiddle.xml,NONE,1.1 tobintop.xml,NONE,1.1 toplevel.xml,NONE,1.1 ucs4bigendian.xml,NONE,1.1 ucs4littleendian.xml,NONE,1.1 unrecognizedscheme.xml,NONE,1.1 unrecognizedschemewithfallback.xml,NONE,1.1 utf16.txt,NONE,1.1 utf16.xml,NONE,1.1 utf16be.txt,NONE,1.1 utf16be.xml,NONE,1.1 utf16le.xml,NONE,1.1 utf8.xml,NONE,1.1 utf8bom.xml,NONE,1.1 xmlbasetest.xml,NONE,1.1 xmlbasetest2.xml,NONE,1.1 xmlbasetest3.xml,NONE,1.1 xpointeroverridesfragmentid.xml,NONE,1.1 xpointerselectsnonelements.xml,NONE,1.1 xptr2tumblertest.xml,NONE,1.1 xptrdoubletumblertest.xml,NONE,1.1 xptrfallback.xml,NONE,1.1 xptridandtumblertest.xml,NONE,1.1 xptridtest.xml,NONE,1.1 xptridtest2.xml,NONE,1.1 xptrsyntaxerrorbutfallback.xml,NONE,1.1 xptrtumblerfailsbutfallback.xml,NONE,1.1 xptrtumblertest.xml,NONE,1.1 xptrtumblertest2.xml,NONE,1.1 xptrtumblertest3.xml,NONE,1.1

From: Oleg T. <he...@us...> - 2004-10-19 16:25:39

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Harold/test

Added Files:
	.nautilus-metafile.xml EBCDIC.xml UCS4BE.xml UCS4LE.xml 
	UTF16BigEndianWithByteOrderMark.xml 
	UTF16LittleEndianWithByteOrderMark.xml UTF32BE.xml UTF32LE.xml 
	UTF8WithByteOrderMark.xml UnicodeBigUnmarked.xml 
	UnicodeLittleUnmarked.xml acceptenglish.xml acceptfrench.xml 
	accepthtml.xml acceptplaintext.xml badaccept1.xml 
	badaccept2.xml badelementschemedata.xml badiri.xml badiri2.xml 
	badparseattribute.xml badxptr.xml badxptr2.xml badxptr3.xml 
	badxptr4.xml baseinclude.xml bdisclaimer.xml c1.xml c2.xml 
	c3.xml c5.xml circle1.xml circle2a.xml circle2b.xml 
	circleback.xml circlepointer1.xml circlepointer2.xml 
	circlepointer3.xml colonizedschemename.xml count.txt d1.xml 
	data.xml disclaimer.xml docwithid.xml docwithidandtumbler.xml 
	emptyfallback.xml encodingheuristicstest.xml 
	extraattributes.xml fallbackbadparseattribute.xml 
	fallbackbadxpointer.xml fallbackcontainsfallback.xml 
	fallbackinternalxpointer.xml fallbacknohreforparse.xml 
	fallbacktest.xml fallbacktest2.xml fallbacktest3.xml 
	fallbacktotext.xml fallbackxpointerpointsnowhere.xml 
	french.xml french2.xml goodiri.xml ignoresfragmentid.xml 
	includedocumentwithintradocumentreferences.xml 
	includefromsamedocumentwithbase.xml internalcircular.xml 
	internalcircularviaancestor.xml langtest1.xml langtest2.xml 
	langtest3.xml laterfailure.xml laterfailure2.xml latin1.xml 
	legalcircle.xml lineends.txt lineends.xml marshtest.xml 
	marshtestwithxmlbase.xml marshtestwithxmlbaseandemptyhref.xml 
	meaninglessfragmentid.xml metafallbacktest.xml 
	metafallbacktest2.xml metafallbacktest3.xml 
	metafallbacktest4.xml metafallbacktest5.xml 
	metafallbacktest6.xml metafallbacktestwithfragmentid.xml 
	metafallbacktestwithxpointer.xml 
	metafallbacktestwithxpointer2.xml metafallbacktotexttest.xml 
	metafallbackwithbadxpointertest.xml 
	metamissingfallbacktestwithxpointer.xml missingfile.xml 
	missinghref.xml multiplefallbacks.xml multiplefallbacks2.xml 
	nakedfallback.xml namespaceinner.xml namespacetest.xml 
	nestedxinclude.xml nestedxincludenamespace.xml 
	nofallbacktest.xml nolang.xml onedown.xml onlyxpointer.xml 
	paralleltest.xml parseequalxml.xml 
	recursewithinsamedocument.xml red.dtd resolvethruxpointer.xml 
	rootfailuretest.xml roottest.xml roottest2.xml simple.xml 
	simple2.xml test.xml test0.xml test2.xml test3.xml 
	tobinbottom.xml tobinmiddle.xml tobintop.xml toplevel.xml 
	ucs4bigendian.xml ucs4littleendian.xml unrecognizedscheme.xml 
	unrecognizedschemewithfallback.xml utf16.txt utf16.xml 
	utf16be.txt utf16be.xml utf16le.xml utf8.xml utf8bom.xml 
	xmlbasetest.xml xmlbasetest2.xml xmlbasetest3.xml 
	xpointeroverridesfragmentid.xml xpointerselectsnonelements.xml 
	xptr2tumblertest.xml xptrdoubletumblertest.xml 
	xptrfallback.xml xptridandtumblertest.xml xptridtest.xml 
	xptridtest2.xml xptrsyntaxerrorbutfallback.xml 
	xptrtumblerfailsbutfallback.xml xptrtumblertest.xml 
	xptrtumblertest2.xml xptrtumblertest3.xml 
Log Message:
XInclude Test Suite updated

--- NEW FILE: test0.xml ---
<?xml version="1.0"?>
<test xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <xinclude:include href="test2.xml"/>
</test>
--- NEW FILE: nestedxincludenamespace.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml">
     It is illegal for one xi:include element to
     contain anything from the XInclude namespace 
     except a single fallback element.
    <xi:nonesuch href="`c2.xml"/>  
  </xi:include>
</document>



--- NEW FILE: encodingheuristicstest.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p><xi:include parse="text" href="encoding/ascii.txt"/></p>
</document>



--- NEW FILE: metafallbacktotexttest.xml ---
<root>
  <xi:include href="fallbacktest3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: laterfailure.xml ---
<?xml version='1.0'?>
<root>
   This tests whether a syntax error in the <strong>second</strong>
   XPointer part will throw the exception as required.
   Nothing should be included. Instead, there should be failure.
  <xi:include href="docwithid.xml" xpointer="element(/1/1)element(^^^)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: test3.xml ---
<root>
  <element1/>
  <element2/>
</root>
--- NEW FILE: d1.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="bdisclaimer.xml"/>
</document>



--- NEW FILE: utf16be.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: xptrfallback.xml ---
<?xml version='1.0'?>
<root>
   There should be a resource error resolving this due to
   the illegal XPointer syntax which causes the fallback to 
   be used:
  <xi:include href="docwithid.xml" xpointer="xlimit(1/1)" xmlns:xi="http://www.w3.org/2001/XInclude">
    <xi:fallback>Fallback worked!</xi:fallback>
  </xi:include>
</root>

--- NEW FILE: circle2a.xml ---
<?xml version='1.0'?>
<circle>
  This file is just for making sure my XIncluder can detect 
  circular references.
  <xi:include href="circle2b.xml" parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</circle>

--- NEW FILE: colonizedschemename.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include href="docwithid.xml" xpointer="test:xpath(somedata)element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: namespaceinner.xml ---
<inner>
  <test2 xmlns:svg="http://www.w3.org/2000/svg">
    <svg:svg>
      The above tag should have a mapped prefix
    </svg:svg>
  </test2>
  <test3 xmlns:xlink="http://www.w3.org/2000/xlink" xlink:type="simple">
     Make sure the XLinks come across
  </test3>
</inner>

--- NEW FILE: toplevel.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include href="onedown.xml"/>
</document>



--- NEW FILE: badaccept2.xml ---
<document xmlns:xi='http://www.w3.org/2001/XInclude'>
<p>120 MHz is adequate for an average home user.</p>
<xi:include href='http://www.example.com'  accept='text/html&#xA0;Something: bad'/>
</document>
--- NEW FILE: multiplefallbacks2.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml">
     Multiple fallbacks are illegal even when the resource
     exists and the fallbacks aren't processed.
    <xi:fallback>First fallback</xi:fallback>
    <xi:fallback>Second fallback</xi:fallback>  
  </xi:include>
</document>



--- NEW FILE: badxptr3.xml ---
<?xml version='1.0'?>
<root>
   There should be a syntax error resolving this due to
  the illegal XPointer syntax
  <xi:include href="docwithid.xml" xpointer="element(p:l/2/3)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: metafallbacktestwithfragmentid.xml ---
<root>
  <xi:include href="fallbacktest.xml#element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: langtest2.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="french2.xml" xpointer="element(/1/1)"/>
</document>



--- NEW FILE: legalcircle.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>This will be duplicated if we're successful</p>
  <xi:include href="circleback.xml"/>
</document>



--- NEW FILE: badparseattribute.xml ---
<?xml version='1.0'?>
<test>
  This file is just for making sure my XIncluder can detect 
  bad values for parse attributes.
  <xi:include parse="nonesuch" href="simple.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</test>

--- NEW FILE: .nautilus-metafile.xml ---
<?xml version="1.0"?>
<directory>
  <file name="b" window_geometry="800x550+40+96"/>
</directory>

--- NEW FILE: c3.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>The following is the source of the "data.xml" resource:</p>
  <example><xi:include href="data.xml" parse="text"/></example>
</document>

--- NEW FILE: EBCDIC.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include parse="text" href="text/EBCDIC.xml"/>
</document>



--- NEW FILE: utf8.xml ---
trjsagdkasgdhasdgashgdhsadgashdg

--- NEW FILE: multiplefallbacks.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="no_such_file.xml">
    <xi:fallback>First fallback</xi:fallback>
    <xi:fallback>Second fallback</xi:fallback>
  </xi:include>
</document>



--- NEW FILE: count.txt ---
324387
--- NEW FILE: utf8bom.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: metafallbacktest.xml ---
<root>
  <xi:include href="fallbacktest.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: xmlbasetest3.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
   Test that xml:base attribute in unincluded element
   still applies in merged document
  <xi:include href="baseinclude.xml" xpointer="element(/1/1)"/>
</root>
--- NEW FILE: extraattributes.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml" name="value" something="something"/>
</document>



--- NEW FILE: UTF16BigEndianWithByteOrderMark.xml ---
<?xml version='1.0'?>
<root><xi:include href="utf16be.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/></root>

--- NEW FILE: resolvethruxpointer.xml ---
<?xml version="1.0"?>
<root>
  <xi:include href="c1.xml" xpointer="element(/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</root>
--- NEW FILE: metafallbacktest3.xml ---
<root>
  <xi:include href="fallbackbadparseattribute.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: simple.xml ---
<simple>
<test xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <latin1>
    <firstElement/>
    <xinclude:include href="utf8.xml" parse="text"/>
    <insideChildren/>
    <another>
      <deeper>text</deeper>
    </another>
  </latin1>
  <test2>
    <xinclude:include href="test2.xml"/>
  </test2>
  <test3>
   <!-- <xinclude:include href="roottest.xml"/> -->
  </test3>
</test>
</simple>

--- NEW FILE: UTF8WithByteOrderMark.xml ---
<?xml version='1.0'?>
<root><xi:include href="utf8bom.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/></root>

--- NEW FILE: roottest2.xml ---
<?xml version="1.0"?>
<xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude"
  href="simple2.xml"/>


--- NEW FILE: circlepointer2.xml ---
<?xml version="1.0"?>
<root>
  <xi:include href="circlepointer3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</root>
--- NEW FILE: includedocumentwithintradocumentreferences.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include href="marshtest.xml"/>
</document>
--- NEW FILE: UCS4BE.xml ---
<?xml version='1.0'?>
<root><xi:include href="ucs4bigendian.xml" parse="text" xmlns:xi="http://www.w3.org/2003/XInclude"/></root>

--- NEW FILE: simple2.xml ---
<!-- comment before root 1 -->
<simple>
<test xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <latin1>
    <firstElement/>
    <xinclude:include href="utf8.xml" parse="text"/>
    <insideChildren/>
    <another>
      <deeper>text</deeper>
    </another>
  </latin1>
  <test2>
    <xinclude:include href="test2.xml"/>
  </test2>
  <test3>
   <!-- <xinclude:include href="roottest.xml"/> -->
  </test3>
</test>
</simple>

<!-- comment after root 1 -->
--- NEW FILE: tobinbottom.xml ---
<bottom>
  <bottom1/>
  <bottom2/>
  <bottom3/>
</bottom>
--- NEW FILE: tobintop.xml ---
<test xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <xinclude:include href="tobinmiddle.xml" xpointer="element(/1/1/2)"/>
</test>
--- NEW FILE: fallbacktotext.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="simple.xml" parse="text"/></xi:fallback></xi:include>
</test>

--- NEW FILE: ucs4bigendian.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ucs4littleendian.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: fallbacktest3.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>some data<!--comment-->more data</xi:fallback></xi:include>
</test>

--- NEW FILE: test.xml ---
<?xml version="1.0"?>
<!-- comment before root -->
<!DOCTYPE test [
  <!ELEMENT test (latin1, test2)>
]>
<test xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <latin1>
    <firstElement/>
    <xinclude:include href="utf8.xml" parse="text"/>  
    <insideChildren/>
    <another>
      <deeper>text</deeper>
    </another>
  </latin1>
  <test2>
    <xinclude:include href="test2.xml"/> 
  </test2>
</test>
<!-- comment after root -->


--- NEW FILE: xmlbasetest2.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
   Test that xml:base attribute is used to resolve href attributes
  <xi:include href="red.xml" xml:base="basedata/"/>
</root>
--- NEW FILE: rootfailuretest.xml ---
<?xml version="1.0"?>
<!-- comment before root 1 -->
<xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude"
  href="simple.xml"/>
<!-- comment after root 1 -->


--- NEW FILE: badxptr2.xml ---
<?xml version='1.0'?>
<root>
   There should be a resource error resolving this due to
  the illegal XPointer syntax. Specifically, the space in 
  initial ID.
  <xi:include href="docwithid.xml#element(rose red/1/1)" xpointer="element(rose red/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: french.xml ---
<test xml:lang='fr'>Zut Alors!</test>
--- NEW FILE: fallbacktest2.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="simple.xml"/></xi:fallback></xi:include>
</test>

--- NEW FILE: accepthtml.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="http://www.cafeconleche.org/tests/content" parse="text" accept="text/html"/></root>
--- NEW FILE: laterfailure2.xml ---
<?xml version='1.0'?>
<root>
   This tests whether a syntax error in the <strong>second</strong>
   XPointer part will throw the exception as required.
   Specifically, I'm looking to see if a missing last parenthesis
   causes the necessary exception.
   Nothing should be included. Instead, there should be failure.
  <xi:include href="docwithid.xml" xpointer="element(/1/1)element(/1/2" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: fallbacktest.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><test>some data</test></xi:fallback></xi:include>
</test>

--- NEW FILE: recursewithinsamedocument.xml ---
<?xml version='1.0'?>
<root>
   Test that a document can include pieces of itself while 
   recursively following xincludes
  <xi:include xpointer="element(/1/3)" xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
  <data>
     This will be copied
  </data>
</root>

--- NEW FILE: utf16le.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: circlepointer3.xml ---
<?xml version="1.0"?>
<root>
  <xi:include href="circlepointer1.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</root>
--- NEW FILE: xptrtumblertest2.xml ---
<?xml version='1.0'?>
<root>
   You should see no other elements 
   besides the root because the ID does 
   not exist in the document being pointed to.
  <xi:include href="docwithid.xml" xpointer="element(/1/3)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: UnicodeBigUnmarked.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include parse="text" href="text/UnicodeBigUnmarked.xml"/>
</document>



--- NEW FILE: unrecognizedschemewithfallback.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml" xpointer="unknown(somedata)">
    <xi:fallback>Oops!</xi:fallback>
  </xi:include>
</document>



--- NEW FILE: unrecognizedscheme.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml" xpointer="unknown(somedata)"/>
</document>



--- NEW FILE: disclaimer.xml ---
<?xml version='1.0'?>
<disclaimer>
  <p>The opinions represented herein represent those of the individual
  and should not be interpreted as official policy endorsed by this
  organization.</p>
</disclaimer>



--- NEW FILE: ignoresfragmentid.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
   Test that xpointer is used and fragment ID isn't
  <xi:include href="test3.xml#element(/1/1)"/>
</root>
--- NEW FILE: marshtestwithxmlbase.xml ---
<!DOCTYPE root [
  <!ATTLIST x id ID #IMPLIED>
]>
<root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="http://www.example.org/">
<xi:include xpointer="foo"/>
<x id="foo">
  <xi:include xpointer="bar"/>
</x>
<x id="bar"/>
</root>
--- NEW FILE: badxptr4.xml ---
<?xml version='1.0'?>
<root>
   There should be a syntax error resolving this due to
  the illegal XPointer syntax
  <xi:include href="docwithid.xml" xpointer="element(p^l/2/3)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: metamissingfallbacktestwithxpointer.xml ---
<root>
  <xi:include href="nofallbacktest.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: c1.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml"/>
</document>



--- NEW FILE: emptyfallback.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback /></xi:include>
</test>

--- NEW FILE: badiri.xml ---
<document xmlns:xi='http://www.w3.org/2001/XInclude'>
<xi:include href='http://www.example.com/a%5.html'>
<xi:fallback>Ooops!</xi:fallback></xi:include></document>
--- NEW FILE: badelementschemedata.xml ---
<?xml version='1.0'?>
<root>
   This tests whether syntactically incorrect element scheme data
   simply fails to identify a subresource.
  <xi:include href="docwithid.xml" xpointer="element(***)" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>success!</xi:fallback> </xi:include>
</root>

--- NEW FILE: xptridtest.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include href="docwithid.xml" xpointer="p1" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: metafallbacktest6.xml ---
<root>
  <xi:include href="fallbackinternalxpointer.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: xpointerselectsnonelements.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml"/>
</document>



--- NEW FILE: badxptr.xml ---
<?xml version='1.0'?>
<root>
   There should be a resource error resolving this due to
  the illegal XPointer syntax
  <xi:include href="docwithid.xml" xpointer="/1/1" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: fallbackinternalxpointer.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="" xpointer="element(/1/2)"/></xi:fallback></xi:include>
  <data>test</data>
</test>

--- NEW FILE: red.dtd ---
<!--
     Comment in DTD
     
-->

--- NEW FILE: parseequalxml.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml" parse="xml"/>
</document>



--- NEW FILE: marshtestwithxmlbaseandemptyhref.xml ---
<!DOCTYPE root [
  <!ATTLIST x id ID #IMPLIED>
]>
<root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="http://www.example.org/">
<xi:include href="" xpointer="foo"/>
<x id="foo">
  <xi:include href="" xpointer="bar"/>
</x>
<x id="bar"/>
</root>
--- NEW FILE: fallbackbadxpointer.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="disclaimer.xml" xpointer="badscheme(/1/1)"/></xi:fallback></xi:include>
</test>

--- NEW FILE: onlyxpointer.xml ---
<?xml version='1.0'?>
<root>
   Test that a document can include a piece of itself using an xpointer attribute.
  <xi:include xpointer="element(/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude" />
  <data>
     This will be copied
  </data>
</root>

--- NEW FILE: internalcircularviaancestor.xml ---
<?xml version='1.0'?>
<test>
  This file is just for making sure my XIncluder can detect 
  circular local links.
  <xi:include xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</test>

--- NEW FILE: circle1.xml ---
<?xml version='1.0'?>
<circle>
  <xi:include href="circle1.xml" parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</circle>

--- NEW FILE: missingfile.xml ---
<?xml version='1.0'?>
<test>
  This file is just for making sure my XIncluder can detect 
  missing links.
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</test>

--- NEW FILE: xmlbasetest.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="basedata/">
   Test that xml:base attribute is used to resolve href attributes
  <xi:include href="red.xml" />
</root>
--- NEW FILE: metafallbacktest5.xml ---
<root>
  <xi:include href="fallbackxpointerpointsnowhere.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: xptr2tumblertest.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include xpointer="element(/1/12/3)element(/1/2)element(/1/1)" href="docwithid.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: acceptenglish.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="http://www.cafeconleche.org/tests/data.txt" parse="text" accept-language="en"/></root>
--- NEW FILE: circleback.xml ---
<?xml version='1.0'?>
<document>
  <xi:include href="legalcircle.xml" xpointer="element(/1/1)"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
</document>



--- NEW FILE: internalcircular.xml ---
<?xml version='1.0'?>
<test>
  This file is just for making sure my XIncluder can detect 
  circular local links.
  <xi:include xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</test>

--- NEW FILE: fallbackcontainsfallback.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude">
    <xi:fallback>
      <test>some data</test>
      <xi:fallback>
        <test>some data</test>
     </xi:fallback>
   </xi:fallback>
 </xi:include>
</test>

--- NEW FILE: metafallbacktest4.xml ---
<root>
  <xi:include href="fallbacknohreforparse.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: fallbacknohreforparse.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include/></xi:fallback></xi:include>
</test>

--- NEW FILE: data.xml ---
<?xml version='1.0'?>
<data>
  <item><![CDATA[Brooks & Shields]]></item>
</data>
--- NEW FILE: lineends.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="lineends.txt" parse="text"/></root>
--- NEW FILE: nakedfallback.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:fallback>It is illegal to have a fallback that is not a child of an include element.</xi:fallback>
</document>



--- NEW FILE: acceptplaintext.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="http://www.cafeconleche.org/tests/content" parse="text" accept="text/plain"/></root>
--- NEW FILE: xptrtumblertest3.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include href="docwithid.xml" xpointer="element(/1/12/3)
              element(/1/2)   element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: docwithidandtumbler.xml ---
<!DOCTYPE test [
  <!ATTLIST p id ID #REQUIRED>
]>
<test>
  <p id="p1">
     <t>
       <p/>
       <q>If you only see the q element the test worked</q>
       <r>bad!</r>
     </t>
     <r/> <u>If you see me, the test failed</u>
   </p>
</test>


--- NEW FILE: nolang.xml ---
<document>
  <test>Zut Alors!</test>
</document>
--- NEW FILE: acceptfrench.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="http://www.cafeconleche.org/tests/data.txt" parse="text" accept-language="fr"/></root>
--- NEW FILE: missinghref.xml ---
<?xml version='1.0'?>
<test>
  This file is just for making sure my XIncluder can detect 
  missing href attributes.
  <xi:include parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</test>

--- NEW FILE: xptrdoubletumblertest.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include href="docwithid.xml" xpointer="element(book/1)element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: paralleltest.xml ---
<root xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="a/a.xml"/>
<xi:include href="b/b.xml"/>
</root>
--- NEW FILE: roottest.xml ---
<?xml version="1.0"?>
<!-- comment before root 1 -->
<xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude"
  href="simple.xml"/>
<!-- comment after root 1 -->


--- NEW FILE: french2.xml ---
<document xml:lang='fr'>
  <test>Zut Alors!</test>
</document>
--- NEW FILE: badaccept1.xml ---
<document xmlns:xi='http://www.w3.org/2001/XInclude'>
<p>120 MHz is adequate for an average home user.</p>
<xi:include href='http://www.example.com' accept='text/html&#x0D;&#x0A;Something: bad'/>
</document>
--- NEW FILE: baseinclude.xml ---
<root xml:base="http://www.example.com/">
  <child />
</root>
--- NEW FILE: test2.xml ---
<?xml version="1.0"?>
<!-- comment before root -->
<!DOCTYPE red SYSTEM "red.dtd">
<red xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <blue>
    <xinclude:include href="utf8.xml" parse="text"/>
  </blue>
</red>
<!-- comment after root -->


--- NEW FILE: tobinmiddle.xml ---
<test xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <xinclude:include href="tobinbottom.xml"/>
</test>
--- NEW FILE: xptridandtumblertest.xml ---
<?xml version='1.0'?>
<root>
   You should see a q element:
  <xi:include href="docwithidandtumbler.xml" xpointer="element(p1/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: xptrtumblertest.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include href="docwithid.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: xptrtumblerfailsbutfallback.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include href="docwithid.xml" xpointer="element(/1/12/3)" xmlns:xi="http://www.w3.org/2001/XInclude">
    <xi:fallback><p id="p1" xml:base="docwithid.xml">Test worked</p></xi:fallback>
  </xi:include>
</root>

--- NEW FILE: nofallbacktest.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</test>

--- NEW FILE: metafallbacktest2.xml ---
<root>
  <xi:include href="fallbacktotext.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: c2.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>This document has been accessed
  <xi:include href="count.txt" parse="text"/> times.</p>
</document>



--- NEW FILE: fallbackxpointerpointsnowhere.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="disclaimer.xml" xpointer="element(/1/17/82)" 
  xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>fallback text</xi:fallback></xi:include>
</test>

--- NEW FILE: xptridtest2.xml ---
<?xml version='1.0'?>
<root>
   You should see no other elements 
   besides the root because the ID does 
   not exist in the document being pointed to.
  <xi:include href="docwithid.xml" xpointer="nonesuch" xmlns:xi="http://www.w3.org/2001/XInclude" />
</root>

--- NEW FILE: docwithid.xml ---
<!DOCTYPE test [
  <!ATTLIST p id ID #REQUIRED>
]>
<test>
  <p id="p1">Test worked</p>
  No, it didn't the Test failed!
</test>


--- NEW FILE: UTF32LE.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include parse="text" href="text/UTF32LE.xml"/>
</document>



--- NEW FILE: UTF32BE.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include parse="text" href="text/UTF32BE.xml"/>
</document>



--- NEW FILE: fallbackbadparseattribute.xml ---
<?xml version='1.0'?>
<test>
  <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="simple.xml" parse="no"/></xi:fallback></xi:include>
</test>

--- NEW FILE: utf16.txt ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: circlepointer1.xml ---
<?xml version="1.0"?>
<root>
  <xi:include href="circlepointer2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</root>
--- NEW FILE: UnicodeLittleUnmarked.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include parse="text" href="text/UnicodeLittleUnmarked.xml"/>
</document>



--- NEW FILE: circle2b.xml ---
<?xml version='1.0'?>
<circle>
  <xi:include href="circle2a.xml" parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</circle>

--- NEW FILE: onedown.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <xi:include/>
</document>
--- NEW FILE: langtest3.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="nolang.xml" xpointer="element(/1/1)"/>
</document>



--- NEW FILE: latin1.xml ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: utf16be.txt ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: lineends.txt ---
linefeed
CRLF
carriage return
--- NEW FILE: goodiri.xml ---
<document xmlns:xi='http://www.w3.org/2001/XInclude'><xi:include href='scheme://www.example.com/a.html'><xi:fallback>Correct!</xi:fallback></xi:include></document>
--- NEW FILE: UCS4LE.xml ---
<?xml version='1.0'?>
<root><xi:include href="ucs4littleendian.xml" parse="text" xmlns:xi="http://www.w3.org/2003/XInclude"/></root>

--- NEW FILE: xpointeroverridesfragmentid.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
   Test that xpointer is used and fragment ID isn't
  <xi:include href="test3.xml#element(/1/1)" xpointer="element(/1/2)"/>
</root>
--- NEW FILE: includefromsamedocumentwithbase.xml ---
<?xml version='1.0'?>
<test>
  Make sure base URIs are preserved when including from the same document.
  <xi:include xpointer="element(/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
  <data xml:base="http://www.example.org/">This should be duplicated</data>
</test>

--- NEW FILE: namespacetest.xml ---
<simple>
  <test2 xmlns:svg="http://www.w3.org/2000/svg">
    <svg:svg>
      The above tag should have a mapped prefix
    </svg:svg>
  </test2>
  <test3 xmlns:xlink="http://www.w3.org/2000/xlink" xlink:type="simple">
     Make sure the XLinks come across
  </test3>
<test xmlns:xinclude="http://www.w3.org/2001/XInclude">
  <latin1>
    <firstElement/>
    <xinclude:include href="utf8.xml" parse="text"/>
    <insideChildren/>
    <another>
      <deeper>text</deeper>
    </another>
  </latin1>
  <xinclude:include href="namespaceinner.xml"/>
</test>
</simple>

--- NEW FILE: nestedxinclude.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="disclaimer.xml">
     It is illegal for one xi:include element to
     contain another, even when the resource is avaialable.
    <xi:include href="c2.xml"/>  
  </xi:include>
</document>



--- NEW FILE: c5.xml ---
<?xml version='1.0'?>
<div>
  <xi:include href="example.txt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude">
    <xi:fallback>
      <xi:include href="fallback-example.txt" parse="text">
        <xi:fallback><a href="mailto:bo...@ex...">Report error</a></xi:fallback>
      </xi:include>
    </xi:fallback>
  </xi:include>
</div>

--- NEW FILE: langtest1.xml ---
<?xml version='1.0'?>
<document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
  <p>120 Mz is adequate for an average home user.</p>
  <xi:include href="french.xml"/>
</document>



--- NEW FILE: utf16.xml ---
<?xml version='1.0'?>
<test>
  <xi:include parse="text" encoding="UTF-16" href="utf16.txt" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</test>

--- NEW FILE: metafallbacktestwithxpointer.xml ---
<root>
  <xi:include href="fallbacktest.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: metafallbacktestwithxpointer2.xml ---
<root>
  <xi:include href="fallbacktest3.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: UTF16LittleEndianWithByteOrderMark.xml ---
<?xml version='1.0'?>
<root><xi:include href="utf16le.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/></root>

--- NEW FILE: xptrsyntaxerrorbutfallback.xml ---
<?xml version='1.0'?>
<root>
   You should see a p element:
  <xi:include href="docwithid.xml" xpointer="element(///)" xmlns:xi="http://www.w3.org/2001/XInclude">
    <xi:fallback><p id="p1" xml:base="docwithid.xml">Test worked</p></xi:fallback>
  </xi:include>
</root>

--- NEW FILE: meaninglessfragmentid.xml ---
<?xml version="1.0"?>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
   Test that xpointer is used and fragment ID isn't
  <xi:include href="test3.xml#nonesuch(/1/name*)"/>
</root>
--- NEW FILE: badiri2.xml ---
<doc xmlns:xi='http://www.w3.org/2001/XInclude'>
<xi:include href='scheme://www.example.com/a%5.html'>
<xi:fallback>Ooops!</xi:fallback></xi:include></doc>
--- NEW FILE: metafallbackwithbadxpointertest.xml ---
<root>
  <xi:include href="fallbackbadxpointer.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
</root>
--- NEW FILE: marshtest.xml ---
<!DOCTYPE root [
  <!ATTLIST x id ID #IMPLIED>
]>
<root xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include xpointer="foo"/>
<x id="foo">
  <xi:include xpointer="bar"/>
</x>
<x id="bar"/>
</root>
--- NEW FILE: bdisclaimer.xml ---
<?xml version='1.0'?>
<disclaimer>
  <b><p>The opinions represented herein represent those of the individual
  and should not be interpreted <b/>as official policy endorsed by this
  organization.</p></b>
</disclaimer>

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/a a.xml,NONE,1.1

From: Oleg T. <he...@us...> - 2004-10-19 16:25:38

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/a
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Harold/test/a

Added Files:
	a.xml 
Log Message:
XInclude Test Suite updated

--- NEW FILE: a.xml ---
<p>This is from file a.xml in directory a</p>

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/b b.xml,NONE,1.1

From: Oleg T. <he...@us...> - 2004-10-19 16:25:38

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/b
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Harold/test/b

Added Files:
	b.xml 
Log Message:
XInclude Test Suite updated

--- NEW FILE: b.xml ---
<p>This is from file B in directory b</p>

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/text - New directory

From: Oleg T. <he...@us...> - 2004-10-19 16:21:37

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18792/text

Log Message:
Directory /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/text added to the repository

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/basedata - New directory

From: Oleg T. <he...@us...> - 2004-10-19 16:21:37

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/basedata
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18792/basedata

Log Message:
Directory /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/basedata added to the repository

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/b - New directory

From: Oleg T. <he...@us...> - 2004-10-19 16:21:35

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/b
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18792/b

Log Message:
Directory /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/b added to the repository

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test/a - New directory

From: Oleg T. <he...@us...> - 2004-10-19 16:21:35

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/a
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18792/a

Log Message:
Directory /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test/a added to the repository

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/test - New directory

From: Oleg T. <he...@us...> - 2004-10-19 16:21:04

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18601/test

Log Message:
Directory /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test added to the repository

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold/result - New directory

From: Oleg T. <he...@us...> - 2004-10-19 16:21:04

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/result
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18601/result

Log Message:
Directory /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/result added to the repository

[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Harold - New directory

From: Oleg T. <he...@us...> - 2004-10-19 16:20:23

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18426/Harold

Log Message:
Directory /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold added to the repository

[mvp-xml-cvs] Common/v1/test CodeWriterTest.cs,NONE,1.1

From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-19 07:18:13

Update of /cvsroot/mvp-xml/Common/v1/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12134/v1/test

Added Files:
	CodeWriterTest.cs 
Log Message:
Initial tests for a new Writer-like API for CodeDom creation.

--- NEW FILE: CodeWriterTest.cs ---
using System;
using System.CodeDom;
using System.CodeDom.Compiler;
using System.IO;
using System.Xml;

using NUnit.Framework;

namespace Mvp.Xml.Tests
{
	/// <summary/>
	[TestFixture]
	public class CodeWriterTest
	{
		[Test]
		public void Write1()
		{
			// Additional overloads would be available for visibility, etc.
			CodeStatement statement = null;

			CodeWriter writer = new CodeWriter();
			writer.WriteStartNamespace("CodeTest");
			writer.WriteImport("System");
			writer.WriteStartClass("MyClass");
			writer.WriteInherits(typeof(MarshalByRefObject));
			// Overload to create empty implementations? or with throw new NotImplementedException()?
			writer.WriteImplements(typeof(IConvertible));

			// A field
			writer.WriteField(typeof(int), "myField");

			// A property
			writer.WriteStartProperty(typeof(int), "MyFieldProp");
			writer.WriteStartGetter();
			// writer.WriteGetter(statement | params statement[]);
			writer.WriteStatement(statement);
			writer.WriteEndGetter();
			writer.WriteStartSetter();
			// writer.WriteSetter(statement | params statement[]);
			writer.WriteStatement(statement);
			writer.WriteEndProperty();

			// A method WriteMethod(visibility, return type?)
			writer.WriteStartMethod(MemberAttributes.Public);
			writer.WriteMethodParameter(typeof(string), "myparam");
			writer.WriteStatement(statement);
			writer.WriteEndMethod();

			writer.WriteEndClass();
			writer.WriteEndNamespace();

			CodeNamespace codens = writer.ToCodeNamespace();
			string code = writer.ToCode(new Microsoft.CSharp.CSharpCodeProvider());
		}

		internal class CodeWriter
		{
			public void WriteStartNamespace(string ns) {}
			public void WriteImport(string ns) {}
			public void WriteStartClass(string name) {}
			public void WriteInherits(Type type) {}
			public void WriteImplements(Type type) {}
			public void WriteField(Type type, string name) {}
			public void WriteStartProperty(Type type, string name) {}
			public void WriteStartGetter() {}
			// Decompose to one method per statement type.
			public void WriteStatement(CodeStatement statement) {}
			public void WriteEndGetter() {}
			public void WriteStartSetter() {}
			public void WriteEndSetter() {}
			public void WriteEndProperty() {}
			public void WriteStartMethod(MemberAttributes attributes) {}
			public void WriteMethodParameter(Type type, string name) {}
			public void WriteEndMethod() {}
			public void WriteEndClass() {}
			public void WriteEndNamespace() {}
			public CodeNamespace ToCodeNamespace() { return null; }
			public string ToCode(CodeDomProvider provider) { return null; }
		}
	}
}

[mvp-xml-cvs] Common/v1/src/XPath XPathNavigatorReader.cs,1.1,1.2

From: Daniel C. \(kzu\) <dca...@us...> - 2004-10-19 07:15:25

Update of /cvsroot/mvp-xml/Common/v1/src/XPath
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11638/v1/src/XPath

Modified Files:
	XPathNavigatorReader.cs 
Log Message:
Fixed bug reported by Oleg that causes wrong behaviror with leaf nodes.

Index: XPathNavigatorReader.cs
===================================================================
RCS file: /cvsroot/mvp-xml/Common/v1/src/XPath/XPathNavigatorReader.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XPathNavigatorReader.cs	27 Sep 2004 16:27:12 -0000	1.1
+++ XPathNavigatorReader.cs	19 Oct 2004 07:15:11 -0000	1.2
@@ -620,6 +620,14 @@
 					return _navigator.MoveToFirstChild();
 				}
 
+				// If XML fragment is not allowed and we're already at the 
+				// original location, set as end element.
+				if (_navigator.IsSamePosition(_original) && !_fragment)
+				{
+					_isendelement = true;
+					return true;
+				}
+
 				// Otherwise, try to move to sibling.
 				if (_navigator.MoveToNext())
 				{

Flat | Threaded

<< < 1 .. 32 33 34 35 36 .. 38 > >> (Page 34 of 38)

2004	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (174)	Nov (85)	Dec (14)
2005	Jan (56)	Feb	Mar	Apr	May (4)	Jun (1)	Jul (132)	Aug (5)	Sep	Oct (314)	Nov (133)	Dec (18)
2006	Jan (6)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec