From: Oleg T. <he...@us...> - 2005-01-03 18:38:06
|
Update of /cvsroot/mvp-xml/XInclude/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19630/v1/test Modified Files: Elliotte_Rusty_HaroldTests.cs EntryPoint.cs LTG_Edinburgh_UnivTests.cs NistTests.cs XIncludeTest.csproj Log Message: Updated Test Suite, generated tests and adjusted them. Index: XIncludeTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- XIncludeTest.csproj 18 Dec 2004 05:16:38 -0000 1.17 +++ XIncludeTest.csproj 3 Jan 2005 18:37:53 -0000 1.18 @@ -77,7 +77,7 @@ <Reference Name = "nunit.framework" AssemblyName = "nunit.framework" - HintPath = "..\..\..\..\..\Program Files\NUnit 2.2\bin\nunit.framework.dll" + HintPath = "C:\Program Files\NUnit 2.2\bin\nunit.framework.dll" AssemblyFolderKey = "hklm\dn\nunit.framework" /> <Reference @@ -90,35 +90,11 @@ AssemblyName = "System.Xml" HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> - <Reference - Name = "nunit.framework" - AssemblyName = "nunit.framework" - HintPath = "C:\Program Files\NUnit 2.2\bin\nunit.framework.dll" - AssemblyFolderKey = "hklm\dn\nunit.framework" - /> - <Reference - Name = "XInclude" - Project = "{3750FAB1-FD0E-425A-9DAA-87543A556319}" - Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" - /> </References> </Build> <Files> <Include> <File - RelPath = "book.xml" - BuildAction = "Content" - /> - <File - RelPath = "chap1.xml" - BuildAction = "Content" - /> - <File - RelPath = "SimpleTest.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Elliotte_Rusty_HaroldTests.cs" SubType = "Code" BuildAction = "Compile" @@ -323,15 +299,15 @@ BuildAction = "None" /> <File - RelPath = "XInclude-Test-Suite\testcases.dtd" + RelPath = "XInclude-Test-Suite\report.html" BuildAction = "Content" /> <File - RelPath = "XInclude-Test-Suite\testdescr.xml" + RelPath = "XInclude-Test-Suite\testcases.dtd" BuildAction = "Content" /> <File - RelPath = "XInclude-Test-Suite\w3cReport.html" + RelPath = "XInclude-Test-Suite\testdescr.xml" BuildAction = "Content" /> <File @@ -743,10 +719,6 @@ BuildAction = "Content" /> <File - RelPath = "XInclude-Test-Suite\Harold\test\.nautilus-metafile.xml" - BuildAction = "Content" - /> - <File RelPath = "XInclude-Test-Suite\Harold\test\acceptenglish.xml" BuildAction = "Content" /> @@ -1295,6 +1267,10 @@ BuildAction = "Content" /> <File + RelPath = "XInclude-Test-Suite\Harold\test\xpointerwithpercentescape.xml" + BuildAction = "Content" + /> + <File RelPath = "XInclude-Test-Suite\Harold\test\xptr2tumblertest.xml" BuildAction = "Content" /> Index: EntryPoint.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- EntryPoint.cs 22 Nov 2004 14:03:48 -0000 1.17 +++ EntryPoint.cs 3 Jan 2005 18:37:53 -0000 1.18 @@ -17,7 +17,7 @@ //XIncludeSyntaxTests rt = new XIncludeSyntaxTests(); try { - rt.Nist_include_49(); + rt.Nist_include_24(); } catch (Exception e) { Index: Elliotte_Rusty_HaroldTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/Elliotte_Rusty_HaroldTests.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Elliotte_Rusty_HaroldTests.cs 7 Nov 2004 16:46:25 -0000 1.9 +++ Elliotte_Rusty_HaroldTests.cs 3 Jan 2005 18:37:52 -0000 1.10 @@ -187,7 +187,7 @@ /// <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>We treat it as resource error</remarks> + /// <remarks>WE TREAT IT AS RESOURCE ERROR</remarks> [Test] [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_13() @@ -200,7 +200,7 @@ /// <summary> /// Syntactically incorrect IRI with an unrecognized scheme is a fatal error /// </summary> - /// <remarks>We treat it as resource error</remarks> + /// <remarks>WE TREAT IT AS RESOURCE ERROR</remarks> [Test] [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_14() @@ -985,7 +985,7 @@ XIncludeReaderTests.RunAndCompare( "http://localhost/test/EBCDIC.xml", "../../XInclude-Test-Suite/Harold/test/../result/EBCDIC.xml"); - RunAndCompare("EBCDIC.xml", "../result/EBCDIC.xml"); + RunAndCompare("EBCDIC.xml", "../result/EBCDIC.xml"); } @@ -1196,7 +1196,18 @@ RunAndCompare("badelementschemedata.xml", "../result/badelementschemedata.xml"); } + + /// <summary> + /// Since the xpointer attribute is not a URI reference, %-escaping must not appear in the XPointer, nor is there any need for a processor to apply or reverse such escaping. + /// </summary> + [Test] + [ExpectedException(typeof(FatalResourceException))] + public void harold_97() + { + RunAndCompare("xpointerwithpercentescape.xml", ""); + } + } } Index: LTG_Edinburgh_UnivTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/LTG_Edinburgh_UnivTests.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- LTG_Edinburgh_UnivTests.cs 1 Nov 2004 08:04:00 -0000 1.4 +++ LTG_Edinburgh_UnivTests.cs 3 Jan 2005 18:37:53 -0000 1.5 @@ -46,7 +46,6 @@ /// <summary> /// Verify that xi:include elements in the target have been processed in the acquired infoset, ie before the xpointer is applied. /// </summary> - /// <remarks>XIncludingReader doesn't support </remarks> [Test] public void eduni_2() { Index: NistTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/NistTests.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- NistTests.cs 22 Nov 2004 14:03:48 -0000 1.9 +++ NistTests.cs 3 Jan 2005 18:37:53 -0000 1.10 @@ -9,16 +9,16 @@ namespace Mvp.Xml.XInclude.Test { - /// <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> + /// 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. @@ -707,11 +707,6 @@ public void Nist_include_56() { RunAndCompare("nist-include-56.xml", ""); - } - - - - - - } -} + } + } +} \ No newline at end of file |