Author: igorz
Date: 2008-02-07 07:50:37 -0500 (Thu, 07 Feb 2008)
New Revision: 95132
Modified:
trunk/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
trunk/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
Log:
fix tests:
consider "\r\n" - end of lines when run test on Windows.
Modified: trunk/mcs/class/System.Data/Test/System.Data/DataSetTest.cs
===================================================================
--- trunk/mcs/class/System.Data/Test/System.Data/DataSetTest.cs 2008-02-07
12:46:11 UTC (rev 95131)
+++ trunk/mcs/class/System.Data/Test/System.Data/DataSetTest.cs 2008-02-07
12:50:37 UTC (rev 95132)
@@ -1025,7 +1025,7 @@
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 @@
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 @@
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 @@
<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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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]
Modified: trunk/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
===================================================================
--- trunk/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
2008-02-07 12:46:11 UTC (rev 95131)
+++ trunk/mcs/class/System.Data/Test/System.Data/DataViewTest.cs
2008-02-07 12:50:37 UTC (rev 95132)
@@ -716,7 +716,7 @@
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 @@
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 @@
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 @@
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
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
