InnerXml, OuterXml, WriteContentTo, and WriteTo for most XmlNode derivatives.

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

1 files changed, 48 insertions, 35 deletions

diff --git a/mcs/class/System.XML/Test/XmlCommentTests.cs b/mcs/class/System.XML/Test/XmlCommentTests.cs
index 35f3afd0ba0..f3602699e8a 100755
--- a/mcs/class/System.XML/Test/XmlCommentTests.cs
+++ b/mcs/class/System.XML/Test/XmlCommentTests.cs
@@ -22,73 +22,86 @@ namespace Ximian.Mono.Tests
 		XmlNode deep;
 		XmlNode shallow;
 
-		public XmlCommentTests ()
-			: base ("Ximian.Mono.Tests.XmlCommentTests testsuite")
-		{
-		}
+		public XmlCommentTests () : base ("Ximian.Mono.Tests.XmlCommentTests testsuite") {}
 
-		public XmlCommentTests (string name)
-			: base (name)
-		{
-		}
+		public XmlCommentTests (string name) : base (name) {}
 
 		protected override void SetUp ()
 		{
 			document = new XmlDocument ();
-			document.LoadXml ("<root><foo></foo></root>");
-			comment = document.CreateComment ("Comment");
 		}
 
-		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
+		public void TestXmlCommentCloneNode ()
 		{
-//			assertequals (original.nodetype + " was incorrectly cloned.",
-//				      original.baseuri, cloned.baseuri);			
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			original = comment;
 
-			AssertNull (cloned.ParentNode);
+			shallow = comment.CloneNode (false); // shallow
+			TestXmlNodeBaseProperties (original, shallow);
+			
+			deep = comment.CloneNode (true); // deep
+			TestXmlNodeBaseProperties (original, deep);
 			AssertEquals ("Value incorrectly cloned",
-				      original.Value, cloned.Value);
+				original.Value, deep.Value);
 
-                        Assert ("Copies, not pointers", !Object.ReferenceEquals (original,cloned));
+			AssertEquals ("deep cloning differs from shallow cloning",
+				deep.OuterXml, shallow.OuterXml);
 		}
-	       
-		public void TestXmlCommentName ()
+
+		public void TestXmlCommentInnerAndOuterXml ()
 		{
-			AssertEquals (comment.NodeType + " Name property broken",
-				      comment.Name, "#comment");
+			comment = document.CreateComment ("foo");
+			AssertEquals (String.Empty, comment.InnerXml);
+			AssertEquals ("<!--foo-->", comment.OuterXml);
+		}
+
+		public void TestXmlCommentIsReadOnly ()
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			AssertEquals ("XmlComment IsReadOnly property broken",
+				comment.IsReadOnly, false);
 		}
 
 		public void TestXmlCommentLocalName ()
 		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
 			AssertEquals (comment.NodeType + " LocalName property broken",
 				      comment.LocalName, "#comment");
 		}
 
+		public void TestXmlCommentName ()
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			AssertEquals (comment.NodeType + " Name property broken",
+				comment.Name, "#comment");
+		}
+
 		public void TestXmlCommentNodeType ()
 		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
 			AssertEquals ("XmlComment NodeType property broken",
 				      comment.NodeType.ToString (), "Comment");
 		}
 
-		public void TestXmlCommentIsReadOnly ()
+		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
 		{
-			AssertEquals ("XmlComment IsReadOnly property broken",
-				      comment.IsReadOnly, false);
-		}
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
 
-		public void TestXmlCommentCloneNode ()
-		{
-			original = comment;
+			//			assertequals (original.nodetype + " was incorrectly cloned.",
+			//				      original.baseuri, cloned.baseuri);			
 
-			shallow = comment.CloneNode (false); // shallow
-			TestXmlNodeBaseProperties (original, shallow);
-			
-			deep = comment.CloneNode (true); // deep
-			TestXmlNodeBaseProperties (original, deep);
+			AssertNull (cloned.ParentNode);
 			AssertEquals ("Value incorrectly cloned",
-				       original.Value, deep.Value);
+				original.Value, cloned.Value);
 
-                        AssertEquals ("deep cloning differs from shallow cloning",
-				      deep.OuterXml, shallow.OuterXml);
+			Assert ("Copies, not pointers", !Object.ReferenceEquals (original,cloned));
 		}
+       
 	}
 }