Make XmlWriterSettingsTests .net compatible

diff --git a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
index 8d6ffff6d1a076aeaec640394193263bf45131ab..a1ee351f35baa4e41f36de75dce42c10021088bf 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
+++ b/mcs/class/System.XML/System.Xml/XmlWriterSettings.cs
@@ -83,8 +83,7 @@ namespace System.Xml
                        encoding = Encoding.UTF8;
                        indent = false;
                        indentChars = "  ";
-                       // LAMESPEC: MS.NET says it is "\r\n", but it is silly decision.
-                       newLineChars = Environment.NewLine;
+                       newLineChars = "\r\n";
                        newLineOnAttributes = false;
                        newLineHandling = NewLineHandling.Replace;
                        omitXmlDeclaration = false;

diff --git a/mcs/class/System.XML/Test/System.Xml.XPath/XPathNavigatorTests.cs b/mcs/class/System.XML/Test/System.Xml.XPath/XPathNavigatorTests.cs
index 65ee4bc3e69fd5c8c36dc6d9a14edad5778d5bd7..5049500052fddbd564048623335a3d739ba54f76 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.XPath/XPathNavigatorTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.XPath/XPathNavigatorTests.cs
@@ -608,8 +608,8 @@ namespace MonoTests.System.Xml
                        XPathNavigator nav = doc.CreateNavigator ();
                        XPathNodeIterator iter = nav.Select ("/Abc/Foo");
                        iter.MoveNext ();
-                       Assert.AreEqual ("Hello<" + Environment.NewLine + "InnerXml", iter.Current.InnerXml, "#1");
-                       Assert.AreEqual ("<Foo>Hello&lt;" + Environment.NewLine + "InnerXml</Foo>", iter.Current.OuterXml, "#2");
+                       Assert.AreEqual ("Hello&lt;\r\nInnerXml", iter.Current.InnerXml, "#1");
+                       Assert.AreEqual ("<Foo>Hello&lt;\r\nInnerXml</Foo>", iter.Current.OuterXml, "#2");
                        iter = nav.Select ("/Abc/Foo/text()");
                        iter.MoveNext ();
                        Assert.AreEqual (String.Empty, iter.Current.InnerXml, "#3");

diff --git a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs
index 1bc0ccf9a9a093320774ea8b5f72981977091f1f..6ade78b4461aa4b8413061c140875c8dacce60ff 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlWriterSettingsTests.cs
@@ -37,9 +37,13 @@ namespace MonoTests.System.Xml
                        Assert.AreEqual (Encoding.UTF8, s.Encoding);
                        Assert.AreEqual (false, s.Indent);
                        Assert.AreEqual ("  ", s.IndentChars);
-                       Assert.AreEqual (Environment.NewLine, s.NewLineChars);
+                       Assert.AreEqual ("\r\n", s.NewLineChars);
                        Assert.AreEqual (false, s.NewLineOnAttributes);
                        Assert.AreEqual (false, s.OmitXmlDeclaration);
+                       Assert.AreEqual (NewLineHandling.Replace, s.NewLineHandling);
+#if NET_4_5
+                       Assert.IsFalse (s.Async);
+#endif
                }
 
                [Test]

diff --git a/mcs/class/System.Xml.Linq/Test/System.Xml.XPath/ExtensionsTest2.cs b/mcs/class/System.Xml.Linq/Test/System.Xml.XPath/ExtensionsTest2.cs
index ad8d0168f1fb9b432c815d41d77c066fe630e88a..f099ef433de8eb0ebbc59a0f404cd470f7404d84 100644 (file)
--- a/mcs/class/System.Xml.Linq/Test/System.Xml.XPath/ExtensionsTest2.cs
+++ b/mcs/class/System.Xml.Linq/Test/System.Xml.XPath/ExtensionsTest2.cs
@@ -416,7 +416,6 @@ namespace MonoTests.System.Xml
                        Assert.IsTrue (i.MoveNext (), "#2");
                }
 
-#if NET_2_0
                [Test]
                public void ValueAsBoolean ()
                {
@@ -687,6 +686,5 @@ namespace MonoTests.System.Xml
                                return;
                        Assert.Fail ("no selection");
                }
-#endif
        }
 }