[bcl] Remove more NET_2_0 checks from class libs

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

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlValidatingReaderTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlValidatingReaderTests.cs
index 1dc3d5584ce8b94f3f10e55c3c9961c4abe70f89..a462081608c50f9d09d91d09aac3cd3c6b400db2 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XmlValidatingReaderTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlValidatingReaderTests.cs
@@ -752,7 +752,6 @@ namespace MonoTests.System.Xml
                        dvr.Read ();    // root\r
                        dvr.Read ();    // &ent3;\r
                        Assert.AreEqual (XmlNodeType.EntityReference, dvr.NodeType);\r
-#if NET_2_0\r
                        // under .NET 2.0, an error is raised here.\r
                        // under .NET 1.1, the error is thrown on the next read.\r
                        try {\r
@@ -760,16 +759,6 @@ namespace MonoTests.System.Xml
                                Assert.Fail ("Attempt to resolve undeclared entity should fail.");\r
                        } catch (XmlException) {\r
                        }\r
-#else\r
-                       // ent3 does not exist in this dtd.\r
-                       dvr.ResolveEntity ();\r
-                       Assert.AreEqual (XmlNodeType.EntityReference, dvr.NodeType);\r
-                       try {\r
-                               dvr.Read ();\r
-                               Assert.Fail ("Attempt to resolve undeclared entity should fail.");\r
-                       } catch (XmlException) {\r
-                       }\r
-#endif\r
                }\r
 \r
                [Test]\r
@@ -863,12 +852,6 @@ namespace MonoTests.System.Xml
 \r
                [Test]\r
                //[NotWorking ("default namespace seems null, not String.Empty")]\r
-#if NET_2_0\r
-#else\r
-               // MS.NET 1.x does not consider cases that xmlns* attributes\r
-               // could be declared as default.\r
-               [Category ("NotDotNet")]\r
-#endif\r
                public void DefaultXmlnsAttributeLookup ()\r
                {\r
                        string xml = @"<!DOCTYPE X [\r
@@ -924,7 +907,6 @@ namespace MonoTests.System.Xml
                        Assert.AreEqual ("urn:hoge", xvr.LookupNamespace ("bar"), "#8-2");\r
                }\r
 \r
-#if NET_2_0\r
                [Test]\r
                [ExpectedException (typeof (XmlSchemaException))]\r
                public void Bug80231 ()\r
@@ -937,9 +919,7 @@ namespace MonoTests.System.Xml
                        while (!r.EOF)\r
                                r.Read ();\r
                }\r
-#endif\r
 \r
-#if NET_2_0            \r
                [Test]          \r
                public void Bug501814 ()\r
                {\r
@@ -987,9 +967,7 @@ namespace MonoTests.System.Xml
                        doc.Schemas.Add (schema);\r
                        doc.Validate (null);\r
                }\r
-#endif\r
                \r
-#if NET_2_0\r
                [Test]          \r
                public void Bug502168 ()\r
                {\r
@@ -1072,6 +1050,5 @@ namespace MonoTests.System.Xml
                        doc.Schemas.Add(schema);\r
                        doc.Validate(null);\r
                }\r
-#endif         \r
        }\r
 }\r