fix tests:

consider "\r\n" - end of lines when run test on Windows.

svn path=/trunk/mcs/; revision=95132

diff --git a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
index 99dcc74e27569107069be98cd28404fbf6ac53e7..195468500971a2e4ba9ece9a0b9baff4040c7403 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
@@ -1025,7 +1025,7 @@ namespace MonoTests.System.Data
                        ds.WriteXmlSchema (xw);
 
                        string result = sw.ToString ();
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), schema);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), schema.Replace ("\r\n", "\n"));
                }
 
                [Test]
@@ -1066,7 +1066,7 @@ namespace MonoTests.System.Data
                        ser.Serialize (xw, ds);
 
                        string result = sw.ToString ();
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xml);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xml.Replace ("\r\n", "\n"));
                }
 
                // bug #70961
@@ -1414,7 +1414,7 @@ namespace MonoTests.System.Data
                        ds.Relations.Add (rel);
                        StringWriter sw = new StringWriter ();
                        ds.WriteXml (sw);
-                       Assert.AreEqual (sw.ToString ().Replace ("\r\n", "\n"), xml);
+                       Assert.AreEqual (sw.ToString ().Replace ("\r\n", "\n"), xml.Replace ("\r\n", "\n"));
                }
 
                [Test]
@@ -1436,7 +1436,7 @@ namespace MonoTests.System.Data
     <col3>sample text 2</col3>
   </table2>
 </set>";
-                       Assert.AreEqual (sr.ReadToEnd ().Replace ("\r\n", "\n"), result);
+                       Assert.AreEqual (sr.ReadToEnd ().Replace ("\r\n", "\n"), result.Replace ("\r\n", "\n"));
                }
 
                [Test]
@@ -1453,7 +1453,7 @@ namespace MonoTests.System.Data
                        ds.Tables [0].Rows.Add (new object [] {"content string."});
                        StringWriter sw = new StringWriter ();
                        ds.WriteXml (sw);
-                       Assert.AreEqual (sw.ToString ().Replace ("\r\n", "\n"), xml);
+                       Assert.AreEqual (sw.ToString ().Replace ("\r\n", "\n"), xml.Replace ("\r\n", "\n"));
                }
 
                [Test]
@@ -1493,7 +1493,7 @@ namespace MonoTests.System.Data
                        xtw.QuoteChar = '\'';
                        ds.WriteXml (xtw);
                        xtw.Flush ();
-                       Assert.AreEqual (input, sw.ToString ().Replace ("\r\n", "\n"));
+                       Assert.AreEqual (input.Replace ("\r\n", "\n"), sw.ToString ().Replace ("\r\n", "\n"));
                }
 
                [Test] // bug #60469
@@ -1556,7 +1556,7 @@ namespace MonoTests.System.Data
                        result = sw.ToString ();
 
                        result = result.Replace ("\r\n", "\n").Replace ('"', '\'');
-                       Assert.AreEqual (schema, result);
+                       Assert.AreEqual (schema.Replace ("\r\n", "\n"), result);
                }
 
                // bug #66366
@@ -1605,7 +1605,7 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema.Replace ("\r\n", "\n"));
                }
 
                // bug #67792.
@@ -1653,7 +1653,7 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema.Replace ("\r\n", "\n"));
                }
 
                // bug # 68432
@@ -1767,7 +1767,7 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema.Replace ("\r\n", "\n"));
                }
 
                // bug #67793
@@ -1816,7 +1816,7 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xmlschema.Replace ("\r\n", "\n"));
                }
 
                // bug #68008
@@ -1872,7 +1872,7 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xml);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xml.Replace ("\r\n", "\n"));
                }
 
                [Test]
@@ -2015,7 +2015,7 @@ namespace MonoTests.System.Data
 
                        string result = sw.ToString ();
 
-                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xml);
+                       Assert.AreEqual (result.Replace ("\r\n", "\n"), xml.Replace ("\r\n", "\n"));
                }
 
                [Test]

diff --git a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
index c31a312b065abba4912571ada68f3fc7f19edfe9..74d627eed8a7a8a3a25f5d81abf49acc5f5175e6 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
@@ -716,7 +716,7 @@ table was set.
 
                        dc2.ColumnName = "new_column_name";
 
-                       AssertEquals (result, eventWriter.ToString ().Replace ("\r\n", "\n"));
+                       AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
                }
 
                private void ListChanged (object o, ListChangedEventArgs e)
@@ -780,7 +780,7 @@ removed relation 2
                        ds.Relations.Remove (dr);
                        eventWriter.WriteLine ("removed relation 2");
 
-                       AssertEquals (result, eventWriter.ToString ().Replace ("\r\n", "\n"));
+                       AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
                }
 
                [Test]
@@ -892,7 +892,7 @@ table changed.
                        dv.Table = new DataTable ("table2");
                        eventWriter.WriteLine ("table changed.");
 
-                       AssertEquals (result, eventWriter.ToString ().Replace ("\r\n", "\n"));
+                       AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
                }
 
                [Test]
@@ -958,7 +958,7 @@ table was set.
                        dt.Columns.Add ("");
                        eventWriter.WriteLine (" add a column with an empty name.");
 
-                       AssertEquals (result, eventWriter.ToString ().Replace ("\r\n", "\n"));
+                       AssertEquals (result.Replace ("\r\n", "\n"), eventWriter.ToString ().Replace ("\r\n", "\n"));
                }
 
                public class ComplexEventSequence1View : DataView