Skip to content

Commit 2efcd09

Browse files
committed
Fix FormatUsingDefaults
Signed-off-by: Roberto Paterlini <[email protected]>
1 parent 7c355c0 commit 2efcd09

File tree

4 files changed

+0
-29
lines changed

4 files changed

+0
-29
lines changed

Diff for: test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs

-12
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,8 @@ public void FormatUsingDefaults()
5353
CurrencyFormatter fmt = new CurrencyFormatter("en-US");
5454
Assert.AreEqual("$1,234.00", fmt.Format(1234));
5555
Assert.AreEqual("$1,234.56", fmt.Format(1234.56));
56-
#if NETFRAMEWORK
5756
Assert.AreEqual("($1,234.00)", fmt.Format(-1234));
5857
Assert.AreEqual("($1,234.56)", fmt.Format(-1234.56));
59-
#else
60-
Assert.AreEqual("-$1,234.00", fmt.Format(-1234));
61-
Assert.AreEqual("-$1,234.56", fmt.Format(-1234.56));
62-
#endif
6358

6459
fmt = new CurrencyFormatter(CultureInfoUtils.SerbianLatinCultureName);
6560

@@ -70,17 +65,10 @@ public void FormatUsingDefaults()
7065

7166
fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
7267

73-
#if NETFRAMEWORK
74-
Assert.AreEqual("1.234,00 дин.", fmt.Format(1234));
75-
Assert.AreEqual("1.234,56 дин.", fmt.Format(1234.56));
76-
Assert.AreEqual("-1.234,00 дин.", fmt.Format(-1234));
77-
Assert.AreEqual("-1.234,56 дин.", fmt.Format(-1234.56));
78-
#else
7968
Assert.AreEqual("1.234 RSD", fmt.Format(1234));
8069
Assert.AreEqual("1.235 RSD", fmt.Format(1234.56));
8170
Assert.AreEqual("-1.234 RSD", fmt.Format(-1234));
8271
Assert.AreEqual("-1.235 RSD", fmt.Format(-1234.56));
83-
#endif
8472
}
8573

8674
[Test]

Diff for: test/Spring/Spring.Core.Tests/Globalization/Formatters/FloatFormatterTests.cs

-5
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,8 @@ public void FormatNonNumber()
5151
public void FormatUsingDefaults()
5252
{
5353
FloatFormatter fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "en-US");
54-
#if NETFRAMEWORK
5554
Assert.AreEqual("1234.00", fmt.Format(1234));
5655
Assert.AreEqual("-1234.00", fmt.Format(-1234));
57-
#else
58-
Assert.AreEqual("1234.000", fmt.Format(1234));
59-
Assert.AreEqual("-1234.000", fmt.Format(-1234));
60-
#endif
6156

6257
fmt = new FloatFormatter(FloatFormatter.DefaultFormat, "sr-SP-Latn");
6358
#if NETFRAMEWORK

Diff for: test/Spring/Spring.Core.Tests/Globalization/Formatters/NumberFormatterTests.cs

-7
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,10 @@ public void FormatNonNumber()
5151
public void FormatUsingDefaults()
5252
{
5353
NumberFormatter fmt = new NumberFormatter("en-US");
54-
#if NETFRAMEWORK
5554
Assert.AreEqual("1,234.00", fmt.Format(1234));
5655
Assert.AreEqual("1,234.56", fmt.Format(1234.56));
5756
Assert.AreEqual("-1,234.00", fmt.Format(-1234));
5857
Assert.AreEqual("-1,234.56", fmt.Format(-1234.56));
59-
#else
60-
Assert.AreEqual("1,234.000", fmt.Format(1234));
61-
Assert.AreEqual("1,234.560", fmt.Format(1234.56));
62-
Assert.AreEqual("-1,234.000", fmt.Format(-1234));
63-
Assert.AreEqual("-1,234.560", fmt.Format(-1234.56));
64-
#endif
6558

6659
fmt = new NumberFormatter("sr-SP-Latn");
6760
#if NETFRAMEWORK

Diff for: test/Spring/Spring.Core.Tests/Globalization/Formatters/PercentFormatterTests.cs

-5
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,8 @@ public void FormatNonNumber()
5151
public void FormatUsingDefaults()
5252
{
5353
PercentFormatter fmt = new PercentFormatter("en-US");
54-
#if NETFRAMEWORK
5554
Assert.AreEqual("25.00%", fmt.Format(0.25).Replace(" ", ""));
5655
Assert.AreEqual("25.34%", fmt.Format(0.2534).Replace(" ", ""));
57-
#else
58-
Assert.AreEqual("25.000%", fmt.Format(0.25).Replace(" ", ""));
59-
Assert.AreEqual("25.340%", fmt.Format(0.2534).Replace(" ", ""));
60-
#endif
6156

6257
fmt = new PercentFormatter("sr-SP-Latn");
6358
#if NETFRAMEWORK

0 commit comments

Comments
 (0)