X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FTest%2FSystem%2FSingleFormatterTest.cs;h=a88dc2691fc4ba9615f6d02938d8e6e6133571b8;hb=136f17a02462595d189fecebf458bf74c372458d;hp=66a064d783ffe96415d847526f76666a8cd1e141;hpb=5bbfa8860b090e465a3aa45edeb9c94481ef1a22;p=mono.git

diff --git a/mcs/class/corlib/Test/System/SingleFormatterTest.cs b/mcs/class/corlib/Test/System/SingleFormatterTest.cs
index 66a064d783f..a88dc2691fc 100644
--- 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)