2009-06-26 Robert Jordan <robertj@gmx.net>
[mono.git] / mcs / class / System.XML / Test / System.Xml / XmlReaderCommonTests.cs
index 41f1534873f371c5e66fa26fb1c87455b277579b..c0f3096bd0321f49d37a797f75179eb8a9e12ff3 100644 (file)
@@ -21,7 +21,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Xml\r
 {\r
        [TestFixture]\r
-       public class XmlReaderTests : Assertion\r
+       public class XmlReaderTests\r
        {\r
                [SetUp]\r
                public void GetReady ()\r
@@ -41,10 +41,10 @@ namespace MonoTests.System.Xml
                // copy from XmlTextReaderTests\r
                private void AssertStartDocument (XmlReader xmlReader)\r
                {\r
-                       Assert (xmlReader.ReadState == ReadState.Initial);\r
-                       Assert (xmlReader.NodeType == XmlNodeType.None);\r
-                       Assert (xmlReader.Depth == 0);\r
-                       Assert (!xmlReader.EOF);\r
+                       Assert.IsTrue (xmlReader.ReadState == ReadState.Initial);\r
+                       Assert.IsTrue (xmlReader.NodeType == XmlNodeType.None);\r
+                       Assert.IsTrue (xmlReader.Depth == 0);\r
+                       Assert.IsTrue (!xmlReader.EOF);\r
                }\r
 \r
                private void AssertNode (\r
@@ -77,9 +77,9 @@ namespace MonoTests.System.Xml
                        string value,\r
                        int attributeCount)\r
                {\r
-                       Assert (label + " Read() return value", xmlReader.Read ());\r
-                       Assert (label + " ReadState", xmlReader.ReadState == ReadState.Interactive);\r
-                       Assert (label + " !EOF", !xmlReader.EOF);\r
+                       Assert.IsTrue (xmlReader.Read (), label + " Read() return value");\r
+                       Assert.IsTrue (xmlReader.ReadState == ReadState.Interactive, label + " ReadState");\r
+                       Assert.IsTrue (!xmlReader.EOF, label + " !EOF");\r
                        AssertNodeValues (label, xmlReader, nodeType, depth,\r
                                isEmptyElement, name, prefix, localName,\r
                                namespaceURI, value, value != String.Empty,\r
@@ -121,26 +121,26 @@ namespace MonoTests.System.Xml
                        bool hasAttributes)\r
                {\r
                        label = String.Concat (label, "(", xmlReader.GetType ().Name, ")");\r
-                       AssertEquals (label + ": NodeType", nodeType, xmlReader.NodeType);\r
-                       AssertEquals (label + ": IsEmptyElement", isEmptyElement, xmlReader.IsEmptyElement);\r
+                       Assert.AreEqual (nodeType, xmlReader.NodeType, label + ": NodeType");\r
+                       Assert.AreEqual (isEmptyElement, xmlReader.IsEmptyElement, label + ": IsEmptyElement");\r
 \r
-                       AssertEquals (label + ": name", name, xmlReader.Name);\r
+                       Assert.AreEqual (name, xmlReader.Name, label + ": name");\r
 \r
-                       AssertEquals (label + ": prefix", prefix, xmlReader.Prefix);\r
+                       Assert.AreEqual (prefix, xmlReader.Prefix, label + ": prefix");\r
 \r
-                       AssertEquals (label + ": localName", localName, xmlReader.LocalName);\r
+                       Assert.AreEqual (localName, xmlReader.LocalName, label + ": localName");\r
 \r
-                       AssertEquals (label + ": namespaceURI", namespaceURI, xmlReader.NamespaceURI);\r
+                       Assert.AreEqual (namespaceURI, xmlReader.NamespaceURI, label + ": namespaceURI");\r
 \r
-                       AssertEquals (label + ": Depth", depth, xmlReader.Depth);\r
+                       Assert.AreEqual (depth, xmlReader.Depth, label + ": Depth");\r
 \r
-                       AssertEquals (label + ": hasValue", hasValue, xmlReader.HasValue);\r
+                       Assert.AreEqual (hasValue, xmlReader.HasValue, label + ": hasValue");\r
 \r
-                       AssertEquals (label + ": Value", value, xmlReader.Value);\r
+                       Assert.AreEqual (value, xmlReader.Value, label + ": Value");\r
 \r
-                       AssertEquals (label + ": hasAttributes", hasAttributes, xmlReader.HasAttributes);\r
+                       Assert.AreEqual (hasAttributes, xmlReader.HasAttributes, label + ": hasAttributes");\r
 \r
-                       AssertEquals (label + ": attributeCount", attributeCount, xmlReader.AttributeCount);\r
+                       Assert.AreEqual (attributeCount, xmlReader.AttributeCount, label + ": attributeCount");\r
                }\r
 \r
                private void AssertAttribute (\r
@@ -151,26 +151,26 @@ namespace MonoTests.System.Xml
                        string namespaceURI,\r
                        string value)\r
                {\r
-                       AssertEquals ("value", value, xmlReader [name]);\r
+                       Assert.AreEqual (value, xmlReader [name], "value");\r
 \r
-                       Assert (xmlReader.GetAttribute (name) == value);\r
+                       Assert.IsTrue (xmlReader.GetAttribute (name) == value);\r
 \r
                        if (namespaceURI != String.Empty) {\r
-                               Assert (xmlReader[localName, namespaceURI] == value);\r
-                               Assert (xmlReader.GetAttribute (localName, namespaceURI) == value);\r
+                               Assert.IsTrue (xmlReader[localName, namespaceURI] == value);\r
+                               Assert.IsTrue (xmlReader.GetAttribute (localName, namespaceURI) == value);\r
                        }\r
                }\r
 \r
                private void AssertEndDocument (XmlReader xmlReader)\r
                {\r
-                       Assert ("could read", !xmlReader.Read ());\r
-                       AssertEquals ("NodeType is not XmlNodeType.None", XmlNodeType.None, xmlReader.NodeType);\r
-                       AssertEquals ("Depth is not 0", 0, xmlReader.Depth);\r
-                       AssertEquals ("ReadState is not ReadState.EndOfFile",  ReadState.EndOfFile, xmlReader.ReadState);\r
-                       Assert ("not EOF", xmlReader.EOF);\r
+                       Assert.IsTrue (!xmlReader.Read (), "could read");\r
+                       Assert.AreEqual (XmlNodeType.None, xmlReader.NodeType, "NodeType is not XmlNodeType.None");\r
+                       Assert.AreEqual (0, xmlReader.Depth, "Depth is not 0");\r
+                       Assert.AreEqual (ReadState.EndOfFile, xmlReader.ReadState, "ReadState is not ReadState.EndOfFile");\r
+                       Assert.IsTrue (xmlReader.EOF, "not EOF");\r
 \r
                        xmlReader.Close ();\r
-                       AssertEquals ("ReadState is not ReadState.Cosed", ReadState.Closed, xmlReader.ReadState);\r
+                       Assert.AreEqual (ReadState.Closed, xmlReader.ReadState, "ReadState is not ReadState.Cosed");\r
                }\r
 \r
                private delegate void TestMethod (XmlReader reader);\r
@@ -219,13 +219,13 @@ namespace MonoTests.System.Xml
 \r
                private void InitialState (XmlReader reader)\r
                {\r
-                       AssertEquals ("Depth", 0, reader.Depth);\r
-                       AssertEquals ("EOF", false, reader.EOF);\r
-                       AssertEquals ("HasValue", false, reader.HasValue);\r
-                       AssertEquals ("IsEmptyElement", false, reader.IsEmptyElement);\r
-                       AssertEquals ("LocalName", String.Empty, reader.LocalName);\r
-                       AssertEquals ("NodeType", XmlNodeType.None, reader.NodeType);\r
-                       AssertEquals ("ReadState", ReadState.Initial, reader.ReadState);\r
+                       Assert.AreEqual (0, reader.Depth, "Depth");\r
+                       Assert.AreEqual (false, reader.EOF, "EOF");\r
+                       Assert.AreEqual (false, reader.HasValue, "HasValue");\r
+                       Assert.AreEqual (false, reader.IsEmptyElement, "IsEmptyElement");\r
+                       Assert.AreEqual (String.Empty, reader.LocalName, "LocalName");\r
+                       Assert.AreEqual (XmlNodeType.None, reader.NodeType, "NodeType");\r
+                       Assert.AreEqual (ReadState.Initial, reader.ReadState, "ReadState");\r
                }\r
 \r
                [Test]\r
@@ -237,25 +237,25 @@ namespace MonoTests.System.Xml
                public void Read (XmlReader reader)\r
                {\r
                        reader.Read ();\r
-                       AssertEquals ("<root>.NodeType", XmlNodeType.Element, reader.NodeType);\r
-                       AssertEquals ("<root>.Name", "root", reader.Name);\r
-                       AssertEquals ("<root>.ReadState", ReadState.Interactive, reader.ReadState);\r
-                       AssertEquals ("<root>.Depth", 0, reader.Depth);\r
+                       Assert.AreEqual (XmlNodeType.Element, reader.NodeType, "<root>.NodeType");\r
+                       Assert.AreEqual ("root", reader.Name, "<root>.Name");\r
+                       Assert.AreEqual (ReadState.Interactive, reader.ReadState, "<root>.ReadState");\r
+                       Assert.AreEqual (0, reader.Depth, "<root>.Depth");\r
 \r
                        // move to 'child'\r
                        reader.Read ();\r
-                       AssertEquals ("<child/>.Depth", 1, reader.Depth);\r
-                       AssertEquals ("<child/>.NodeType", XmlNodeType.Element, reader.NodeType);\r
-                       AssertEquals ("<child/>.Name", "child", reader.Name);\r
+                       Assert.AreEqual (1, reader.Depth, "<child/>.Depth");\r
+                       Assert.AreEqual (XmlNodeType.Element, reader.NodeType, "<child/>.NodeType");\r
+                       Assert.AreEqual ("child", reader.Name, "<child/>.Name");\r
 \r
                        reader.Read ();\r
-                       AssertEquals ("</root>.Depth", 0, reader.Depth);\r
-                       AssertEquals ("</root>.NodeType", XmlNodeType.EndElement, reader.NodeType);\r
-                       AssertEquals ("</root>.Name", "root", reader.Name);\r
+                       Assert.AreEqual (0, reader.Depth, "</root>.Depth");\r
+                       Assert.AreEqual (XmlNodeType.EndElement, reader.NodeType, "</root>.NodeType");\r
+                       Assert.AreEqual ("root", reader.Name, "</root>.Name");\r
 \r
                        reader.Read ();\r
-                       AssertEquals ("end.EOF", true, reader.EOF);\r
-                       AssertEquals ("end.NodeType", XmlNodeType.None, reader.NodeType);\r
+                       Assert.AreEqual (true, reader.EOF, "end.EOF");\r
+                       Assert.AreEqual (XmlNodeType.None, reader.NodeType, "end.NodeType");\r
                }\r
 \r
                [Test]\r
@@ -268,19 +268,19 @@ namespace MonoTests.System.Xml
                public void ReadAttributeValue (XmlReader reader)\r
                {\r
                        reader.Read (); // root\r
-                       Assert (reader.MoveToFirstAttribute ());\r
+                       Assert.IsTrue (reader.MoveToFirstAttribute ());\r
                        // It looks like that MS.NET shows AttributeCount and\r
                        // HasAttributes as the same as element node!\r
                        this.AssertNodeValues ("#1",\r
                                reader, XmlNodeType.Attribute,\r
                                1, false, "attr", "", "attr", "", "", true, 1, true);\r
-                       Assert (reader.ReadAttributeValue ());\r
+                       Assert.IsTrue (reader.ReadAttributeValue ());\r
                        // MS.NET XmlTextReader fails. Its Prefix returns \r
                        // null instead of "". It is fixed in MS.NET 2.0.\r
                        this.AssertNodeValues ("#2",\r
                                reader, XmlNodeType.Text,\r
                                2, false, "", "", "", "", "", true, 1, true);\r
-                       Assert (reader.MoveToElement ());\r
+                       Assert.IsTrue (reader.MoveToElement ());\r
                        this.AssertNodeValues ("#3",\r
                                reader, XmlNodeType.Element,\r
                                0, true, "root", "", "root", "", "", false, 1, true);\r
@@ -295,13 +295,13 @@ namespace MonoTests.System.Xml
                public void ReadEmptyElement (XmlReader reader)\r
                {\r
                        reader.Read (); // root\r
-                       AssertEquals (false, reader.IsEmptyElement);\r
+                       Assert.AreEqual (false, reader.IsEmptyElement);\r
                        reader.Read (); // foo\r
-                       AssertEquals ("foo", reader.Name);\r
-                       AssertEquals (true, reader.IsEmptyElement);\r
+                       Assert.AreEqual ("foo", reader.Name);\r
+                       Assert.AreEqual (true, reader.IsEmptyElement);\r
                        reader.Read (); // bar\r
-                       AssertEquals ("bar", reader.Name);\r
-                       AssertEquals (false, reader.IsEmptyElement);\r
+                       Assert.AreEqual ("bar", reader.Name);\r
+                       Assert.AreEqual (false, reader.IsEmptyElement);\r
                }\r
 \r
                [Test]\r
@@ -320,20 +320,20 @@ namespace MonoTests.System.Xml
 \r
                        reader.Read ();\r
                        string s = reader.ReadString ();\r
-                       AssertEquals ("readString.1.ret_val", "  test of ", s);\r
-                       AssertEquals ("readString.1.Name", "b", reader.Name);\r
+                       Assert.AreEqual ("  test of ", s, "readString.1.ret_val");\r
+                       Assert.AreEqual ("b", reader.Name, "readString.1.Name");\r
                        s = reader.ReadString ();\r
-                       AssertEquals ("readString.2.ret_val", "mixed", s);\r
-                       AssertEquals ("readString.2.NodeType", XmlNodeType.EndElement, reader.NodeType);\r
+                       Assert.AreEqual ("mixed", s, "readString.2.ret_val");\r
+                       Assert.AreEqual (XmlNodeType.EndElement, reader.NodeType, "readString.2.NodeType");\r
                        s = reader.ReadString ();       // never proceeds.\r
-                       AssertEquals ("readString.3.ret_val", String.Empty, s);\r
-                       AssertEquals ("readString.3.NodeType", XmlNodeType.EndElement, reader.NodeType);\r
+                       Assert.AreEqual (String.Empty, s, "readString.3.ret_val");\r
+                       Assert.AreEqual (XmlNodeType.EndElement, reader.NodeType, "readString.3.NodeType");\r
                        reader.Read ();\r
-                       AssertEquals ("readString.4.NodeType", XmlNodeType.Text, reader.NodeType);\r
-                       AssertEquals ("readString.4.Value", " string.", reader.Value);\r
+                       Assert.AreEqual (XmlNodeType.Text, reader.NodeType, "readString.4.NodeType");\r
+                       Assert.AreEqual (" string.", reader.Value, "readString.4.Value");\r
                        s = reader.ReadString ();       // reads the same Text node.\r
-                       AssertEquals ("readString.5.ret_val", " string. cdata string.", s);\r
-                       AssertEquals ("readString.5.NodeType", XmlNodeType.EndElement, reader.NodeType);\r
+                       Assert.AreEqual (" string. cdata string.", s, "readString.5.ret_val");\r
+                       Assert.AreEqual (XmlNodeType.EndElement, reader.NodeType, "readString.5.NodeType");\r
                }\r
 \r
                [Test]\r
@@ -347,13 +347,13 @@ namespace MonoTests.System.Xml
                {\r
                        reader.Read ();\r
                        reader.Read ();\r
-                       AssertEquals ("initial.ReadState", ReadState.Interactive, reader.ReadState);\r
-                       AssertEquals ("initial.EOF", false, reader.EOF);\r
-                       AssertEquals ("initial.NodeType", XmlNodeType.Element, reader.NodeType);\r
+                       Assert.AreEqual (ReadState.Interactive, reader.ReadState, "initial.ReadState");\r
+                       Assert.AreEqual (false, reader.EOF, "initial.EOF");\r
+                       Assert.AreEqual (XmlNodeType.Element, reader.NodeType, "initial.NodeType");\r
                        string s = reader.ReadInnerXml ();\r
-                       AssertEquals ("read_all", "test of <b>mixed</b> string.", s);\r
-                       AssertEquals ("after.Name", "bar", reader.Name);\r
-                       AssertEquals ("after.NodeType", XmlNodeType.Element, reader.NodeType);\r
+                       Assert.AreEqual ("test of <b>mixed</b> string.", s, "read_all");\r
+                       Assert.AreEqual ("bar", reader.Name, "after.Name");\r
+                       Assert.AreEqual (XmlNodeType.Element, reader.NodeType, "after.NodeType");\r
                }\r
 \r
 \r
@@ -910,7 +910,7 @@ namespace MonoTests.System.Xml
                                "http://foo/" // value\r
                        );\r
 \r
-                       AssertEquals ("http://foo/", xmlReader.LookupNamespace (String.Empty));\r
+                       Assert.AreEqual ("http://foo/", xmlReader.LookupNamespace (String.Empty));\r
 \r
                        AssertEndDocument (xmlReader);\r
                }\r
@@ -948,7 +948,7 @@ namespace MonoTests.System.Xml
                                "http://foo/" // value\r
                        );\r
 \r
