From c0584ca8eeaee93fd4c351ddb0d3dd3b3748236e Mon Sep 17 00:00:00 2001 From: Niklas Therning Date: Tue, 20 Sep 2016 17:12:59 +0200 Subject: [PATCH] Fixes line ending issues in System.Data tests To make them run successfully on Windows. --- .../Test/System.Data/DataTableReadWriteXmlTest.cs | 9 ++++----- mcs/class/System.Data/Test/System.Data/DataTableTest.cs | 1 - .../System.Data/Test/System.Xml/XmlDataDocumentTest.cs | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) mode change 100644 => 100755 mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs mode change 100644 => 100755 mcs/class/System.Data/Test/System.Data/DataTableTest.cs mode change 100644 => 100755 mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs diff --git a/mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs old mode 100644 new mode 100755 index 1993e7f56a3..44129904762 --- a/mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableReadWriteXmlTest.cs @@ -35,7 +35,6 @@ namespace MonoTests.System.Data [TestFixture] public class DataTableReadWriteXmlTest { - public static readonly string EOL = Environment.NewLine; void StandardizeXmlFormat(ref string xml) { @@ -126,11 +125,11 @@ namespace MonoTests.System.Data // Get XML for DataSet writes. sw.GetStringBuilder().Length = 0; ds.WriteXml(sw); - string xmlDSNone = sw.ToString().Replace ("\n", EOL); + string xmlDSNone = sw.ToString(); sw.GetStringBuilder().Length = 0; ds.WriteXml(sw, XmlWriteMode.DiffGram); - string xmlDSDiffGram = sw.ToString().Replace ("\n", EOL); + string xmlDSDiffGram = sw.ToString(); sw.GetStringBuilder().Length = 0; ds.WriteXml(sw, XmlWriteMode.WriteSchema); @@ -188,11 +187,11 @@ namespace MonoTests.System.Data sw.GetStringBuilder().Length = 0; ds.WriteXml(sw); - xmlDSNone = sw.ToString().Replace ("\n", EOL); + xmlDSNone = sw.ToString(); sw.GetStringBuilder().Length = 0; ds.WriteXml(sw, XmlWriteMode.DiffGram); - xmlDSDiffGram = sw.ToString().Replace ("\n", EOL); + xmlDSDiffGram = sw.ToString(); sw.GetStringBuilder().Length = 0; ds.WriteXml(sw, XmlWriteMode.WriteSchema); diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs old mode 100644 new mode 100755 index 388f547212a..9d54c82ff9b --- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs +++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs @@ -3236,7 +3236,6 @@ namespace MonoTests.System.Data string TextString = GetNormalizedSchema (writer.ToString ()); //string TextString = writer.ToString (); - EOL = "\n"; string substring = TextString.Substring (0, TextString.IndexOf (EOL)); TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length); Assert.AreEqual ("", substring, "test#01"); diff --git a/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs b/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs old mode 100644 new mode 100755 index 053ecdbb032..93b0cc6ff3e --- a/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs +++ b/mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs @@ -174,9 +174,9 @@ namespace MonoTests.System.Data.Xml StringWriter sw = new StringWriter (); XmlTextWriter xw = new XmlTextWriter (sw); Doc.DataSet.WriteXml (xw); - string s = sw.ToString (); + string s = sw.ToString ().Replace ("\r", "").Replace ("\n", Environment.NewLine); Assert.AreEqual (xml, s, "#1"); - Assert.AreEqual (xml, Doc.InnerXml, "#2"); + Assert.AreEqual (xml, Doc.InnerXml.Replace ("\r", "").Replace ("\n", Environment.NewLine), "#2"); Assert.AreEqual ("EndOfFile", Reader.ReadState.ToString (), "test#01"); DataSet Set = Doc.DataSet; -- 2.25.1