2009-06-26 Robert Jordan <robertj@gmx.net>

[mono.git] / mcs / class / System.XML / Test / System.Xml / XsdValidatingReaderTests.cs

diff --git a/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs b/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
index 9cad92514d31c6b989c86d94f7e61b610289abe2..e129d43ee5ccbf6520ba4fda0df28bab5a5d30a5 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
@@ -17,7 +17,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Xml\r
 {\r
        [TestFixture]\r
-       public class XsdValidatingReaderTests : Assertion\r
+       public class XsdValidatingReaderTests\r
        {\r
                public XsdValidatingReaderTests ()\r
                {\r
@@ -50,14 +50,14 @@ namespace MonoTests.System.Xml
                {\r
                        string xml = "<root/>";\r
                        xvr = PrepareXmlReader (xml);\r
-                       AssertEquals (ValidationType.Auto, xvr.ValidationType);\r
+                       Assert.AreEqual (ValidationType.Auto, xvr.ValidationType);\r
                        XmlSchema schema = new XmlSchema ();\r
                        XmlSchemaElement elem = new XmlSchemaElement ();\r
                        elem.Name = "root";\r
                        schema.Items.Add (elem);\r
                        xvr.Schemas.Add (schema);\r
                        xvr.Read ();    // root\r
-                       AssertEquals (ValidationType.Auto, xvr.ValidationType);\r
+                       Assert.AreEqual (ValidationType.Auto, xvr.ValidationType);\r
                        xvr.Read ();    // EOF\r
 \r
                        xml = "<hoge/>";\r
@@ -65,7 +65,7 @@ namespace MonoTests.System.Xml
                        xvr.Schemas.Add (schema);\r
                        try {\r
                                xvr.Read ();\r
-                               Fail ("element mismatch is incorrectly allowed");\r
+                               Assert.Fail ("element mismatch is incorrectly allowed");\r
                        } catch (XmlSchemaException) {\r
                        }\r
 \r
@@ -74,7 +74,7 @@ namespace MonoTests.System.Xml
                        xvr.Schemas.Add (schema);\r
                        try {\r
                                xvr.Read ();\r
-                               Fail ("Element in different namespace is incorrectly allowed.");\r
+                               Assert.Fail ("Element in different namespace is incorrectly allowed.");\r
                        } catch (XmlSchemaException) {\r
                        }\r
                }\r
@@ -95,22 +95,22 @@ namespace MonoTests.System.Xml
                        xvr.Schemas.Add (schema);\r
                        // Read directly from root.\r
                        object o = xvr.ReadTypedValue ();\r
-                       AssertEquals (ReadState.Initial, xvr.ReadState);\r
-                       AssertNull (o);\r
+                       Assert.AreEqual (ReadState.Initial, xvr.ReadState);\r
+                       Assert.IsNull (o);\r
 \r
                        xvr.Read ();    // element root\r
-                       AssertEquals (XmlNodeType.Element, xvr.NodeType);\r
-                       AssertNotNull (xvr.SchemaType);\r
-                       Assert (xvr.SchemaType is XmlSchemaDatatype);\r
+                       Assert.AreEqual (XmlNodeType.Element, xvr.NodeType);\r
+                       Assert.IsNotNull (xvr.SchemaType);\r
+                       Assert.IsTrue (xvr.SchemaType is XmlSchemaDatatype);\r
                        o = xvr.ReadTypedValue ();      // read "12"\r
-                       AssertEquals (XmlNodeType.EndElement, xvr.NodeType);\r
-                       AssertNotNull (o);\r
-                       AssertEquals (typeof (decimal), o.GetType ());\r
+                       Assert.AreEqual (XmlNodeType.EndElement, xvr.NodeType);\r
+                       Assert.IsNotNull (o);\r
+                       Assert.AreEqual (typeof (decimal), o.GetType ());\r
                        decimal n = (decimal) o;\r
-                       AssertEquals (12, n);\r
-                       Assert (!xvr.EOF);\r
-                       AssertEquals ("root", xvr.Name);\r
-                       AssertNull (xvr.SchemaType);    // EndElement's type\r
+                       Assert.AreEqual (12, n);\r
+                       Assert.IsTrue (!xvr.EOF);\r
+                       Assert.AreEqual ("root", xvr.Name);\r
+                       Assert.IsNull (xvr.SchemaType); // EndElement's type\r
 \r
                        // Lap 2:\r
 \r
@@ -118,14 +118,14 @@ namespace MonoTests.System.Xml
                        xvr.Schemas.Add (schema);\r
                        xvr.Read ();    // root\r
                        XmlSchemaDatatype dt = xvr.SchemaType as XmlSchemaDatatype;\r
-                       AssertNotNull (dt);\r
-                       AssertEquals (typeof (decimal), dt.ValueType);\r
-                       AssertEquals (XmlTokenizedType.None, dt.TokenizedType);\r
+                       Assert.IsNotNull (dt);\r
+                       Assert.AreEqual (typeof (decimal), dt.ValueType);\r
+                       Assert.AreEqual (XmlTokenizedType.None, dt.TokenizedType);\r
                        xvr.Read ();    // text "12"\r
-                       AssertNull (xvr.SchemaType);\r
+                       Assert.IsNull (xvr.SchemaType);\r
                        o = xvr.ReadTypedValue ();\r
                        // ReadTypedValue is different from ReadString().\r
-                       AssertNull (o);\r
+                       Assert.IsNull (o);\r
                }\r
 \r
                [Test]\r
@@ -138,7 +138,7 @@ namespace MonoTests.System.Xml
                        string xml = "<x:root xmlns:x='urn:foo' />";\r
                        xvr = PrepareXmlReader (xml);\r
                        xvr.Namespaces = false;\r
-                       AssertEquals (ValidationType.Auto, xvr.ValidationType);\r
+                       Assert.AreEqual (ValidationType.Auto, xvr.ValidationType);\r
                        XmlSchema schema = new XmlSchema ();\r
                        schema.TargetNamespace = "urn:foo";\r
                        XmlSchemaElement elem = new XmlSchemaElement ();\r
@@ -146,12 +146,12 @@ namespace MonoTests.System.Xml
                        schema.Items.Add (elem);\r
                        xvr.Schemas.Add (schema);\r
                        xvr.Read ();    // root\r
-                       Assert (!xvr.Namespaces);\r
-                       AssertEquals ("x:root", xvr.Name);\r
+                       Assert.IsTrue (!xvr.Namespaces);\r
+                       Assert.AreEqual ("x:root", xvr.Name);\r
                        // LocalName may contain colons.\r
-                       AssertEquals ("x:root", xvr.LocalName);\r
+                       Assert.AreEqual ("x:root", xvr.LocalName);\r
                        // NamespaceURI is not supplied.\r
-                       AssertEquals ("", xvr.NamespaceURI);\r
+                       Assert.AreEqual ("", xvr.NamespaceURI);\r
                }\r
 \r
                [Test]\r
@@ -172,19 +172,19 @@ namespace MonoTests.System.Xml
                        xvr = PrepareXmlReader (xml);\r
                        xvr.Schemas.Add (schema);\r
                        xvr.Read ();\r
-                       AssertEquals ("root", xvr.Name);\r
-                       Assert (xvr.MoveToNextAttribute ());    // attr\r
-                       AssertEquals ("attr", xvr.Name);\r
+                       Assert.AreEqual ("root", xvr.Name);\r
+                       Assert.IsTrue (xvr.MoveToNextAttribute ());     // attr\r
+                       Assert.AreEqual ("attr", xvr.Name);\r
                        XmlSchemaDatatype dt = xvr.SchemaType as XmlSchemaDatatype;\r
-                       AssertNotNull (dt);\r
-                       AssertEquals (typeof (int), dt.ValueType);\r
-                       AssertEquals (XmlTokenizedType.None, dt.TokenizedType);\r
+                       Assert.IsNotNull (dt);\r
+                       Assert.AreEqual (typeof (int), dt.ValueType);\r
+                       Assert.AreEqual (XmlTokenizedType.None, dt.TokenizedType);\r
                        object o = xvr.ReadTypedValue ();\r
-                       AssertEquals (XmlNodeType.Attribute, xvr.NodeType);\r
-                       AssertEquals (typeof (int), o.GetType ());\r
+                       Assert.AreEqual (XmlNodeType.Attribute, xvr.NodeType);\r
+                       Assert.AreEqual (typeof (int), o.GetType ());\r
                        int n = (int) o;\r
-                       AssertEquals (12, n);\r
-                       Assert (xvr.ReadAttributeValue ());     // can read = seems not proceed.\r
+                       Assert.AreEqual (12, n);\r
+                       Assert.IsTrue (xvr.ReadAttributeValue ());      // can read = seems not proceed.\r
                }\r
 \r
                [Test]\r