-                       AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
+                       Assert.AreEqual ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
 \r
                        AssertNode (\r
                                xmlReader, // xmlReader\r
@@ -972,8 +972,8 @@ namespace MonoTests.System.Xml
                                "http://baz/" // value\r
                        );\r
 \r
-                       AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
-                       AssertEquals ("http://baz/", xmlReader.LookupNamespace ("baz"));\r
+                       Assert.AreEqual ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
+                       Assert.AreEqual ("http://baz/", xmlReader.LookupNamespace ("baz"));\r
 \r
                        AssertNode (\r
                                xmlReader, // xmlReader\r
@@ -988,8 +988,8 @@ namespace MonoTests.System.Xml
                                0 // attributeCount\r
                        );\r
 \r
-                       AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
-                       AssertNull (xmlReader.LookupNamespace ("baz"));\r
+                       Assert.AreEqual ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
+                       Assert.IsNull (xmlReader.LookupNamespace ("baz"));\r
 \r
                        AssertEndDocument (xmlReader);\r
                }\r
@@ -1027,7 +1027,7 @@ namespace MonoTests.System.Xml
                                "http://foo/" // value\r
                        );\r
 \r
-                       AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
+                       Assert.AreEqual ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
 \r
                        AssertNode (\r
                                xmlReader, // xmlReader\r
@@ -1051,8 +1051,8 @@ namespace MonoTests.System.Xml
                                "http://baz/" // value\r
                        );\r
 \r
