* BinarySerializationTest.cs: Change culture for culture-sensitive

tests.
* DataColumnTest2.cs: Change culture for culture-sensitive tests.

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

diff --git a/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs b/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs
index 5ffa21511db5686fafe7f9b714a45633eabd2bd8..36d82147cdc8a24a22c9a5a8e300d6a9dacebcba 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs
+++ b/mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs
@@ -1,16 +1,35 @@
+#if NET_2_0
+
 using System;
 using System.Data;
+using System.Data.Common;
+using System.Globalization;
+using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters;
 using System.Runtime.Serialization.Formatters.Binary;
-using System.IO;
-using System.Data.Common;
+using System.Threading;
+
 using NUnit.Framework;
 
 [TestFixture]
 public class BinarySerializationTest
 {
-#if NET_2_0
+       private CultureInfo originalCulture;
+
+       [SetUp]
+       public void SetUp ()
+       {
+               originalCulture = Thread.CurrentThread.CurrentCulture;
+               Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US");
+       }
+
+       [TearDown]
+       public void TearDown ()
+       {
+               Thread.CurrentThread.CurrentCulture = originalCulture;
+       }
+
        [Test]
        public void RemotingFormatDataTableTest ()
        {
@@ -741,5 +760,6 @@ public class BinarySerializationTest
                for (int i = 0; i < ds.Relations.Count; i++)
                        Assert.AreEqual (ds.Relations [i].RelationName, ds.Relations [i].RelationName, "#9 Relation : {0} differs", ds.Relations [i]);
        }
-#endif
 }
+
+#endif

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index 70b4913c72476a2f8c5985076504fa6016c094a1..de2867a267d409bc7a0385aba66bdffd2e495fbc 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -2,6 +2,10 @@
 
        * DataTableTest.cs: Allow NFIFromBug55978 test to pass when MONO_PATH
        is not set.
+       * BinarySerializationTest.cs: Change culture for culture-sensitive
+       tests.
+       * DataColumnTest2.cs: Change culture for culture-sensitive tests.
+
 
 2008-11-18  Raja R Harinath  <harinath@hurrynot.org>
 

diff --git a/mcs/class/System.Data/Test/System.Data/DataColumnTest2.cs b/mcs/class/System.Data/Test/System.Data/DataColumnTest2.cs
index 55a75bbbc8af3636862c6cd43296fa4ca8a964d2..1d5cbf335e4d9de6f4cffbf1cbda1d56137bbe3b 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/DataColumnTest2.cs
+++ b/mcs/class/System.Data/Test/System.Data/DataColumnTest2.cs
@@ -26,16 +26,36 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using NUnit.Framework;
 using System;
 using System.ComponentModel;
 using System.Data;
+using System.Globalization;
+using System.Threading;
+
 using MonoTests.System.Data.Utils;
 
+using NUnit.Framework;
+
 namespace MonoTests.System.Data
 {
-       [TestFixture] public class DataColumnTest2
+       [TestFixture]
+       public class DataColumnTest2
        {
+               private CultureInfo originalCulture;
+
+               [SetUp]
+               public void SetUp ()
+               {
+                       originalCulture = Thread.CurrentThread.CurrentCulture;
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US");
+               }
+
+               [TearDown]
+               public void TearDown ()
+               {
+                       Thread.CurrentThread.CurrentCulture = originalCulture;
+               }
+
                [Test] public void AllowDBNull()
                {
                        DataTable dt = new DataTable();