@@ -220,15 +220,15 @@ namespace MonoTests.System.Xml
                                xml, XmlNodeType.Document, null);\r
                        vr.Read ();\r
                        vr.Read (); // whitespace\r
-                       AssertEquals ("#1", String.Empty, vr.NamespaceURI);\r
+                       Assert.AreEqual (String.Empty, vr.NamespaceURI, "#1");\r
                        vr.Read (); // foo\r
-                       AssertEquals ("#2", "urn:a", vr.NamespaceURI);\r
+                       Assert.AreEqual ("urn:a", vr.NamespaceURI, "#2");\r
                        vr.Read (); // whitespace\r
                        vr.Read (); // a:bar\r
-                       AssertEquals ("#3", "urn:a", vr.NamespaceURI);\r
+                       Assert.AreEqual ("urn:a", vr.NamespaceURI, "#3");\r
                        vr.Read (); // whitespace\r
                        vr.Read (); // bug\r
-                       AssertEquals ("#4", "urn:a", vr.NamespaceURI);\r
+                       Assert.AreEqual ("urn:a", vr.NamespaceURI, "#4");\r
                }\r
 \r
                [Test]\r
@@ -261,8 +261,8 @@ namespace MonoTests.System.Xml
                        XmlValidatingReader vr = new XmlValidatingReader (xir);\r
                        vr.Schemas.Add (XmlSchema.Read (xsr, null));\r
                        vr.Read (); // root\r