-                       AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
-                       AssertEquals ("http://baz/", xmlReader.LookupNamespace (String.Empty));\r
+                       Assert.AreEqual ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
+                       Assert.AreEqual ("http://baz/", xmlReader.LookupNamespace (String.Empty));\r
 \r
                        AssertNode (\r
                                xmlReader, // xmlReader\r
@@ -1067,7 +1067,7 @@ namespace MonoTests.System.Xml
                                0 // attributeCount\r
                        );\r
 \r
-                       AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
+                       Assert.AreEqual ("http://foo/", xmlReader.LookupNamespace ("foo"));\r
 \r
                        AssertEndDocument (xmlReader);\r
                }\r
@@ -1114,7 +1114,7 @@ namespace MonoTests.System.Xml
                                "http://bar/" // value\r
                        );\r
 \r
-                       AssertEquals ("http://bar/", xmlReader.LookupNamespace ("bar"));\r
+                       Assert.AreEqual ("http://bar/", xmlReader.LookupNamespace ("bar"));\r
 \r
                        AssertEndDocument (xmlReader);\r
                }\r
@@ -1128,12 +1128,12 @@ namespace MonoTests.System.Xml
 \r
                public void MoveToElementFromAttribute (XmlReader xmlReader)\r
                {\r
-                       Assert (xmlReader.Read ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
-                       Assert (xmlReader.MoveToFirstAttribute ());\r
-                       AssertEquals (XmlNodeType.Attribute, xmlReader.NodeType);\r
-                       Assert (xmlReader.MoveToElement ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (xmlReader.Read ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (xmlReader.MoveToFirstAttribute ());\r
+                       Assert.AreEqual (XmlNodeType.Attribute, xmlReader.NodeType);\r
+                       Assert.IsTrue (xmlReader.MoveToElement ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
                }\r
 \r
                [Test]\r
@@ -1145,10 +1145,10 @@ namespace MonoTests.System.Xml
 \r
                public void MoveToElementFromElement (XmlReader xmlReader)\r
                {\r
-                       Assert (xmlReader.Read ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
-                       Assert (!xmlReader.MoveToElement ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (xmlReader.Read ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (!xmlReader.MoveToElement ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
                }\r
 \r
                [Test]\r
@@ -1160,10 +1160,10 @@ namespace MonoTests.System.Xml
 \r
                public void MoveToFirstAttributeWithNoAttributes (XmlReader xmlReader)\r
                {\r
-                       Assert (xmlReader.Read ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
-                       Assert (!xmlReader.MoveToFirstAttribute ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (xmlReader.Read ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (!xmlReader.MoveToFirstAttribute ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
                }\r
 \r
                [Test]\r
@@ -1175,10 +1175,10 @@ namespace MonoTests.System.Xml
 \r
                public void MoveToNextAttributeWithNoAttributes (XmlReader xmlReader)\r
                {\r
-                       Assert (xmlReader.Read ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
-                       Assert (!xmlReader.MoveToNextAttribute ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (xmlReader.Read ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (!xmlReader.MoveToNextAttribute ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
                }\r
 \r
                [Test]\r
@@ -1223,17 +1223,17 @@ namespace MonoTests.System.Xml
                                "quuux" // value\r
                        );\r
 \r
-                       Assert (xmlReader.MoveToNextAttribute ());\r
-                       AssertEquals ("bar", xmlReader.Name);\r
-                       AssertEquals ("baz", xmlReader.Value);\r
+                       Assert.IsTrue (xmlReader.MoveToNextAttribute ());\r
+                       Assert.AreEqual ("bar", xmlReader.Name);\r
+                       Assert.AreEqual ("baz", xmlReader.Value);\r
 \r
-                       Assert (xmlReader.MoveToNextAttribute ());\r
-                       AssertEquals ("quux", xmlReader.Name);\r
-                       AssertEquals ("quuux", xmlReader.Value);\r
+                       Assert.IsTrue (xmlReader.MoveToNextAttribute ());\r
+                       Assert.AreEqual ("quux", xmlReader.Name);\r
+                       Assert.AreEqual ("quuux", xmlReader.Value);\r
 \r
-                       Assert (!xmlReader.MoveToNextAttribute ());\r
+                       Assert.IsTrue (!xmlReader.MoveToNextAttribute ());\r
 \r
-                       Assert (xmlReader.MoveToElement ());\r
+                       Assert.IsTrue (xmlReader.MoveToElement ());\r
 \r
                        AssertNodeValues (\r
                                "#1",\r
@@ -1274,8 +1274,7 @@ namespace MonoTests.System.Xml
                                String.Empty,\r
                                "version=\"1.0\" standalone=\"yes\"",\r
                                2);\r
-                       Assert ("MoveToFirstAttribute",\r
-                               xmlReader.MoveToFirstAttribute ());\r
+                       Assert.IsTrue (xmlReader.MoveToFirstAttribute (), "MoveToFirstAttribute");\r
                        this.AssertNodeValues ("#2", xmlReader, \r
                                XmlNodeType.Attribute,\r
                                0, // FIXME: might be 1\r
@@ -1330,17 +1329,17 @@ namespace MonoTests.System.Xml
 \r
                public void AttributeOrder (XmlReader xmlReader)\r
                {\r
-                       Assert (xmlReader.Read ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.IsTrue (xmlReader.Read ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
 \r
-                       Assert (xmlReader.MoveToFirstAttribute ());\r
-                       AssertEquals ("_1", xmlReader.Name);\r
-                       Assert (xmlReader.MoveToNextAttribute ());\r
-                       AssertEquals ("_2", xmlReader.Name);\r
-                       Assert (xmlReader.MoveToNextAttribute ());\r
-                       AssertEquals ("_3", xmlReader.Name);\r
+                       Assert.IsTrue (xmlReader.MoveToFirstAttribute ());\r
+                       Assert.AreEqual ("_1", xmlReader.Name);\r
+                       Assert.IsTrue (xmlReader.MoveToNextAttribute ());\r
+                       Assert.AreEqual ("_2", xmlReader.Name);\r
+                       Assert.IsTrue (xmlReader.MoveToNextAttribute ());\r
+                       Assert.AreEqual ("_3", xmlReader.Name);\r
 \r
-                       Assert (!xmlReader.MoveToNextAttribute ());\r
+                       Assert.IsTrue (!xmlReader.MoveToNextAttribute ());\r
                }\r
 \r
                [Test]\r
@@ -1353,34 +1352,34 @@ namespace MonoTests.System.Xml
 \r
                public void IndexerAndAttributes (XmlReader xmlReader)\r
                {\r
-                       Assert (xmlReader.Read ());\r
-                       AssertEquals ("1.0", xmlReader ["version"]);\r
-                       AssertEquals ("1.0", xmlReader.GetAttribute ("version"));\r
+                       Assert.IsTrue (xmlReader.Read ());\r
+                       Assert.AreEqual ("1.0", xmlReader ["version"]);\r
+                       Assert.AreEqual ("1.0", xmlReader.GetAttribute ("version"));\r
                        // .NET 1.1 BUG. XmlTextReader returns null, while XmlNodeReader returns "".\r
-                       AssertEquals (null, xmlReader ["encoding"]);\r
-                       AssertEquals (null, xmlReader.GetAttribute ("encoding"));\r
-                       AssertEquals ("no", xmlReader ["standalone"]);\r
-                       AssertEquals ("no", xmlReader.GetAttribute ("standalone"));\r
-                       AssertEquals ("1.0", xmlReader [0]);\r
-                       AssertEquals ("1.0", xmlReader.GetAttribute (0));\r
-                       AssertEquals ("no", xmlReader [1]);\r
-                       AssertEquals ("no", xmlReader.GetAttribute (1));\r
+                       Assert.AreEqual (null, xmlReader ["encoding"]);\r
+                       Assert.AreEqual (null, xmlReader.GetAttribute ("encoding"));\r
+                       Assert.AreEqual ("no", xmlReader ["standalone"]);\r
+                       Assert.AreEqual ("no", xmlReader.GetAttribute ("standalone"));\r
+                       Assert.AreEqual ("1.0", xmlReader [0]);\r
+                       Assert.AreEqual ("1.0", xmlReader.GetAttribute (0));\r
+                       Assert.AreEqual ("no", xmlReader [1]);\r
+                       Assert.AreEqual ("no", xmlReader.GetAttribute (1));\r
 \r
-                       Assert (xmlReader.Read ());\r
-                       AssertEquals (XmlNodeType.Element, xmlReader.NodeType);\r
-                       AssertEquals ("1", xmlReader ["_1"]);\r
+                       Assert.IsTrue (xmlReader.Read ());\r
+                       Assert.AreEqual (XmlNodeType.Element, xmlReader.NodeType);\r
+                       Assert.AreEqual ("1", xmlReader ["_1"]);\r
 \r
-                       Assert (xmlReader.MoveToFirstAttribute ());\r
-                       AssertEquals ("_1", xmlReader.Name);\r
-                       AssertEquals ("1", xmlReader ["_1"]);\r
-                       Assert (xmlReader.MoveToNextAttribute ());\r
-                       AssertEquals ("_2", xmlReader.Name);\r
-                       AssertEquals ("1", xmlReader ["_1"]);\r
-                       Assert (xmlReader.MoveToNextAttribute ());\r
-                       AssertEquals ("_3", xmlReader.Name);\r
-                       AssertEquals ("1", xmlReader ["_1"]);\r
+                       Assert.IsTrue (xmlReader.MoveToFirstAttribute ());\r
+                       Assert.AreEqual ("_1", xmlReader.Name);\r
+                       Assert.AreEqual ("1", xmlReader ["_1"]);\r
+                       Assert.IsTrue (xmlReader.MoveToNextAttribute ());\r
+                       Assert.AreEqual ("_2", xmlReader.Name);\r
+                       Assert.AreEqual ("1", xmlReader ["_1"]);\r
+                       Assert.IsTrue (xmlReader.MoveToNextAttribute ());\r
+                       Assert.AreEqual ("_3", xmlReader.Name);\r
+                       Assert.AreEqual ("1", xmlReader ["_1"]);\r
 \r
-                       Assert (!xmlReader.MoveToNextAttribute ());\r
+                       Assert.IsTrue (!xmlReader.MoveToNextAttribute ());\r
                }\r
 \r
                [Test]\r
@@ -1414,11 +1413,11 @@ namespace MonoTests.System.Xml
                public void SurrogatePairContent (XmlReader xmlReader)\r
                {\r
                        xmlReader.Read ();\r
-                       AssertEquals (true, xmlReader.MoveToAttribute ("xmlns"));\r
-                       AssertEquals ("xmlns", xmlReader.Name);\r
-                       AssertEquals (2, xmlReader.Value.Length);\r
-                       AssertEquals (0xD800, (int) xmlReader.Value [0]);\r
-                       AssertEquals (0xDD00, (int) xmlReader.Value [1]);\r
+                       Assert.AreEqual (true, xmlReader.MoveToAttribute ("xmlns"));\r
+                       Assert.AreEqual ("xmlns", xmlReader.Name);\r
+                       Assert.AreEqual (2, xmlReader.Value.Length);\r
+                       Assert.AreEqual (0xD800, (int) xmlReader.Value [0]);\r
+                       Assert.AreEqual (0xDD00, (int) xmlReader.Value [1]);\r
                }\r
 \r
                [Test]\r
@@ -1433,7 +1432,7 @@ namespace MonoTests.System.Xml
                        xmlReader.Read ();\r
                        xmlReader.Read ();\r
                        xmlReader.Read ();\r
-                       AssertEquals (String.Empty, xmlReader.ReadOuterXml ());\r
+                       Assert.AreEqual (String.Empty, xmlReader.ReadOuterXml ());\r
                }\r
 \r
                [Test]\r
@@ -1448,7 +1447,7 @@ namespace MonoTests.System.Xml
                        xmlReader.Read ();\r
                        xmlReader.Read ();\r
                        xmlReader.Read ();\r
-                       AssertEquals (String.Empty, xmlReader.ReadInnerXml ());\r
+                       Assert.AreEqual (String.Empty, xmlReader.ReadInnerXml ());\r
                }\r
 \r
                [Test]\r
@@ -1461,7 +1460,7 @@ namespace MonoTests.System.Xml
                void LookupEmptyPrefix (XmlReader xmlReader)\r
                {\r
                        xmlReader.Read ();\r
-                       AssertNull (xmlReader.LookupNamespace (String.Empty));\r
+                       Assert.IsNull (xmlReader.LookupNamespace (String.Empty));\r
                }\r
 \r
                [Test]\r
@@ -1476,7 +1475,7 @@ namespace MonoTests.System.Xml
                        xr.Read ();\r
                        xr.ReadStartElement ();\r
                        // consume Element node.\r
-                       AssertEquals (XmlNodeType.Text, xr.NodeType);\r
+                       Assert.AreEqual (XmlNodeType.Text, xr.NodeType);\r
                }\r
 \r
                [Test]\r
@@ -1489,11 +1488,11 @@ namespace MonoTests.System.Xml
                void LookupNamespaceAtEndElement (XmlReader reader)\r
                {\r
                        reader.Read ();\r
-                       AssertEquals ("#1", "urn:foo", reader.LookupNamespace ("x"));\r
+                       Assert.AreEqual ("urn:foo", reader.LookupNamespace ("x"), "#1");\r
                        reader.Read ();\r
-                       AssertEquals ("#2", "urn:foo", reader.LookupNamespace ("x"));\r
+                       Assert.AreEqual ("urn:foo", reader.LookupNamespace ("x"), "#2");\r
                        reader.Read ();\r
-                       AssertEquals ("#3", "urn:foo", reader.LookupNamespace ("x"));\r
+                       Assert.AreEqual ("urn:foo", reader.LookupNamespace ("x"), "#3");\r
                }\r
 \r
                [Test]\r
@@ -1518,11 +1517,11 @@ namespace MonoTests.System.Xml
                        s.ProhibitDtd = false;\r
                        XmlReader xr = XmlReader.Create ("Test/XmlFiles/nested-dtd-test.xml", s);\r
                        xr.Read ();\r
-                       AssertEquals ("#1", XmlNodeType.DocumentType, xr.NodeType);\r
+                       Assert.AreEqual (XmlNodeType.DocumentType, xr.NodeType, "#1");\r
                        xr.Read ();\r
-                       AssertEquals ("#2", XmlNodeType.Whitespace, xr.NodeType);\r
+                       Assert.AreEqual (XmlNodeType.Whitespace, xr.NodeType, "#2");\r
                        xr.Read ();\r
-                       AssertEquals ("#3", XmlNodeType.Element, xr.NodeType);\r
+                       Assert.AreEqual (XmlNodeType.Element, xr.NodeType, "#3");\r
                }\r
 \r
                [Test]\r
@@ -1592,20 +1591,20 @@ namespace MonoTests.System.Xml
                void ReadToDescendant (XmlReader xmlReader)\r
                {\r
                        // move to first <bar/>\r
-                       Assert ("#1", xmlReader.ReadToDescendant ("bar"));\r
+                       Assert.IsTrue (xmlReader.ReadToDescendant ("bar"), "#1");\r
                        // no children in <bar/>. It is empty.\r
-                       Assert ("#2", !xmlReader.ReadToDescendant ("bar"));\r
-                       AssertEquals ("#2-2", "bar", xmlReader.Name);\r
+                       Assert.IsTrue (!xmlReader.ReadToDescendant ("bar"), "#2");\r
+                       Assert.AreEqual ("bar", xmlReader.Name, "#2-2");\r
 \r
                        // move to the second <foo>\r
                        xmlReader.Read ();\r
                        // move to the second <bar>\r
-                       Assert ("#3", xmlReader.ReadToDescendant ("bar"));\r
+                       Assert.IsTrue (xmlReader.ReadToDescendant ("bar"), "#3");\r
                        // move to <bar> inside <bar>...</bar>\r
-                       Assert ("#4", xmlReader.ReadToDescendant ("bar"));\r
+                       Assert.IsTrue (xmlReader.ReadToDescendant ("bar"), "#4");\r
                        // the next is EndElement of </bar>, so no move.\r
-                       Assert ("#5", !xmlReader.ReadToDescendant ("bar"));\r
-                       AssertEquals ("#5-2", XmlNodeType.EndElement, xmlReader.NodeType);\r
+                       Assert.IsTrue (!xmlReader.ReadToDescendant ("bar"), "#5");\r
+                       Assert.AreEqual (XmlNodeType.EndElement, xmlReader.NodeType, "#5-2");\r
                }\r
 \r
                [Test]\r
@@ -1618,7 +1617,7 @@ namespace MonoTests.System.Xml
                void ReadToDescendant2 (XmlReader xmlReader)\r
                {\r
                        // make sure that it works when the reader is at Initial state.\r
-                       Assert (xmlReader.ReadToDescendant ("root"));\r
+                       Assert.IsTrue (xmlReader.ReadToDescendant ("root"));\r
                }\r
 \r
                [Test]\r
@@ -1630,12 +1629,12 @@ namespace MonoTests.System.Xml
 \r
                public void ReadToFollowing (XmlReader xmlReader)\r
                {\r
-                       Assert ("#1", xmlReader.ReadToFollowing ("bar"));\r
-                       Assert ("#2", xmlReader.ReadToFollowing ("bar"));\r
-                       AssertEquals ("#2-2", 2, xmlReader.Depth);\r
-                       Assert ("#3", xmlReader.ReadToFollowing ("bar"));\r
-                       AssertEquals ("#3-2", 3, xmlReader.Depth);\r
-                       Assert ("#4", !xmlReader.ReadToFollowing ("bar"));\r
+                       Assert.IsTrue (xmlReader.ReadToFollowing ("bar"), "#1");\r
+                       Assert.IsTrue (xmlReader.ReadToFollowing ("bar"), "#2");\r
+                       Assert.AreEqual (2, xmlReader.Depth, "#2-2");\r
+                       Assert.IsTrue (xmlReader.ReadToFollowing ("bar"), "#3");\r
+                       Assert.AreEqual (3, xmlReader.Depth, "#3-2");\r
+                       Assert.IsTrue (!xmlReader.ReadToFollowing ("bar"), "#4");\r
                }\r
 \r
                [Test]\r
@@ -1648,8 +1647,8 @@ namespace MonoTests.System.Xml
 \r
                void ReadToNextSiblingAtInitialState (XmlReader xmlReader)\r
                {\r
-                       Assert ("#1", !xmlReader.ReadToNextSibling ("bar"));\r
-                       Assert ("#2", !xmlReader.ReadToNextSibling ("root"));\r
+                       Assert.IsTrue (!xmlReader.ReadToNextSibling ("bar"), "#1");\r
+                       Assert.IsTrue (!xmlReader.ReadToNextSibling ("root"), "#2");\r
                }\r
 \r
                [Test]\r
@@ -1665,16 +1664,16 @@ namespace MonoTests.System.Xml
                        xmlReader.Read (); // root\r
 \r
                        xmlReader.Read (); // foo\r
-                       Assert ("#3", xmlReader.ReadToNextSibling ("bar"));\r
+                       Assert.IsTrue (xmlReader.ReadToNextSibling ("bar"), "#3");\r
 \r
-                       AssertEquals ("#3-2", "value", xmlReader.GetAttribute ("attr"));\r
+                       Assert.AreEqual ("value", xmlReader.GetAttribute ("attr"), "#3-2");\r
                        xmlReader.Read (); // foo\r
                        xmlReader.Read (); // pooh\r
-                       Assert ("#4", xmlReader.ReadToNextSibling ("bar"));\r
-                       Assert ("#4-2", !xmlReader.IsEmptyElement);\r
-                       Assert ("#5", xmlReader.ReadToNextSibling ("bar"));\r
-                       Assert ("#5-2", xmlReader.IsEmptyElement);\r
-                       Assert ("#6", xmlReader.Read ()); // /foo\r
+                       Assert.IsTrue (xmlReader.ReadToNextSibling ("bar"), "#4");\r
+                       Assert.IsTrue (!xmlReader.IsEmptyElement, "#4-2");\r
+                       Assert.IsTrue (xmlReader.ReadToNextSibling ("bar"), "#5");\r
+                       Assert.IsTrue (xmlReader.IsEmptyElement, "#5-2");\r
+                       Assert.IsTrue (xmlReader.Read (), "#6"); // /foo\r
 \r
                        AssertNodeValues ("#7", xmlReader,\r
                                XmlNodeType.EndElement,\r
@@ -1703,12 +1702,12 @@ namespace MonoTests.System.Xml
                        r.MoveToContent (); // ->root\r
                        r.Read (); // root->baz\r
                        r.Read (); // baz->bar\r
-                       Assert ("#1", r.ReadToNextSibling ("foo"));\r
-                       AssertEquals ("#2", "value2", r.GetAttribute ("attr"));\r
+                       Assert.IsTrue (r.ReadToNextSibling ("foo"), "#1");\r
+                       Assert.AreEqual ("value2", r.GetAttribute ("attr"), "#2");\r
                        r.Read (); // foo[@value='value2']->bar\r
-                       Assert ("#3", !r.ReadToNextSibling ("foo"));\r
-                       AssertEquals ("#4", XmlNodeType.EndElement, r.NodeType);\r
-                       AssertEquals ("#5", "foo", r.LocalName);\r
+                       Assert.IsTrue (!r.ReadToNextSibling ("foo"), "#3");\r
+                       Assert.AreEqual (XmlNodeType.EndElement, r.NodeType, "#4");\r
+                       Assert.AreEqual ("foo", r.LocalName, "#5");\r
                }\r
 \r
                // bug #347768\r
@@ -1752,7 +1751,7 @@ namespace MonoTests.System.Xml
                                0,              // AttributeCount\r
                                false);         // HasAttributes\r
                        */\r
-                       AssertEquals ("#1", XmlNodeType.None, st.NodeType);\r
+                       Assert.AreEqual (XmlNodeType.None, st.NodeType, "#1");\r
 \r
                        st.Read ();\r
                        AssertNodeValues ("#2", st,\r
@@ -1768,7 +1767,7 @@ namespace MonoTests.System.Xml
                                0,              // AttributeCount\r
                                false);         // HasAttributes\r
 \r
-                       Assert ("#3", !st.Read ());\r
+                       Assert.IsTrue (!st.Read (), "#3");\r
 \r
                        // At this state, reader is not positioned on <bar> yet\r
                        AssertNodeValues ("#3-2", reader,\r
@@ -1841,7 +1840,7 @@ namespace MonoTests.System.Xml
                                0,              // AttributeCount\r
                                false);         // HasAttributes\r
 \r
-                       Assert ("#7", !st.Read ());\r
+                       Assert.IsTrue (!st.Read (), "#7");\r
                }\r
 \r
                [Test]\r
@@ -1852,7 +1851,7 @@ namespace MonoTests.System.Xml
                        \r
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
-                       AssertEquals ("#1", "1", xr.ReadElementContentAsString ());\r
+                       Assert.AreEqual ("1", xr.ReadElementContentAsString (), "#1");\r
 \r
                        AssertNodeValues ("#1-2", xr,\r
                                XmlNodeType.None,\r
@@ -1870,20 +1869,20 @@ namespace MonoTests.System.Xml
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
                        // this XmlReader has no schema, thus the value is untyped\r
-                       AssertEquals ("#2", "1", xr.ReadElementContentAsObject ());\r
+                       Assert.AreEqual ("1", xr.ReadElementContentAsObject (), "#2");\r
 \r
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
                        xr.Read ();\r
-                       AssertEquals ("#3", "1", xr.ReadContentAsString ());\r
+                       Assert.AreEqual ("1", xr.ReadContentAsString (), "#3");\r
 \r
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
-                       AssertEquals ("#4", 1, xr.ReadElementContentAsInt ());\r
+                       Assert.AreEqual (1, xr.ReadElementContentAsInt (), "#4");\r
 \r
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
-                       AssertEquals ("#5", 1, xr.ReadElementContentAs (typeof (int), null));\r
+                       Assert.AreEqual (1, xr.ReadElementContentAs (typeof (int), null), "#5");\r
                }\r
 \r
                [Test]\r
@@ -1906,21 +1905,20 @@ namespace MonoTests.System.Xml
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
                        // this XmlReader has no schema, thus the value is untyped\r
-                       AssertEquals ("#1", "2006-01-02T03:04:56",\r
-                               xr.ReadElementContentAsString ());\r
+                       Assert.AreEqual ("2006-01-02T03:04:56", xr.ReadElementContentAsString (), "#1");\r
 \r
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
                        xr.Read ();\r
-                       AssertEquals ("#2", time, xr.ReadContentAsDateTime ());\r
+                       Assert.AreEqual (time, xr.ReadContentAsDateTime (), "#2");\r
 \r
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
-                       AssertEquals ("#3", time, xr.ReadElementContentAsDateTime ());\r
+                       Assert.AreEqual (time, xr.ReadElementContentAsDateTime (), "#3");\r
 \r
                        xr = XmlReader.Create (new StringReader (xml1));\r
                        xr.Read ();\r
-                       AssertEquals ("#4", time, xr.ReadElementContentAs (typeof (DateTime), null));\r
+                       Assert.AreEqual (time, xr.ReadElementContentAs (typeof (DateTime), null), "#4");\r
                }\r
 \r
                [Test]\r
@@ -1943,10 +1941,9 @@ namespace MonoTests.System.Xml
                                typeof (XmlQualifiedName), null);\r
                        // without IXmlNamespaceResolver, it still resolves\r
                        // x:el as valid QName.\r
-                       AssertNotNull ("#1", o);\r
+                       Assert.IsNotNull (o, "#1");\r
                        XmlQualifiedName q = o as XmlQualifiedName;\r
-                       AssertEquals ("#2 : " + o.GetType (),\r
-                               new XmlQualifiedName ("el", "urn:foo"), q);\r
+                       Assert.AreEqual (new XmlQualifiedName ("el", "urn:foo"), q, "#2 : " + o.GetType ());\r
                }\r
 \r
                [Test]\r
@@ -1965,7 +1962,7 @@ namespace MonoTests.System.Xml
                        xr.Read ();\r
                        xr.Read ();\r
                        xr.Read ();\r
-                       AssertEquals (String.Empty, xr.ReadContentAsString ()); // does not fail, unlike at Element!\r
+                       Assert.AreEqual (String.Empty, xr.ReadContentAsString ()); // does not fail, unlike at Element!\r
                }\r
 \r
                [Test]\r
@@ -1973,7 +1970,7 @@ namespace MonoTests.System.Xml
                {\r
                        XmlReader xr = XmlReader.Create (new StringReader ("<?pi ?><a>test</a>"));\r
                        xr.Read ();\r
-                       AssertEquals (String.Empty, xr.ReadContentAsString ());\r
+                       Assert.AreEqual (String.Empty, xr.ReadContentAsString ());\r
                }\r
 \r
                [Test]\r
@@ -1982,7 +1979,7 @@ namespace MonoTests.System.Xml
                {\r
                        XmlReader xr = XmlReader.Create (new StringReader ("<?pi ?><a>test</a>"));\r
                        xr.Read ();\r
-                       AssertEquals (XmlNodeType.ProcessingInstruction, xr.NodeType);\r
+                       Assert.AreEqual (XmlNodeType.ProcessingInstruction, xr.NodeType);\r
                        xr.ReadElementContentAsString ();\r
                }\r
 \r
@@ -2005,8 +2002,8 @@ namespace MonoTests.System.Xml
                        xr.Read ();\r
                        xr.Read (); // from Text "123"\r
                        string s = xr.ReadContentAsString ();\r
-                       AssertEquals ("#1", "123", s);\r
-                       AssertEquals ("#2", XmlNodeType.Element, xr.NodeType);\r
+                       Assert.AreEqual ("123", s, "#1");\r
+                       Assert.AreEqual (XmlNodeType.Element, xr.NodeType, "#2");\r
                }\r
 \r
                [Test]\r
@@ -2015,10 +2012,8 @@ namespace MonoTests.System.Xml
                        XmlTextReader r = new XmlTextReader (\r
                                "<root/>", XmlNodeType.Document, null);\r
                        r.Read ();\r
-                       AssertEquals ("#1",\r
-                               String.Empty, r.ReadElementContentAsString ());\r
-                       AssertEquals ("#2",\r
-                               XmlNodeType.None, r.NodeType);\r
+                       Assert.AreEqual (String.Empty, r.ReadElementContentAsString (), "#1");\r
+                       Assert.AreEqual (XmlNodeType.None, r.NodeType, "#2");\r
                }\r
 \r
                [Test]\r
@@ -2029,18 +2024,14 @@ namespace MonoTests.System.Xml
                        XmlTextReader r = new XmlTextReader (\r
                                "<root/>", XmlNodeType.Document, null);\r
                        r.Read ();\r
-                       AssertEquals ("#1",\r
-                               String.Empty, r.ReadElementContentAs (typeof (object), null));\r
-                       AssertEquals ("#2",\r
-                               XmlNodeType.None, r.NodeType);\r
+                       Assert.AreEqual (String.Empty, r.ReadElementContentAs (typeof (object), null), "#1");\r
+                       Assert.AreEqual (XmlNodeType.None, r.NodeType, "#2");\r
 \r
                        // regardless of its value, the return value is string.\r
                        r = new XmlTextReader ("<root>1</root>", XmlNodeType.Document, null);\r
                        r.Read ();\r
-                       AssertEquals ("#3",\r
-                               "1", r.ReadElementContentAs (typeof (object), null));\r
-                       AssertEquals ("#4",\r
-                               XmlNodeType.None, r.NodeType);\r
+                       Assert.AreEqual ("1", r.ReadElementContentAs (typeof (object), null), "#3");\r
+                       Assert.AreEqual (XmlNodeType.None, r.NodeType, "#4");\r
                }\r
 \r
                [Test]\r
@@ -2053,8 +2044,8 @@ namespace MonoTests.System.Xml
                void ReadContentStringOnAttribute (XmlReader reader)\r
                {\r
                        reader.Read ();\r
-                       Assert (reader.MoveToAttribute ("id"));\r
-                       AssertEquals ("myId", reader.ReadContentAsString ());\r
+                       Assert.IsTrue (reader.MoveToAttribute ("id"));\r
+                       Assert.AreEqual ("myId", reader.ReadContentAsString ());\r
                }\r
 \r
                [Test]\r
@@ -2068,8 +2059,8 @@ namespace MonoTests.System.Xml
                {\r
                        reader.MoveToContent ();\r
                        reader.Read ();\r
-                       AssertEquals (String.Empty, reader.ReadElementContentAsString ("sample", ""));\r
-                       AssertEquals (XmlNodeType.EndElement, reader.NodeType);\r
+                       Assert.AreEqual (String.Empty, reader.ReadElementContentAsString ("sample", ""));\r
+                       Assert.AreEqual (XmlNodeType.EndElement, reader.NodeType);\r
                }\r
 \r
                [Test]\r
@@ -2086,8 +2077,8 @@ namespace MonoTests.System.Xml
                        XmlReader sub = reader.ReadSubtree ();\r
                        sub.ReadToDescendant ("item");\r
                        sub.Close ();\r
-                       AssertEquals ("#1", XmlNodeType.EndElement, reader.NodeType);\r
-                       AssertEquals ("#2", "item-list", reader.Name);\r
+                       Assert.AreEqual (XmlNodeType.EndElement, reader.NodeType, "#1");\r
+                       Assert.AreEqual ("item-list", reader.Name, "#2");\r
                }\r
 \r
                [Test]\r
@@ -2117,10 +2108,10 @@ namespace MonoTests.System.Xml
                        XmlReader r = XmlReader.Create (new StringReader (xml));\r
                        r.Read ();\r
                        XmlReader s = r.ReadSubtree ();\r
-                       Assert ("#1", s.Read ());\r
-                       AssertEquals ("#2", XmlNodeType.Element, s.NodeType);\r
-                       Assert ("#3", !s.Read ());\r
-                       AssertEquals ("#4", XmlNodeType.None, s.NodeType);\r
+                       Assert.IsTrue (s.Read (), "#1");\r
+                       Assert.AreEqual (XmlNodeType.Element, s.NodeType, "#2");\r
+                       Assert.IsTrue (!s.Read (), "#3");\r
+                       Assert.AreEqual (XmlNodeType.None, s.NodeType, "#4");\r
                }\r
 \r
                [Test]\r
@@ -2135,14 +2126,14 @@ namespace MonoTests.System.Xml
                        r2.Read ();\r
                        XmlReader r3 = r2.ReadSubtree ();\r
                        r2.MoveToFirstAttribute ();\r
-                       Assert ("#1", !r.IsEmptyElement);\r
-                       Assert ("#2", !r2.IsEmptyElement);\r
+                       Assert.IsTrue (!r.IsEmptyElement, "#1");\r
+                       Assert.IsTrue (!r2.IsEmptyElement, "#2");\r
                        r3.Close ();\r
-                       Assert ("#3", r.IsEmptyElement);\r
-                       Assert ("#4", r2.IsEmptyElement);\r
+                       Assert.IsTrue (r.IsEmptyElement, "#3");\r
+                       Assert.IsTrue (r2.IsEmptyElement, "#4");\r
                        r2.Close ();\r
-                       Assert ("#5", r.IsEmptyElement);\r
-                       Assert ("#6", r2.IsEmptyElement);\r
+                       Assert.IsTrue (r.IsEmptyElement, "#5");\r
+                       Assert.IsTrue (r2.IsEmptyElement, "#6");\r
                }\r
 \r
                [Test]\r
@@ -2163,11 +2154,11 @@ namespace MonoTests.System.Xml
 \r
                        xmlReader.ReadStartElement ();\r
                        readBytes = xmlReader.ReadContentAsBase64 (buffer, 0, buffer.Length);\r
-                       AssertEquals ("#1", 24, readBytes);\r
-                       AssertEquals ("#2", 0, xmlReader.ReadContentAsBase64 (buffer, 0, buffer.Length));\r
+                       Assert.AreEqual (24, readBytes, "#1");\r
+                       Assert.AreEqual (0, xmlReader.ReadContentAsBase64 (buffer, 0, buffer.Length), "#2");\r
                        StringWriter sw = new StringWriter ();\r
                        foreach (byte b in buffer) sw.Write ("{0:X02}", b);\r
-                       AssertEquals ("#3", "000102030405060708090A0B0C0D0E0F1011121314151617", sw.ToString ());\r
+                       Assert.AreEqual ("000102030405060708090A0B0C0D0E0F1011121314151617", sw.ToString (), "#3");\r
                }\r
 \r
                [Test]\r
@@ -2183,9 +2174,9 @@ namespace MonoTests.System.Xml
                                const int bufferLength = 1024;\r
                                byte [] buffer = new byte [bufferLength];\r
                                readerXml.ReadContentAsBase64 (buffer, 0, bufferLength);\r
-                               AssertEquals ("#1", XmlNodeType.EndElement, readerXml.NodeType);\r
+                               Assert.AreEqual (XmlNodeType.EndElement, readerXml.NodeType, "#1");\r
                                readerXml.Read ();\r
-                               AssertEquals ("#2", XmlNodeType.Element, readerXml.NodeType);\r
+                               Assert.AreEqual (XmlNodeType.Element, readerXml.NodeType, "#2");\r
                        }\r
                }\r
 #endif\r