Menu
▾
▴
[mvp-xml-cvs] XInclude/v1/test Elliotte_Rusty_HaroldTests_NS.cs,NONE,1.1 FourThoughtTests_NS.cs,NONE,1.1 LTG_Edinburgh_UnivTests_NS.cs,NONE,1.1 NISTTests_NS.cs,NONE,1.1 RedhatTests_NS.cs,NONE,1.1 Elliotte_Rusty_HaroldTests.cs,1.2,1.3 FourThoughtTests.cs,1.2,1.3 LTG_Edinburgh_UnivTests.cs,1.1,1.2 NistTests.cs,1.3,1.4 RedhatTests.cs,1.1,1.2 TestsGen.xslt,1.1,1.2 XIncludeTest.csproj,1.8,1.9
|
From: Oleg T. <he...@us...> - 2004-10-30 09:56:41
|
Update of /cvsroot/mvp-xml/XInclude/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26849/v1/test Modified Files: Elliotte_Rusty_HaroldTests.cs FourThoughtTests.cs LTG_Edinburgh_UnivTests.cs NistTests.cs RedhatTests.cs TestsGen.xslt XIncludeTest.csproj Added Files: Elliotte_Rusty_HaroldTests_NS.cs FourThoughtTests_NS.cs LTG_Edinburgh_UnivTests_NS.cs NISTTests_NS.cs RedhatTests_NS.cs Log Message: Updated Test Suite and added non-streaming mode tests. --- NEW FILE: RedhatTests_NS.cs --- (This appears to be a binary file; contents omitted.) Index: XIncludeTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- XIncludeTest.csproj 28 Oct 2004 18:27:06 -0000 1.8 +++ XIncludeTest.csproj 30 Oct 2004 09:56:28 -0000 1.9 @@ -100,6 +100,10 @@ BuildAction = "Compile" /> <File + RelPath = "Elliotte_Rusty_HaroldTests_NS.cs" + BuildAction = "Compile" + /> + <File RelPath = "EntryPoint.cs" SubType = "Code" BuildAction = "Compile" @@ -110,6 +114,10 @@ BuildAction = "Compile" /> <File + RelPath = "FourThoughtTests_NS.cs" + BuildAction = "Compile" + /> + <File RelPath = "generate-tests.cmd" BuildAction = "None" /> @@ -119,16 +127,28 @@ BuildAction = "Compile" /> <File + RelPath = "LTG_Edinburgh_UnivTests_NS.cs" + BuildAction = "Compile" + /> + <File RelPath = "NISTTests.cs" SubType = "Code" BuildAction = "Compile" /> <File + RelPath = "NISTTests_NS.cs" + BuildAction = "Compile" + /> + <File RelPath = "RedhatTests.cs" SubType = "Code" BuildAction = "Compile" /> <File + RelPath = "RedhatTests_NS.cs" + BuildAction = "Compile" + /> + <File RelPath = "TestsGen.xslt" BuildAction = "Content" /> Index: Elliotte_Rusty_HaroldTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/Elliotte_Rusty_HaroldTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Elliotte_Rusty_HaroldTests.cs 26 Oct 2004 19:28:43 -0000 1.2 +++ Elliotte_Rusty_HaroldTests.cs 30 Oct 2004 09:56:28 -0000 1.3 @@ -25,17 +25,9 @@ /// </summary> public static void RunAndCompare(string source, string result) { - RunAndCompare(source, result, false); - } - - /// <summary> - /// Utility method for running tests. - /// </summary> - public static void RunAndCompare(string source, string result, bool textAsCDATA) - { XIncludeReaderTests.RunAndCompare( "../../XInclude-Test-Suite/Harold/test/" + source, - "../../XInclude-Test-Suite/Harold/test/" + result, textAsCDATA); + "../../XInclude-Test-Suite/Harold/test/" + result, false, true); } @@ -185,15 +177,8 @@ /// <summary> /// Syntactically incorrect IRI is a fatal error (Eitehr I'm missing something or the spec needs to state this prinicple more clearly.) /// </summary> - /// <remarks> - /// As per spec: - /// "A value that results in a syntactically invalid URI or IRI should be - /// reported as a fatal error, but some implementations may find it - /// impractical to distinguish this case from a resource error." - /// We do treat it as a resource error. - /// </remarks> [Test] - [ExpectedException(typeof(DirectoryNotFoundException))] + [ExpectedException(typeof(Exception))] public void harold_13() { RunAndCompare("badiri.xml", ""); @@ -204,15 +189,8 @@ /// <summary> /// Syntactically incorrect IRI with an unrecognized scheme is a fatal error /// </summary> - /// <remarks> - /// As per spec: - /// "A value that results in a syntactically invalid URI or IRI should be - /// reported as a fatal error, but some implementations may find it - /// impractical to distinguish this case from a resource error." - /// We do treat it as a resource error. - /// </remarks> [Test] - [ExpectedException(typeof(DirectoryNotFoundException))] + [ExpectedException(typeof(Exception))] public void harold_14() { RunAndCompare("badiri2.xml", ""); @@ -235,7 +213,7 @@ /// accept attribute contains carriage-return/linefeed pair /// </summary> [Test] - [ExpectedException(typeof(InvalidAcceptHTTPHeaderValue))] + [ExpectedException(typeof(Exception))] public void harold_16() { RunAndCompare("badaccept1.xml", ""); @@ -247,7 +225,7 @@ /// accept attribute contains Latin-1 character (non-breaking space) /// </summary> [Test] - [ExpectedException(typeof(InvalidAcceptHTTPHeaderValue))] + [ExpectedException(typeof(Exception))] public void harold_17() { RunAndCompare("badaccept2.xml", ""); @@ -305,7 +283,7 @@ [Test] public void harold_22() { - RunAndCompare("metafallbacktest2.xml", "../result/metafallbacktest2.xml", true); + RunAndCompare("metafallbacktest2.xml", "../result/metafallbacktest2.xml"); } @@ -314,7 +292,7 @@ /// A fallback element in an included document contains an include element with a parse attribute with an illegal value. /// </summary> [Test] - [ExpectedException(typeof(UnknownParseAttributeValueException))] + [ExpectedException(typeof(Exception))] public void harold_23() { RunAndCompare("metafallbacktest3.xml", ""); @@ -326,7 +304,7 @@ /// A fallback element in an included document contains an include element with neither an xpointer nor an href attribute. /// </summary> [Test] - [ExpectedException(typeof(MissingHrefAndXpointerException))] + [ExpectedException(typeof(Exception))] public void harold_24() { RunAndCompare("metafallbacktest4.xml", ""); @@ -339,7 +317,7 @@ /// A fallback element in an included document contains an include element whose href attribute has a fragment ID. /// </summary> [Test] - [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] + [ExpectedException(typeof(Exception))] public void harold_25() { RunAndCompare("metafallbacktestwithfragmentid.xml", ""); @@ -351,7 +329,7 @@ /// The XPointer does not select anything in the acquired infoset, but does select something in the source infoset. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_26() { RunAndCompare("metafallbacktest5.xml", ""); @@ -399,7 +377,7 @@ /// then fails to find a resource, which is a fatal error if there's no fallback. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_30() { RunAndCompare("metamissingfallbacktestwithxpointer.xml", ""); @@ -412,7 +390,7 @@ /// then fails to find a resource, but it has a fallback, which itself has an include child, which then throws a fatal error. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_31() { RunAndCompare("metafallbackwithbadxpointertest.xml", ""); @@ -434,8 +412,8 @@ /// <summary> /// An include element points to a document that includes it, using an xpointer to select part of that document. /// </summary> - [Test] - [ExpectedException(typeof(CircularInclusionException))] + [Test] + [ExpectedException(typeof(Exception))] public void harold_33() { RunAndCompare("legalcircle.xml", ""); @@ -480,7 +458,7 @@ /// Detect an inclusion loop when an include element refers to itself /// </summary> [Test] - [ExpectedException(typeof(CircularInclusionException))] + [ExpectedException(typeof(Exception))] public void harold_37() { RunAndCompare("internalcircular.xml", ""); @@ -493,7 +471,7 @@ /// in the same document /// </summary> [Test] - [ExpectedException(typeof(CircularInclusionException))] + [ExpectedException(typeof(Exception))] public void harold_38() { RunAndCompare("internalcircularviaancestor.xml", ""); @@ -550,7 +528,7 @@ /// testIncludeElementsCannotHaveIncludeChildren /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void harold_43() { RunAndCompare("nestedxinclude.xml", ""); @@ -562,7 +540,7 @@ /// Include elements cannot have children from the xinclude namespace except for fallback. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void harold_44() { RunAndCompare("nestedxincludenamespace.xml", ""); @@ -574,7 +552,7 @@ /// Fallback can only be a child of xinclude element /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void harold_45() { RunAndCompare("nakedfallback.xml", ""); @@ -586,7 +564,7 @@ /// A fallback element cannot have a fallback child element. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void harold_46() { RunAndCompare("fallbackcontainsfallback.xml", ""); @@ -600,7 +578,7 @@ /// In this test the fallback is activated. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void harold_47() { RunAndCompare("multiplefallbacks.xml", ""); @@ -614,7 +592,7 @@ /// In this test the fallback is not activated. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void harold_48() { RunAndCompare("multiplefallbacks2.xml", ""); @@ -626,7 +604,7 @@ /// A document cannot include itself /// </summary> [Test] - [ExpectedException(typeof(CircularInclusionException))] + [ExpectedException(typeof(Exception))] public void harold_49() { RunAndCompare("circle1.xml", ""); @@ -638,7 +616,7 @@ /// Document A includes document B which includes document A /// </summary> [Test] - [ExpectedException(typeof(CircularInclusionException))] + [ExpectedException(typeof(Exception))] public void harold_50() { RunAndCompare("circle2a.xml", ""); @@ -650,7 +628,7 @@ /// Include element is missing an href and xpointer attribute /// </summary> [Test] - [ExpectedException(typeof(MissingHrefAndXpointerException))] + [ExpectedException(typeof(Exception))] public void harold_51() { RunAndCompare("missinghref.xml", ""); @@ -662,7 +640,7 @@ /// parse attribute must have value xml or text /// </summary> [Test] - [ExpectedException(typeof(UnknownParseAttributeValueException))] + [ExpectedException(typeof(Exception))] public void harold_52() { RunAndCompare("badparseattribute.xml", ""); @@ -674,7 +652,7 @@ /// Missing resource is fatal when there's no fallback /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_53() { RunAndCompare("missingfile.xml", ""); @@ -730,7 +708,7 @@ /// XPointer that selects nothing is a resource error, and fatal because there's no fallback. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_58() { RunAndCompare("xptridtest2.xml", ""); @@ -765,7 +743,7 @@ /// the second XPointer part is still a fatal error. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_61() { RunAndCompare("laterfailure.xml", ""); @@ -778,7 +756,7 @@ /// the second XPointer part is still a fatal error. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_62() { RunAndCompare("laterfailure2.xml", ""); @@ -865,7 +843,7 @@ /// An XPointer that doesn't point to anything is a resource error; and fatal because there's no fallback /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_69() { RunAndCompare("xptrtumblertest2.xml", ""); @@ -877,7 +855,7 @@ /// Syntax error in an XPointer is a resource error; and fatal because there's no fallback /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_70() { RunAndCompare("badxptr.xml", ""); @@ -889,7 +867,7 @@ /// Syntax error in an XPointer is a resource error; and fatal because there's no fallback /// </summary> [Test] - [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] + [ExpectedException(typeof(Exception))] public void harold_71() { RunAndCompare("badxptr2.xml", ""); @@ -989,7 +967,7 @@ /// Syntax error in an XPointer is a resource error; and fatal becaue there's no fallback /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_80() { RunAndCompare("badxptr3.xml", ""); @@ -1001,7 +979,7 @@ /// Syntax error in an XPointer is a resource error; and fatal becaue there's no fallback /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_81() { RunAndCompare("badxptr4.xml", ""); @@ -1013,7 +991,7 @@ /// Circular references via xpointer are fatal /// </summary> [Test] - [ExpectedException(typeof(CircularInclusionException))] + [ExpectedException(typeof(Exception))] public void harold_82() { RunAndCompare("circlepointer1.xml", ""); @@ -1025,7 +1003,7 @@ /// href attribute with fragment ID is a fatal error even when there's an xpointer attribute /// </summary> [Test] - [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] + [ExpectedException(typeof(Exception))] public void harold_83() { RunAndCompare("xpointeroverridesfragmentid.xml", ""); @@ -1037,7 +1015,7 @@ /// href attribute with fragment ID is a fatal error /// </summary> [Test] - [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] + [ExpectedException(typeof(Exception))] public void harold_84() { RunAndCompare("ignoresfragmentid.xml", ""); @@ -1061,7 +1039,7 @@ /// syntax of fragment IDs from RFC 2396. /// </summary> [Test] - [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] + [ExpectedException(typeof(Exception))] public void harold_86() { RunAndCompare("meaninglessfragmentid.xml", ""); @@ -1120,7 +1098,7 @@ [Test] public void harold_90() { - RunAndCompare("accepthtml.xml", "../result/accepthtml.xml", true); + RunAndCompare("accepthtml.xml", "../result/accepthtml.xml"); } @@ -1129,7 +1107,7 @@ /// Unrecognized scheme in XPointer is a fatal error if there's no fallback /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void harold_91() { RunAndCompare("unrecognizedscheme.xml", ""); @@ -1163,7 +1141,7 @@ /// Included document has an include element with neither href nor xpointer attribute /// </summary> [Test] - [ExpectedException(typeof(MissingHrefAndXpointerException))] + [ExpectedException(typeof(Exception))] public void harold_94() { RunAndCompare("toplevel.xml", ""); Index: FourThoughtTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/FourThoughtTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- FourThoughtTests.cs 19 Oct 2004 16:24:56 -0000 1.2 +++ FourThoughtTests.cs 30 Oct 2004 09:56:28 -0000 1.3 @@ -27,7 +27,7 @@ { XIncludeReaderTests.RunAndCompare( "../../XInclude-Test-Suite/FourThought/test/XInclude/docs/" + source, - "../../XInclude-Test-Suite/FourThought/test/XInclude/docs/" + result); + "../../XInclude-Test-Suite/FourThought/test/XInclude/docs/" + result, false, true); } --- NEW FILE: FourThoughtTests_NS.cs --- (This appears to be a binary file; contents omitted.) Index: RedhatTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/RedhatTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- RedhatTests.cs 19 Oct 2004 16:24:56 -0000 1.1 +++ RedhatTests.cs 30 Oct 2004 09:56:28 -0000 1.2 @@ -27,7 +27,7 @@ { XIncludeReaderTests.RunAndCompare( "../../XInclude-Test-Suite/Imaq/test/XInclude/docs/" + source, - "../../XInclude-Test-Suite/Imaq/test/XInclude/docs/" + result); + "../../XInclude-Test-Suite/Imaq/test/XInclude/docs/" + result, false, true); } Index: NistTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/NistTests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NistTests.cs 19 Oct 2004 16:24:56 -0000 1.3 +++ NistTests.cs 30 Oct 2004 09:56:28 -0000 1.4 @@ -27,7 +27,7 @@ { XIncludeReaderTests.RunAndCompare( "../../XInclude-Test-Suite/Nist/test/docs/" + source, - "../../XInclude-Test-Suite/Nist/test/docs/" + result); + "../../XInclude-Test-Suite/Nist/test/docs/" + result, false, true); } @@ -58,7 +58,7 @@ /// element, result in fatal errors. /// </summary> [Test] - [ExpectedException(typeof(UnknownParseAttributeValueException))] + [ExpectedException(typeof(Exception))] public void Nist_include_03() { RunAndCompare("nist-include-03.xml", ""); @@ -82,7 +82,7 @@ /// child of an xinclude element. A fatal error should be generated. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void Nist_include_05() { RunAndCompare("nist-include-05.xml", ""); @@ -118,7 +118,7 @@ /// include element. A resource error results in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void Nist_include_08() { RunAndCompare("nist-include-08.xml", ""); @@ -153,7 +153,7 @@ /// Test a resource containing non-well-formed XML. The inclusion results in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void Nist_include_11() { RunAndCompare("nist-include-11.xml", ""); @@ -165,7 +165,7 @@ /// Test that is a fatal error for an include element to contain more than one fallback elements. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void Nist_include_12() { RunAndCompare("nist-include-12.xml", ""); @@ -199,7 +199,7 @@ /// It is illegal for an include element to point to itself, when parse="xml". /// </summary> [Test] - [ExpectedException(typeof(CircularInclusionException))] + [ExpectedException(typeof(Exception))] public void Nist_include_15() { RunAndCompare("nist-include-15.xml", ""); @@ -294,7 +294,7 @@ /// Test should fail because is including more than one element. /// </summary> [Test] - [ExpectedException(typeof(MalformedXInclusionResultError))] + [ExpectedException(typeof(Exception))] public void Nist_include_23() { RunAndCompare("nist-include-23.xml", ""); @@ -398,7 +398,7 @@ /// Including an XML document using an XPointer element scheme. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void Nist_include_32() { RunAndCompare("nist-include-32.xml", ""); @@ -410,7 +410,7 @@ /// Including an XML document using an XPointer element scheme. /// </summary> [Test] - [ExpectedException(typeof(FatalResourceException))] + [ExpectedException(typeof(Exception))] public void Nist_include_33() { RunAndCompare("nist-include-33.xml", ""); @@ -504,7 +504,7 @@ /// This test should result in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void nist_include_41() { RunAndCompare("nist-include-41.xml", ""); @@ -518,7 +518,7 @@ /// other elements from the xinclude namespace result in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void Nist_include_42() { RunAndCompare("nist-include-42.xml", ""); @@ -531,7 +531,7 @@ /// The content must be one fallback. This test should result in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void Nist_include_43() { RunAndCompare("nist-include-43.xml", ""); @@ -544,7 +544,7 @@ /// This test should result in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(XmlException))] + [ExpectedException(typeof(Exception))] public void Nist_include_44() { RunAndCompare("nist-include-44.xml", ""); @@ -557,7 +557,7 @@ /// This test should result in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(XmlException))] + [ExpectedException(typeof(Exception))] public void Nist_include_45() { RunAndCompare("nist-include-45.xml", ""); @@ -570,7 +570,7 @@ /// The xinclude element may contain a fallback element; other elements from the xinclude namespace result in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void Nist_include_46() { RunAndCompare("nist-include-46.xml", ""); @@ -583,7 +583,7 @@ /// The xinclude element may contain a fallback element; other elements from the xinclude namespace result in a fatal error. /// </summary> [Test] - [ExpectedException(typeof(XIncludeSyntaxError))] + [ExpectedException(typeof(Exception))] public void Nist_include_47() { RunAndCompare("nist-include-47.xml", ""); @@ -660,7 +660,7 @@ /// fatal error. /// </summary> [Test] - [ExpectedException(typeof(AttributeOrNamespaceInIncludeLocationError))] + [ExpectedException(typeof(Exception))] public void Nist_include_53() { RunAndCompare("nist-include-53.xml", ""); @@ -673,7 +673,7 @@ /// fatal error. /// </summary> [Test] - [ExpectedException(typeof(AttributeOrNamespaceInIncludeLocationError))] + [ExpectedException(typeof(Exception))] public void Nist_include_54() { RunAndCompare("nist-include-54.xml", ""); Index: LTG_Edinburgh_UnivTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/LTG_Edinburgh_UnivTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- LTG_Edinburgh_UnivTests.cs 19 Oct 2004 16:24:56 -0000 1.1 +++ LTG_Edinburgh_UnivTests.cs 30 Oct 2004 09:56:28 -0000 1.2 @@ -27,7 +27,7 @@ { XIncludeReaderTests.RunAndCompare( "../../XInclude-Test-Suite/EdUni/test/" + source, - "../../XInclude-Test-Suite/EdUni/test/" + result); + "../../XInclude-Test-Suite/EdUni/test/" + result, false, true); } Index: TestsGen.xslt =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/TestsGen.xslt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- TestsGen.xslt 19 Oct 2004 16:24:56 -0000 1.1 +++ TestsGen.xslt 30 Oct 2004 09:56:28 -0000 1.2 @@ -2,11 +2,23 @@ <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:apply-templates select="testcases"> + <xsl:with-param name="streaming" select="false()"/> + </xsl:apply-templates> + <xsl:apply-templates select="testcases"> + <xsl:with-param name="streaming" select="true()"/> + </xsl:apply-templates> + </xsl:template> <xsl:template match="testcases"> + <xsl:param name="streaming" select="false()"/> <xsl:variable name="creator" select="translate(@creator, ' ,', '_')"/> - <exsl:document href="{$creator}Tests.cs" method="text" encoding="UTF-8">using System; + <xsl:variable name="filename"> + <xsl:value-of select="$creator"/> + <xsl:text>Tests</xsl:text> + <xsl:if test="not($streaming)">_NS</xsl:if> + <xsl:text>.cs</xsl:text> + </xsl:variable> + <exsl:document href="{$filename}" method="text" encoding="UTF-8">using System; using System.Diagnostics; using System.Xml; using System.IO; @@ -35,7 +47,7 @@ { XIncludeReaderTests.RunAndCompare( "../../XInclude-Test-Suite/<xsl:value-of select="@basedir"/>/" + source, - "../../XInclude-Test-Suite/<xsl:value-of select="@basedir"/>/" + result); + "../../XInclude-Test-Suite/<xsl:value-of select="@basedir"/>/" + result, false, <xsl:choose><xsl:when test="$streaming">true</xsl:when><xsl:otherwise>false</xsl:otherwise></xsl:choose>); } <xsl:apply-templates/> } --- NEW FILE: LTG_Edinburgh_UnivTests_NS.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: NISTTests_NS.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Elliotte_Rusty_HaroldTests_NS.cs --- (This appears to be a binary file; contents omitted.) |
