Fixes line ending issues in System.Data tests

[mono.git] / mcs / class / System.Data / Test / System.Data / DataTableTest.cs

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 (file)
new mode 100755 (executable)
index 0f2d40a..9d54c82
--- a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -54,6 +54,12 @@ namespace MonoTests.System.Data
        [TestFixture]
        public class DataTableTest :  DataSetAssertion
        {
+               [SetUp]
+               public void Setup ()
+               {
+                       MyDataTable.count = 0;
+               }
+
                string EOL = Environment.NewLine;
 
                [Test]
@@ -816,6 +822,7 @@ namespace MonoTests.System.Data
                }
                
                [Test]
+               [SetCulture("en-US")]
                public void PropertyExceptions ()
                {
                        DataSet set = new DataSet ();
@@ -1300,7 +1307,6 @@ namespace MonoTests.System.Data
                        }
                }
                
-#if NET_4_0
                [Test]
                public void ImportRowTypeChangeTest ()
                {
@@ -1374,7 +1380,6 @@ namespace MonoTests.System.Data
                                }
                        }
                }
-#endif
                        
                [Test]
                public void ClearReset () //To test Clear and Reset methods
@@ -3220,6 +3225,7 @@ namespace MonoTests.System.Data
                }
 
                [Test]
+               [SetCulture ("en-GB")]
                public void WriteXmlSchema ()
                {
                        DataSet ds = new DataSet ();
@@ -3230,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 ("<?xml version=\"1.0\" encoding=\"utf-16\"?>", substring, "test#01");
@@ -3242,7 +3247,7 @@ namespace MonoTests.System.Data
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
                        // Looks like whoever added this test depended on English culture, which is wrong.
-                       Assert.AreEqual ("  <xs:element msdata:IsDataSet=\"true\" msdata:MainDataTable=\"Region\" msdata:UseCurrentLocale=\"true\" name=\"Root\">", substring, "test#03");
+                       Assert.AreEqual ("  <xs:element msdata:IsDataSet=\"true\" msdata:Locale=\"en-US\" msdata:MainDataTable=\"Region\" name=\"Root\">", substring, "test#03");
 
                        substring = TextString.Substring (0, TextString.IndexOf (EOL));
                        TextString = TextString.Substring (TextString.IndexOf (EOL) + EOL.Length);
@@ -4173,7 +4178,7 @@ namespace MonoTests.System.Data
 
        public  class MyDataTable : DataTable
        {
-               public static int count = 0;
+               public static int count;
 
                public MyDataTable()
                {
@@ -4191,7 +4196,7 @@ namespace MonoTests.System.Data
                        Assert.AreEqual (5, n, "n");
                }
 
-#if !MONOTOUCH
+#if !MONOTOUCH && !MOBILE_STATIC
                [Test]
                public void NFIFromBug55978 ()
                {
@@ -4205,6 +4210,7 @@ namespace MonoTests.System.Data
 #endif
 
                [Test]
+               [SetCulture ("en-US")]
                public void Bug55978 ()
                {
                        DataTable dt = new DataTable ();