From 2f6ed89c7f222d78ba82a703f1fb86851fce64d0 Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Mon, 26 Dec 2005 13:58:20 +0000 Subject: * XmlElementTests.cs: Fixed line endings. svn path=/trunk/mcs/; revision=54847 --- mcs/class/System.XML/Test/System.Xml/ChangeLog | 4 + .../System.XML/Test/System.Xml/XmlElementTests.cs | 116 ++++++++++----------- 2 files changed, 62 insertions(+), 58 deletions(-) (limited to 'mcs/class/System.XML') diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog index 348c807cce9..9b967590c2e 100644 --- a/mcs/class/System.XML/Test/System.Xml/ChangeLog +++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog @@ -1,3 +1,7 @@ +2005-12-26 Gert Driesen + + * XmlElementTests.cs: Fixed line endings. + 2005-12-26 Gert Driesen * XmlTextWriterTests.cs: Renamed tests to avoid ambiguity, and diff --git a/mcs/class/System.XML/Test/System.Xml/XmlElementTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlElementTests.cs index 918ef60c730..07ef8032e12 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlElementTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlElementTests.cs @@ -234,61 +234,61 @@ namespace MonoTests.System.Xml [Test] public void GetElementsByTagNameNs2 () { - document.LoadXml (@" - - - - - text node - - - - "); - // id='b' has different prefix. Should not caught by (name), - // while should caught by (name, ns). - XmlNodeList nl = document.DocumentElement.GetElementsByTagName ("x:a"); - AssertEquals (2, nl.Count); - AssertEquals ("a", nl [0].Attributes ["id"].Value); - AssertEquals ("c", nl [1].Attributes ["id"].Value); - - nl = document.DocumentElement.GetElementsByTagName ("a", "urn:foo"); - AssertEquals (3, nl.Count); - AssertEquals ("a", nl [0].Attributes ["id"].Value); - AssertEquals ("b", nl [1].Attributes ["id"].Value); - AssertEquals ("c", nl [2].Attributes ["id"].Value); + document.LoadXml (@" + + + + + text node + + + + "); + // id='b' has different prefix. Should not caught by (name), + // while should caught by (name, ns). + XmlNodeList nl = document.DocumentElement.GetElementsByTagName ("x:a"); + AssertEquals (2, nl.Count); + AssertEquals ("a", nl [0].Attributes ["id"].Value); + AssertEquals ("c", nl [1].Attributes ["id"].Value); + + nl = document.DocumentElement.GetElementsByTagName ("a", "urn:foo"); + AssertEquals (3, nl.Count); + AssertEquals ("a", nl [0].Attributes ["id"].Value); + AssertEquals ("b", nl [1].Attributes ["id"].Value); + AssertEquals ("c", nl [2].Attributes ["id"].Value); // name wildcard - nl = document.DocumentElement.GetElementsByTagName ("*"); - AssertEquals (5, nl.Count); - AssertEquals ("a", nl [0].Attributes ["id"].Value); - AssertEquals ("b", nl [1].Attributes ["id"].Value); - AssertEquals ("c", nl [2].Attributes ["id"].Value); - AssertEquals ("d", nl [3].Attributes ["id"].Value); - AssertEquals ("e", nl [4].Attributes ["id"].Value); + nl = document.DocumentElement.GetElementsByTagName ("*"); + AssertEquals (5, nl.Count); + AssertEquals ("a", nl [0].Attributes ["id"].Value); + AssertEquals ("b", nl [1].Attributes ["id"].Value); + AssertEquals ("c", nl [2].Attributes ["id"].Value); + AssertEquals ("d", nl [3].Attributes ["id"].Value); + AssertEquals ("e", nl [4].Attributes ["id"].Value); // wildcard - local and ns - nl = document.DocumentElement.GetElementsByTagName ("*", "*"); - AssertEquals (5, nl.Count); - AssertEquals ("a", nl [0].Attributes ["id"].Value); - AssertEquals ("b", nl [1].Attributes ["id"].Value); - AssertEquals ("c", nl [2].Attributes ["id"].Value); - AssertEquals ("d", nl [3].Attributes ["id"].Value); - AssertEquals ("e", nl [4].Attributes ["id"].Value); + nl = document.DocumentElement.GetElementsByTagName ("*", "*"); + AssertEquals (5, nl.Count); + AssertEquals ("a", nl [0].Attributes ["id"].Value); + AssertEquals ("b", nl [1].Attributes ["id"].Value); + AssertEquals ("c", nl [2].Attributes ["id"].Value); + AssertEquals ("d", nl [3].Attributes ["id"].Value); + AssertEquals ("e", nl [4].Attributes ["id"].Value); // namespace wildcard - namespace - nl = document.DocumentElement.GetElementsByTagName ("*", "urn:foo"); - AssertEquals (4, nl.Count); - AssertEquals ("a", nl [0].Attributes ["id"].Value); - AssertEquals ("b", nl [1].Attributes ["id"].Value); - AssertEquals ("c", nl [2].Attributes ["id"].Value); - AssertEquals ("e", nl [3].Attributes ["id"].Value); + nl = document.DocumentElement.GetElementsByTagName ("*", "urn:foo"); + AssertEquals (4, nl.Count); + AssertEquals ("a", nl [0].Attributes ["id"].Value); + AssertEquals ("b", nl [1].Attributes ["id"].Value); + AssertEquals ("c", nl [2].Attributes ["id"].Value); + AssertEquals ("e", nl [3].Attributes ["id"].Value); // namespace wildcard - local only. I dare say, such usage is not XML-ish! - nl = document.DocumentElement.GetElementsByTagName ("a", "*"); - AssertEquals (3, nl.Count); - AssertEquals ("a", nl [0].Attributes ["id"].Value); - AssertEquals ("b", nl [1].Attributes ["id"].Value); - AssertEquals ("c", nl [2].Attributes ["id"].Value); + nl = document.DocumentElement.GetElementsByTagName ("a", "*"); + AssertEquals (3, nl.Count); + AssertEquals ("a", nl [0].Attributes ["id"].Value); + AssertEquals ("b", nl [1].Attributes ["id"].Value); + AssertEquals ("c", nl [2].Attributes ["id"].Value); } [Test] @@ -512,17 +512,17 @@ namespace MonoTests.System.Xml [Test] public void WriteToMakesNonsenseForDefaultNSChildren () { - XmlDocument d = new XmlDocument (); - XmlElement x = d.CreateElement ("root"); - d.AppendChild (x); - XmlElement a = d.CreateElement ("a"); - XmlElement b = d.CreateElement ("b"); - b.SetAttribute ("xmlns","probe"); - x.AppendChild (a); - x.AppendChild (b); - XmlElement b2 = d.CreateElement ("p2", "b2", ""); - b.AppendChild (b2); - AssertEquals ("", d.OuterXml); + XmlDocument d = new XmlDocument (); + XmlElement x = d.CreateElement ("root"); + d.AppendChild (x); + XmlElement a = d.CreateElement ("a"); + XmlElement b = d.CreateElement ("b"); + b.SetAttribute ("xmlns","probe"); + x.AppendChild (a); + x.AppendChild (b); + XmlElement b2 = d.CreateElement ("p2", "b2", ""); + b.AppendChild (b2); + AssertEquals ("", d.OuterXml); } [Test] -- cgit v1.2.3