Menu
▾
▴
[mvp-xml-cvs] XInclude/v1/test Elliotte_Rusty_HaroldTests.cs,1.3,1.4 Elliotte_Rusty_HaroldTests_NS.cs,1.1,1.2 EntryPoint.cs,1.9,1.10 FourThoughtTests_NS.cs,1.1,1.2 LTG_Edinburgh_UnivTests_NS.cs,1.1,1.2 NISTTests_NS.cs,1.1,1.2 RedhatTests_NS.cs,1.1,1.2 TestsGen.xslt,1.2,1.3 XIncludeReaderTests.cs,1.10,1.11 XIncludeTest.csproj,1.9,1.10
|
From: Oleg T. <he...@us...> - 2004-10-31 09:02:54
|
Update of /cvsroot/mvp-xml/XInclude/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14200/v1/test Modified Files: Elliotte_Rusty_HaroldTests.cs Elliotte_Rusty_HaroldTests_NS.cs EntryPoint.cs FourThoughtTests_NS.cs LTG_Edinburgh_UnivTests_NS.cs NISTTests_NS.cs RedhatTests_NS.cs TestsGen.xslt XIncludeReaderTests.cs XIncludeTest.csproj Log Message: Fixing bugs. Index: RedhatTests_NS.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/RedhatTests_NS.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- RedhatTests_NS.cs 30 Oct 2004 09:56:28 -0000 1.1 +++ RedhatTests_NS.cs 31 Oct 2004 08:02:44 -0000 1.2 @@ -13,9 +13,9 @@ /// Edinburgh University test cases from the XInclude Test suite. /// </summary> [TestFixture] - public class RedhatTests + public class RedhatTests_NS { - public RedhatTests() + public RedhatTests_NS() { Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); } Index: XIncludeTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- XIncludeTest.csproj 30 Oct 2004 09:56:28 -0000 1.9 +++ XIncludeTest.csproj 31 Oct 2004 08:02:44 -0000 1.10 @@ -101,6 +101,7 @@ /> <File RelPath = "Elliotte_Rusty_HaroldTests_NS.cs" + SubType = "Code" BuildAction = "Compile" /> <File @@ -115,6 +116,7 @@ /> <File RelPath = "FourThoughtTests_NS.cs" + SubType = "Code" BuildAction = "Compile" /> <File @@ -128,6 +130,7 @@ /> <File RelPath = "LTG_Edinburgh_UnivTests_NS.cs" + SubType = "Code" BuildAction = "Compile" /> <File @@ -137,6 +140,7 @@ /> <File RelPath = "NISTTests_NS.cs" + SubType = "Code" BuildAction = "Compile" /> <File @@ -146,6 +150,7 @@ /> <File RelPath = "RedhatTests_NS.cs" + SubType = "Code" BuildAction = "Compile" /> <File Index: EntryPoint.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- EntryPoint.cs 28 Oct 2004 18:27:05 -0000 1.9 +++ EntryPoint.cs 31 Oct 2004 08:02:44 -0000 1.10 @@ -9,15 +9,15 @@ { public static void Main() { - XIncludeReaderTests rt = new XIncludeReaderTests(); + //XIncludeReaderTests rt = new XIncludeReaderTests(); //LTG_Edinburgh_UnivTests rt = new LTG_Edinburgh_UnivTests(); //NistTests rt = new NistTests(); - //Elliotte_Rusty_HaroldTests rt = new Elliotte_Rusty_HaroldTests(); + Elliotte_Rusty_HaroldTests_NS rt = new Elliotte_Rusty_HaroldTests_NS(); //FourThoughtTests rt = new FourThoughtTests(); //XIncludeSyntaxTests rt = new XIncludeSyntaxTests(); try { - rt.IncludesItselfNoHrefText_NonStreaming(); + rt.harold_21(); } catch (Exception e) { Index: Elliotte_Rusty_HaroldTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/Elliotte_Rusty_HaroldTests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Elliotte_Rusty_HaroldTests.cs 30 Oct 2004 09:56:28 -0000 1.3 +++ Elliotte_Rusty_HaroldTests.cs 31 Oct 2004 08:02:28 -0000 1.4 @@ -83,6 +83,7 @@ /// include element including the sibling element after that one. /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_05() { RunAndCompare("marshtest.xml", "../result/marshtest.xml"); @@ -94,6 +95,7 @@ /// Include a document that uses XPointers to reference various parts of itself /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_06() { RunAndCompare("includedocumentwithintradocumentreferences.xml", "../result/includedocumentwithintradocumentreferences.xml"); @@ -143,6 +145,7 @@ /// According to RFC 2396 empty string URI always refers to the current document irrespective of base URI. /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_10() { RunAndCompare("marshtestwithxmlbase.xml", "../result/marshtestwithxmlbase.xml"); @@ -155,6 +158,7 @@ /// There's no difference between href="" and no href attribute. /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_11() { RunAndCompare("marshtestwithxmlbaseandemptyhref.xml", "../result/marshtestwithxmlbase.xml"); @@ -167,6 +171,7 @@ /// Make sure base URIs are preserved when including from the same document. /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_12() { RunAndCompare("includefromsamedocumentwithbase.xml", "../result/includefromsamedocumentwithbase.xml"); @@ -177,8 +182,13 @@ /// <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>According to the 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 resource error.</remarks> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_13() { RunAndCompare("badiri.xml", ""); @@ -189,8 +199,13 @@ /// <summary> /// Syntactically incorrect IRI with an unrecognized scheme is a fatal error /// </summary> + /// <remarks>According to the 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 resource error.</remarks> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_14() { RunAndCompare("badiri2.xml", ""); @@ -213,7 +228,7 @@ /// accept attribute contains carriage-return/linefeed pair /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(InvalidAcceptHTTPHeaderValue))] public void harold_16() { RunAndCompare("badaccept1.xml", ""); @@ -225,7 +240,7 @@ /// accept attribute contains Latin-1 character (non-breaking space) /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(InvalidAcceptHTTPHeaderValue))] public void harold_17() { RunAndCompare("badaccept2.xml", ""); @@ -270,6 +285,7 @@ /// An included document can use a fallback that points into the included document /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_21() { RunAndCompare("metafallbacktest6.xml", "../result/metafallbacktest6.xml"); @@ -292,7 +308,7 @@ /// A fallback element in an included document contains an include element with a parse attribute with an illegal value. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(UnknownParseAttributeValueException))] public void harold_23() { RunAndCompare("metafallbacktest3.xml", ""); @@ -304,7 +320,7 @@ /// A fallback element in an included document contains an include element with neither an xpointer nor an href attribute. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(MissingHrefAndXpointerException))] public void harold_24() { RunAndCompare("metafallbacktest4.xml", ""); @@ -317,7 +333,7 @@ /// A fallback element in an included document contains an include element whose href attribute has a fragment ID. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] public void harold_25() { RunAndCompare("metafallbacktestwithfragmentid.xml", ""); @@ -329,7 +345,7 @@ /// The XPointer does not select anything in the acquired infoset, but does select something in the source infoset. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_26() { RunAndCompare("metafallbacktest5.xml", ""); @@ -377,7 +393,7 @@ /// then fails to find a resource, which is a fatal error if there's no fallback. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_30() { RunAndCompare("metamissingfallbacktestwithxpointer.xml", ""); @@ -390,7 +406,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(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_31() { RunAndCompare("metafallbackwithbadxpointertest.xml", ""); @@ -413,7 +429,7 @@ /// An include element points to a document that includes it, using an xpointer to select part of that document. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(CircularInclusionException))] public void harold_33() { RunAndCompare("legalcircle.xml", ""); @@ -425,6 +441,7 @@ /// An include element points to another include element in the same document. /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_34() { RunAndCompare("recursewithinsamedocument.xml", "../result/recursewithinsamedocument.xml"); @@ -458,7 +475,7 @@ /// Detect an inclusion loop when an include element refers to itself /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_37() { RunAndCompare("internalcircular.xml", ""); @@ -471,7 +488,7 @@ /// in the same document /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_38() { RunAndCompare("internalcircularviaancestor.xml", ""); @@ -528,7 +545,7 @@ /// testIncludeElementsCannotHaveIncludeChildren /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(XIncludeSyntaxError))] public void harold_43() { RunAndCompare("nestedxinclude.xml", ""); @@ -540,7 +557,7 @@ /// Include elements cannot have children from the xinclude namespace except for fallback. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(XIncludeSyntaxError))] public void harold_44() { RunAndCompare("nestedxincludenamespace.xml", ""); @@ -552,7 +569,7 @@ /// Fallback can only be a child of xinclude element /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(XIncludeSyntaxError))] public void harold_45() { RunAndCompare("nakedfallback.xml", ""); @@ -564,7 +581,7 @@ /// A fallback element cannot have a fallback child element. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(XIncludeSyntaxError))] public void harold_46() { RunAndCompare("fallbackcontainsfallback.xml", ""); @@ -578,7 +595,7 @@ /// In this test the fallback is activated. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(XIncludeSyntaxError))] public void harold_47() { RunAndCompare("multiplefallbacks.xml", ""); @@ -592,7 +609,7 @@ /// In this test the fallback is not activated. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(XIncludeSyntaxError))] public void harold_48() { RunAndCompare("multiplefallbacks2.xml", ""); @@ -604,7 +621,7 @@ /// A document cannot include itself /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(CircularInclusionException))] public void harold_49() { RunAndCompare("circle1.xml", ""); @@ -616,7 +633,7 @@ /// Document A includes document B which includes document A /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(CircularInclusionException))] public void harold_50() { RunAndCompare("circle2a.xml", ""); @@ -628,7 +645,7 @@ /// Include element is missing an href and xpointer attribute /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(MissingHrefAndXpointerException))] public void harold_51() { RunAndCompare("missinghref.xml", ""); @@ -640,7 +657,7 @@ /// parse attribute must have value xml or text /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(UnknownParseAttributeValueException))] public void harold_52() { RunAndCompare("badparseattribute.xml", ""); @@ -652,7 +669,7 @@ /// Missing resource is fatal when there's no fallback /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_53() { RunAndCompare("missingfile.xml", ""); @@ -708,7 +725,7 @@ /// XPointer that selects nothing is a resource error, and fatal because there's no fallback. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_58() { RunAndCompare("xptridtest2.xml", ""); @@ -743,7 +760,7 @@ /// the second XPointer part is still a fatal error. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_61() { RunAndCompare("laterfailure.xml", ""); @@ -756,7 +773,7 @@ /// the second XPointer part is still a fatal error. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_62() { RunAndCompare("laterfailure2.xml", ""); @@ -768,6 +785,7 @@ /// You can include another element from the same document without an href attribute. /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void harold_63() { RunAndCompare("onlyxpointer.xml", "../result/onlyxpointer.xml"); @@ -843,7 +861,7 @@ /// An XPointer that doesn't point to anything is a resource error; and fatal because there's no fallback /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_69() { RunAndCompare("xptrtumblertest2.xml", ""); @@ -855,7 +873,7 @@ /// Syntax error in an XPointer is a resource error; and fatal because there's no fallback /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_70() { RunAndCompare("badxptr.xml", ""); @@ -867,7 +885,7 @@ /// Syntax error in an XPointer is a resource error; and fatal because there's no fallback /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] public void harold_71() { RunAndCompare("badxptr2.xml", ""); @@ -967,7 +985,7 @@ /// Syntax error in an XPointer is a resource error; and fatal becaue there's no fallback /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_80() { RunAndCompare("badxptr3.xml", ""); @@ -979,7 +997,7 @@ /// Syntax error in an XPointer is a resource error; and fatal becaue there's no fallback /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_81() { RunAndCompare("badxptr4.xml", ""); @@ -991,7 +1009,7 @@ /// Circular references via xpointer are fatal /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(CircularInclusionException))] public void harold_82() { RunAndCompare("circlepointer1.xml", ""); @@ -1003,7 +1021,7 @@ /// href attribute with fragment ID is a fatal error even when there's an xpointer attribute /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] public void harold_83() { RunAndCompare("xpointeroverridesfragmentid.xml", ""); @@ -1015,7 +1033,7 @@ /// href attribute with fragment ID is a fatal error /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] public void harold_84() { RunAndCompare("ignoresfragmentid.xml", ""); @@ -1039,7 +1057,7 @@ /// syntax of fragment IDs from RFC 2396. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FragmentIdentifierInHrefAttribute))] public void harold_86() { RunAndCompare("meaninglessfragmentid.xml", ""); @@ -1107,7 +1125,7 @@ /// Unrecognized scheme in XPointer is a fatal error if there's no fallback /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(FatalResourceException))] public void harold_91() { RunAndCompare("unrecognizedscheme.xml", ""); @@ -1141,7 +1159,7 @@ /// Included document has an include element with neither href nor xpointer attribute /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(MissingHrefAndXpointerException))] public void harold_94() { RunAndCompare("toplevel.xml", ""); Index: FourThoughtTests_NS.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/FourThoughtTests_NS.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- FourThoughtTests_NS.cs 30 Oct 2004 09:56:28 -0000 1.1 +++ FourThoughtTests_NS.cs 31 Oct 2004 08:02:44 -0000 1.2 @@ -13,9 +13,9 @@ /// Edinburgh University test cases from the XInclude Test suite. /// </summary> [TestFixture] - public class FourThoughtTests + public class FourThoughtTests_NS { - public FourThoughtTests() + public FourThoughtTests_NS() { Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); } Index: TestsGen.xslt =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/TestsGen.xslt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- TestsGen.xslt 30 Oct 2004 09:56:28 -0000 1.2 +++ TestsGen.xslt 31 Oct 2004 08:02:44 -0000 1.3 @@ -15,10 +15,9 @@ <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:if test="not($streaming)">_NS</xsl:if> </xsl:variable> - <exsl:document href="{$filename}" method="text" encoding="UTF-8">using System; + <exsl:document href="{$filename}.cs" method="text" encoding="UTF-8">using System; using System.Diagnostics; using System.Xml; using System.IO; @@ -33,9 +32,9 @@ /// Edinburgh University test cases from the XInclude Test suite. /// </summary> [TestFixture] - public class <xsl:value-of select="$creator"/>Tests + public class <xsl:value-of select="$filename"/> { - public <xsl:value-of select="$creator"/>Tests() + public <xsl:value-of select="$filename"/>() { Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); } Index: LTG_Edinburgh_UnivTests_NS.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/LTG_Edinburgh_UnivTests_NS.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- LTG_Edinburgh_UnivTests_NS.cs 30 Oct 2004 09:56:28 -0000 1.1 +++ LTG_Edinburgh_UnivTests_NS.cs 31 Oct 2004 08:02:44 -0000 1.2 @@ -13,9 +13,9 @@ /// Edinburgh University test cases from the XInclude Test suite. /// </summary> [TestFixture] - public class LTG_Edinburgh_UnivTests + public class LTG_Edinburgh_UnivTests_NS { - public LTG_Edinburgh_UnivTests() + public LTG_Edinburgh_UnivTests_NS() { Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); } Index: NISTTests_NS.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/NISTTests_NS.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NISTTests_NS.cs 30 Oct 2004 09:56:28 -0000 1.1 +++ NISTTests_NS.cs 31 Oct 2004 08:02:44 -0000 1.2 @@ -13,9 +13,9 @@ /// Edinburgh University test cases from the XInclude Test suite. /// </summary> [TestFixture] - public class NISTTests + public class NISTTests_NS { - public NISTTests() + public NISTTests_NS() { Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); } Index: Elliotte_Rusty_HaroldTests_NS.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/Elliotte_Rusty_HaroldTests_NS.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Elliotte_Rusty_HaroldTests_NS.cs 30 Oct 2004 09:56:28 -0000 1.1 +++ Elliotte_Rusty_HaroldTests_NS.cs 31 Oct 2004 08:02:44 -0000 1.2 @@ -13,9 +13,9 @@ /// Edinburgh University test cases from the XInclude Test suite. /// </summary> [TestFixture] - public class Elliotte_Rusty_HaroldTests + public class Elliotte_Rusty_HaroldTests_NS { - public Elliotte_Rusty_HaroldTests() + public Elliotte_Rusty_HaroldTests_NS() { Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); } @@ -177,8 +177,13 @@ /// <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>According to the 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 resource error.</remarks> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_13() { RunAndCompare("badiri.xml", ""); @@ -189,8 +194,13 @@ /// <summary> /// Syntactically incorrect IRI with an unrecognized scheme is a fatal error /// </summary> + /// <remarks>According to the 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 resource error.</remarks> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_14() { RunAndCompare("badiri2.xml", ""); @@ -213,7 +223,7 @@ /// accept attribute contains carriage-return/linefeed pair /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(InvalidAcceptHTTPHeaderValue))] public void harold_16() { RunAndCompare("badaccept1.xml", ""); @@ -225,7 +235,7 @@ /// accept attribute contains Latin-1 character (non-breaking space) /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(InvalidAcceptHTTPHeaderValue))] public void harold_17() { RunAndCompare("badaccept2.xml", ""); Index: XIncludeReaderTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeReaderTests.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- XIncludeReaderTests.cs 28 Oct 2004 18:27:06 -0000 1.10 +++ XIncludeReaderTests.cs 31 Oct 2004 08:02:44 -0000 1.11 @@ -54,7 +54,13 @@ XmlDocument doc = new XmlDocument(); doc.PreserveWhitespace = true; XIncludingReader xir = new XIncludingReader(source, streaming); + xir.ExposeTextInclusionsAsCDATA = textAsCDATA; +// while (xir.Read()) +// { +// Console.WriteLine("{0} | {1} | {2} | {3}", xir.NodeType, xir.Name, xir.Value, xir.IsEmptyElement); +// } +// throw new Exception(); try { doc.Load(xir); @@ -255,6 +261,7 @@ /// Includes itself by url - no href - as text. /// </summary> [Test] + [ExpectedException(typeof(FatalResourceException))] public void IncludesItselfNoHrefText() { RunAndCompare("../../tests/includesitself-nohref-text.xml", "../../results/includesitself-nohref-text.xml"); |
