Merge pull request #1896 from meum/patch-1

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

diff --git a/mcs/class/corlib/Test/System/FloatingPointFormatterTest.cs b/mcs/class/corlib/Test/System/FloatingPointFormatterTest.cs
index a87fcbe7736738a74025318d8f5d59e0c6e27067..51a41385d9d7f59f90e0e0c0de1a58a1a77ba0a2 100644 (file)
--- a/mcs/class/corlib/Test/System/FloatingPointFormatterTest.cs
+++ b/mcs/class/corlib/Test/System/FloatingPointFormatterTest.cs
@@ -8,23 +8,40 @@
 // (C) 2004 Novell Inc.
 // 
 
-using NUnit.Framework;
 using System;
 using System.Globalization;
 using System.IO;
+using System.Threading;
+
+using NUnit.Framework;
 
 namespace MonoTests.System
 {
        [TestFixture]
-       public class FloatingPointFormatterTest : Assertion
+       public class FloatingPointFormatterTest 
        {
+               CultureInfo old_culture;
+
+               [SetUp]
+               public void SetUp ()
+               {
+                       old_culture = Thread.CurrentThread.CurrentCulture;
+                       Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+               }
+
+               [TearDown]
+               public void TearDown ()
+               {
+                       Thread.CurrentThread.CurrentCulture = old_culture;
+               }
+
                [Test]
                public void Format1 ()
                {
-                       AssertEquals ("F1", "100000000000000", 1.0e+14.ToString ());
-                       AssertEquals ("F2", "1E+15", 1.0e+15.ToString ());
-                       AssertEquals ("F3", "1E+16", 1.0e+16.ToString ());
-                       AssertEquals ("F4", "1E+17", 1.0e+17.ToString ());
+                       Assert.AreEqual ("100000000000000", 1.0e+14.ToString (), "F1");
+                       Assert.AreEqual ("1E+15", 1.0e+15.ToString (), "F2");
+                       Assert.AreEqual ("1E+16", 1.0e+16.ToString (), "F3");
+                       Assert.AreEqual ("1E+17", 1.0e+17.ToString (), "F4");
                }
 
                [Test]
@@ -33,40 +50,40 @@ namespace MonoTests.System
                        CultureInfo ci = new CultureInfo ("en-US");
                        double val = 12345.1234567890123456;
                        string s = val.ToString(".0################;-.0################;0.0", ci);
-                       AssertEquals ("#1", "12345.123456789", s);
+                       Assert.AreEqual ("12345.123456789", s, "#1");
 
                        s = (-val).ToString(".0################;-.0#######;#########;0.0", ci);
-                       AssertEquals ("#2", "-12345.12345679", s);
+                       Assert.AreEqual ("-12345.12345679", s, "#2");
 
                        s = 0.0.ToString(".0################;-.0#######;+-0", ci);
-                       AssertEquals ("#3", "+-0", s);
+                       Assert.AreEqual ("+-0", s, "#3");
                }
 
                [Test]
                public void PermillePercent ()
                {
                        CultureInfo ci = CultureInfo.InvariantCulture;
-                       AssertEquals ("#1", "485.7\u2030", (0.4857).ToString ("###.###\u2030"));
+                       Assert.AreEqual ("485.7\u2030", (0.4857).ToString ("###.###\u2030"), "#1");
                        NumberFormatInfo nfi = new NumberFormatInfo ();
                        nfi.NegativeSign = "";
                        nfi.PerMilleSymbol = "m";
                        nfi.PercentSymbol = "percent";
-                       AssertEquals ("#2", "m485.7", 0.4857.ToString ("\u2030###.###", nfi));
-                       AssertEquals ("#3", "485.7m", 0.4857.ToString ("###.###\u2030", nfi));
-                       AssertEquals ("#4", "percent48.57", 0.4857.ToString ("%###.###", nfi));
-                       AssertEquals ("#5", "48.57percent", 0.4857.ToString ("###.###%", nfi));
+                       Assert.AreEqual ("m485.7", 0.4857.ToString ("\u2030###.###", nfi), "#2");
+                       Assert.AreEqual ("485.7m", 0.4857.ToString ("###.###\u2030", nfi), "#3");
+                       Assert.AreEqual ("percent48.57", 0.4857.ToString ("%###.###", nfi), "#4");
+                       Assert.AreEqual ("48.57percent", 0.4857.ToString ("###.###%", nfi), "#5");
                }
 
                [Test]
                public void LiteralMixed ()
                {
                        CultureInfo ci = CultureInfo.InvariantCulture;
-                       AssertEquals ("#1", "test 235", 234.56.ToString ("'test' ###", ci));
-                       AssertEquals ("#2", "235 test", 234.56.ToString ("### 'test'", ci));
-                       AssertEquals ("#3", "234 test.56", 234.56.ToString ("### 'test'.###", ci));
-                       AssertEquals ("#1", "hoge 235", 234.56.ToString ("'hoge' ###", ci));
-                       AssertEquals ("#2", "235 hoge", 234.56.ToString ("### 'hoge'", ci));
-                       AssertEquals ("#3", "234 hoge.56", 234.56.ToString ("### 'hoge'.###", ci));
+                       Assert.AreEqual ("test 235", 234.56.ToString ("'test' ###", ci), "#1");
+                       Assert.AreEqual ("235 test", 234.56.ToString ("### 'test'", ci), "#2");
+                       Assert.AreEqual ("234 test.56", 234.56.ToString ("### 'test'.###", ci), "#3");
+                       Assert.AreEqual ("hoge 235", 234.56.ToString ("'hoge' ###", ci), "#1");
+                       Assert.AreEqual ("235 hoge", 234.56.ToString ("### 'hoge'", ci), "#2");
+                       Assert.AreEqual ("234 hoge.56", 234.56.ToString ("### 'hoge'.###", ci), "#3");
                }
-        }
+       }
 }