Got attributes and text nodes working while loading a document.

svn path=/trunk/mcs/; revision=2848

1 files changed, 51 insertions, 43 deletions

diff --git a/mcs/class/System.XML/Test/XmlDocumentTests.cs b/mcs/class/System.XML/Test/XmlDocumentTests.cs
index deeb56d1a1b..350d1db8c9c 100644
--- a/mcs/class/System.XML/Test/XmlDocumentTests.cs
+++ b/mcs/class/System.XML/Test/XmlDocumentTests.cs
@@ -1,79 +1,87 @@
 using System;
-using System.Diagnostics;
 using System.Xml;
+
 using NUnit.Framework;
 
 namespace Ximian.Mono.Tests
 {
 	public class XmlDocumentTests : TestCase
 	{
-		public XmlDocumentTests() : base("Ximian.Mono.Tests.XmlDocumentTests testsuite") { }
-		public XmlDocumentTests(string name) : base(name) { }
+		public XmlDocumentTests () : base ("Ximian.Mono.Tests.XmlDocumentTests testsuite") {}
+		public XmlDocumentTests (string name) : base (name) {}
 
 		private XmlDocument document;
 
-		protected override void SetUp()
+		protected override void SetUp ()
 		{
-			document = new XmlDocument();
+			document = new XmlDocument ();
 		}
 		
-		public void TestLoadXmlSingleElement()
+		public void TestLoadXmlSingleElement ()
 		{
-			AssertNull(document.DocumentElement);
-			document.LoadXml("<foo/>");
-			AssertNotNull(document.DocumentElement);
+			AssertNull (document.DocumentElement);
+			document.LoadXml ("<foo/>");
+			AssertNotNull (document.DocumentElement);
 
-			AssertSame(document.FirstChild, document.DocumentElement);
-			AssertSame(document.ChildNodes[0], document.DocumentElement);
+			AssertSame (document.FirstChild, document.DocumentElement);
+			AssertSame (document.ChildNodes [0], document.DocumentElement);
 		}
 
-		public void TestLoadXmlExceptionClearsDocument()
+		public void TestLoadXmlExceptionClearsDocument ()
 		{
-			document.LoadXml("<foo/>");
-			Assert(document.ChildNodes.Count > 0);
+			document.LoadXml ("<foo/>");
+			Assert (document.ChildNodes.Count > 0);
 			
-			try 
-			{
-				document.LoadXml("<123/>");
-				Fail("An XmlException should have been thrown.");
-			}
-			catch (XmlException) {}
-
-			Assert(document.ChildNodes.Count == 0);
+			try {
+				document.LoadXml ("<123/>");
+				Fail ("An XmlException should have been thrown.");
+			} catch (XmlException) {}
+
+			Assert (document.ChildNodes.Count == 0);
 		}
 
-		public void TestLoadXmlElementWithChildElement()
+		public void TestLoadXmlElementWithChildElement ()
 		{
-			document.LoadXml("<foo><bar/></foo>");
-			Assert(document.ChildNodes.Count == 1);
-			Assert(document.ChildNodes[0].ChildNodes.Count == 1);
-			AssertEquals("foo", document.DocumentElement.LocalName);
-			AssertEquals("bar", document.DocumentElement.ChildNodes[0].LocalName);
+			document.LoadXml ("<foo><bar/></foo>");
+			Assert (document.ChildNodes.Count == 1);
+			Assert (document.ChildNodes [0].ChildNodes.Count == 1);
+			AssertEquals ("foo", document.DocumentElement.LocalName);
+			AssertEquals ("bar", document.DocumentElement.ChildNodes [0].LocalName);
 		}
 
-		public void TestLoadXmlElementWithTextNode()
+		public void TestLoadXmlElementWithTextNode ()
 		{
-// XmlText isn't implemented yet and XmlDocument.CreateTextNode isn't either.
-//			document.LoadXml("<foo>bar</foo>");
-//			AssertEquals("bar", document.DocumentElement.ChildNodes[0].LocalName);
-//			Assert(document.DocumentElement.ChildNodes[0].NodeType == XmlNodeType.Text);
+			document.LoadXml ("<foo>bar</foo>");
+			Assert (document.DocumentElement.ChildNodes [0].NodeType == XmlNodeType.Text);
+			AssertEquals ("bar", document.DocumentElement.ChildNodes [0].Value);
 		}
 
-		public void TestDocumentElement()
+		public void TestDocumentElement ()
 		{
-			AssertNull(document.DocumentElement);
-			XmlElement element = document.CreateElement("foo", "bar", "http://foo/");
-			AssertNotNull(element);
+			AssertNull (document.DocumentElement);
+			XmlElement element = document.CreateElement ("foo", "bar", "http://foo/");
+			AssertNotNull (element);
+
+			AssertEquals ("foo", element.Prefix);
+			AssertEquals ("bar", element.LocalName);
+			AssertEquals ("http://foo/", element.NamespaceURI);
+
+			AssertEquals ("foo:bar", element.Name);
 
-			AssertEquals("foo", element.Prefix);
-			AssertEquals("bar", element.LocalName);
-			AssertEquals("http://foo/", element.NamespaceURI);
+			AssertSame (element, document.AppendChild (element));
 
-			AssertEquals("foo:bar", element.Name);
+			AssertSame (element, document.DocumentElement);
+		}
+
+		public void TestLoadXmlElementWithAttributes ()
+		{
+			AssertNull (document.DocumentElement);
+			document.LoadXml ("<foo bar='baz' quux='quuux'/>");
 
-			AssertSame(element, document.AppendChild(element));
+			XmlElement documentElement = document.DocumentElement;
 
-			AssertSame(element, document.DocumentElement);
+			AssertEquals ("baz", documentElement.GetAttribute ("bar"));
+			AssertEquals ("quuux", documentElement.GetAttribute ("quux"));
 		}
 	}
 }