Merge pull request #1541 from alexrp/mcs-build-cleanup

[mono.git] / mcs / class / corlib / Test / System / SingleFormatterTest.cs

diff --git a/mcs/class/corlib/Test/System/SingleFormatterTest.cs b/mcs/class/corlib/Test/System/SingleFormatterTest.cs
index 66a064d783ffe96415d847526f76666a8cd1e141..a88dc2691fc4ba9615f6d02938d8e6e6133571b8 100644 (file)
--- a/mcs/class/corlib/Test/System/SingleFormatterTest.cs
+++ b/mcs/class/corlib/Test/System/SingleFormatterTest.cs
@@ -11,28 +11,34 @@ using System;
 using System.Threading;
 using System.Globalization;
 
-namespace MonoTests.System {
-       
+namespace MonoTests.System
+{
        [TestFixture]
        public class SingleFormatterTest 
        {
+               CultureInfo old_culture;
+
                [SetUp]
-               public void GetReady() 
+               public void SetUp ()
                {
-                       CultureInfo EnUs = new CultureInfo ("en-us", false);
+                       old_culture = Thread.CurrentThread.CurrentCulture;
+
+                       CultureInfo EnUs = new CultureInfo ("en-US", false);
                        EnUs.NumberFormat.CurrencyNegativePattern = 0; // -1 = (1)
                        EnUs.NumberFormat.CurrencyDecimalSeparator = ".";
                        EnUs.NumberFormat.NumberGroupSeparator = ",";
                        EnUs.NumberFormat.NumberNegativePattern = 1; // -1 = -1
                        EnUs.NumberFormat.NumberDecimalDigits = 2;
                        
-                       
                        //Set this culture for the current thread.
                        Thread.CurrentThread.CurrentCulture = EnUs;
                }
                
                [TearDown]
-               public void Clean() {}
+               public void TearDown ()
+               {
+                       Thread.CurrentThread.CurrentCulture = old_culture;
+               }
                
                [Test]
                [ExpectedException(typeof(FormatException))]
@@ -60,7 +66,7 @@ namespace MonoTests.System {
                
                private void FormatStringTest(int TestNumber, float Number, string Format, string ExpectedResult)
                {
-                       Assertion.AssertEquals ("SngF #" + TestNumber, ExpectedResult, Number.ToString(Format));                                
+                       Assert.AreEqual (ExpectedResult, Number.ToString(Format), "SngF #" + TestNumber);
                }
                
                string GetPercent (string s)