-                       AssertEquals ("xx", vr.ReadTypedValue ());\r
-                       AssertEquals (XmlNodeType.EndElement, vr.NodeType);\r
+                       Assert.AreEqual ("xx", vr.ReadTypedValue ());\r
+                       Assert.AreEqual (XmlNodeType.EndElement, vr.NodeType);\r
                }\r
 \r
                // If we normalize string before validating with facets,\r
@@ -289,8 +289,8 @@ namespace MonoTests.System.Xml
                        XmlValidatingReader vr = new XmlValidatingReader (xir);\r
                        vr.Schemas.Add (XmlSchema.Read (xsr, null));\r
                        vr.Read (); // root\r
-                       AssertEquals ("  ", vr.ReadTypedValue ());\r
-                       AssertEquals (XmlNodeType.EndElement, vr.NodeType);\r
+                       Assert.AreEqual ("  ", vr.ReadTypedValue ());\r
+                       Assert.AreEqual (XmlNodeType.EndElement, vr.NodeType);\r
                }\r
 \r
                [Test] // bug #77241\r
@@ -402,7 +402,7 @@ namespace MonoTests.System.Xml
                        XmlReader r = XmlReader.Create (new StringReader (xml), s);\r
                        r.Read ();\r
                        r.MoveToFirstAttribute (); // default attribute\r
-                       AssertEquals (String.Empty, r.Prefix);\r
+                       Assert.AreEqual (String.Empty, r.Prefix);\r
                }\r
 #endif\r
 \r