Work on XmlDocument and XmlTextWriter

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

1 files changed, 35 insertions, 73 deletions

diff --git a/mcs/class/System.XML/Test/XmlDocumentTests.cs b/mcs/class/System.XML/Test/XmlDocumentTests.cs
index 7c0bcf3a2a7..62035ed6442 100644
--- a/mcs/class/System.XML/Test/XmlDocumentTests.cs
+++ b/mcs/class/System.XML/Test/XmlDocumentTests.cs
@@ -17,70 +17,43 @@ namespace Ximian.Mono.Tests
 			document = new XmlDocument ();
 		}
 
-		public void TestCreateProcessingInstructionInvalid()
+		public void TestDocumentElement ()
 		{
-			XmlProcessingInstruction processingInstruction;
-//			string outerXml;
-
-			// A newly created node should/shouldn't? have a parent or a documentelement?
-			// need to make a test to find out.
-
+			AssertNull (document.DocumentElement);
+			XmlElement element = document.CreateElement ("foo", "bar", "http://foo/");
+			AssertNotNull (element);
 
-			// Invalid contents doesn't fail on the create but will on methods
-			// like OuterXml.
+			AssertEquals ("foo", element.Prefix);
+			AssertEquals ("bar", element.LocalName);
+			AssertEquals ("http://foo/", element.NamespaceURI);
 
-//			processingInstruction = null;
-//			processingInstruction = document.CreateProcessingInstruction("foo", "bar?>baz");
-//			Assert(processingInstruction != null);
-//			document.AppendChild(processingInstruction);
-//			try {
-//				outerXml = document.OuterXml;
-//				Fail("Should have thrown an ArgumentException.");
-//			} catch (ArgumentException) { }
-			
-			processingInstruction = null;
-			processingInstruction = document.CreateProcessingInstruction("foo", "bar?>baz");
-			Assert(processingInstruction != null);
-			
-			processingInstruction = null;
-			processingInstruction = document.CreateProcessingInstruction("XML", "bar");
-			Assert(processingInstruction != null);
-			
-			processingInstruction = null;
-			processingInstruction = document.CreateProcessingInstruction("xml", "bar");
-			Assert(processingInstruction != null);
+			AssertEquals ("foo:bar", element.Name);
 
-			try {
-				Fail("Should have thrown an Exception.");
-			}
-			catch (Exception e) {
-				string billy = e.Message;
-			}
+			AssertSame (element, document.AppendChild (element));
 
+			AssertSame (element, document.DocumentElement);
 		}
 
-
-		public void TestLoadProcessingInstruction ()
+		public void TestDocumentEmpty()
 		{
-			document.LoadXml (@"<?foo bar='baaz' quux='quuux'?><quuuux></quuuux>");
-			// Not sure where this goes in a doc yet...
+			AssertEquals ("Incorrect output for empty document.", "", document.OuterXml);
 		}
 
-		public void TestLoadCDATA ()
+		public void TestLoadXmlCDATA ()
 		{
 			document.LoadXml ("<foo><![CDATA[bar]]></foo>");
 			Assert (document.DocumentElement.FirstChild.NodeType == XmlNodeType.CDATA);
 			AssertEquals ("bar", document.DocumentElement.FirstChild.Value);
 		}
 
-		public void TestLoadComment()
+		public void TestLoadXMLComment()
 		{
 			document.LoadXml ("<foo><!--Comment--></foo>");
 			Assert (document.DocumentElement.FirstChild.NodeType == XmlNodeType.Comment);
 			AssertEquals ("Comment", document.DocumentElement.FirstChild.Value);
 		}
 
-		public void TestLoadXmlSingleElement ()
+		public void TestLoadXmlElementSingle ()
 		{
 			AssertNull (document.DocumentElement);
 			document.LoadXml ("<foo/>");
@@ -90,19 +63,16 @@ namespace Ximian.Mono.Tests
 			AssertSame (document.FirstChild, document.DocumentElement);
 		}
 
-		public void TestLoadXmlExceptionClearsDocument ()
+		public void TestLoadXmlElementWithAttributes ()
 		{
-			document.LoadXml ("<foo/>");
-			Assert (document.FirstChild != null);
-			
-			try {
-				document.LoadXml ("<123/>");
-				Fail ("An XmlException should have been thrown.");
-			} catch (XmlException) {}
+			AssertNull (document.DocumentElement);
+			document.LoadXml ("<foo bar='baz' quux='quuux'/>");
 
-			Assert (document.FirstChild == null);
-		}
+			XmlElement documentElement = document.DocumentElement;
 
+			AssertEquals ("baz", documentElement.GetAttribute ("bar"));
+			AssertEquals ("quuux", documentElement.GetAttribute ("quux"));
+		}
 		public void TestLoadXmlElementWithChildElement ()
 		{
 			document.LoadXml ("<foo><bar/></foo>");
@@ -119,32 +89,24 @@ namespace Ximian.Mono.Tests
 			AssertEquals ("bar", document.DocumentElement.FirstChild.Value);
 		}
 
-		public void TestDocumentElement ()
+		public void TestLoadXmlExceptionClearsDocument ()
 		{
-			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);
-
-			AssertSame (element, document.AppendChild (element));
+			document.LoadXml ("<foo/>");
+			Assert (document.FirstChild != null);
+			
+			try {
+				document.LoadXml ("<123/>");
+				Fail ("An XmlException should have been thrown.");
+			} catch (XmlException) {}
 
-			AssertSame (element, document.DocumentElement);
+			Assert (document.FirstChild == null);
 		}
 
-		public void TestLoadXmlElementWithAttributes ()
+		public void TestLoadXmlProcessingInstruction ()
 		{
-			AssertNull (document.DocumentElement);
-			document.LoadXml ("<foo bar='baz' quux='quuux'/>");
-
-			XmlElement documentElement = document.DocumentElement;
-
-			AssertEquals ("baz", documentElement.GetAttribute ("bar"));
-			AssertEquals ("quuux", documentElement.GetAttribute ("quux"));
+			document.LoadXml (@"<?foo bar='baaz' quux='quuux'?><quuuux></quuuux>");
+			AssertEquals ("Incorrect target.", "foo", ((XmlProcessingInstruction)document.FirstChild).Target);
+			AssertEquals ("Incorrect data.", "bar='baaz' quux='quuux'", ((XmlProcessingInstruction)document.FirstChild).Data);
 		}
 	}
 }