Skip to content

Commit 2474ffa

Browse files
committed
Fix FormatUsingDefaults /3
Signed-off-by: Roberto Paterlini <[email protected]>
1 parent b952d45 commit 2474ffa

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

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

+19-12
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,17 @@ public void FormatUsingDefaults()
6565

6666
fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
6767

68+
#if NETFRAMEWORK
6869
Assert.AreEqual("1.234,00 дин.", fmt.Format(1234));
6970
Assert.AreEqual("1.234,56 дин.", fmt.Format(1234.56));
7071
Assert.AreEqual("-1.234,00 дин.", fmt.Format(-1234));
7172
Assert.AreEqual("-1.234,56 дин.", fmt.Format(-1234.56));
73+
#else
74+
Assert.AreEqual("1.234 RSD", fmt.Format(1234));
75+
Assert.AreEqual("1.235 RSD", fmt.Format(1234.56));
76+
Assert.AreEqual("-1.234 RSD", fmt.Format(-1234));
77+
Assert.AreEqual("-1.235 RSD", fmt.Format(-1234.56));
78+
#endif
7279
}
7380

7481
[Test]
@@ -89,10 +96,10 @@ public void ParseUsingDefaults()
8996
fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName);
9097

9198
#if NETFRAMEWORK
92-
Assert.AreEqual(1234, fmt.Parse("1.234,00 дин."));
93-
Assert.AreEqual(1234.56, fmt.Parse("1.234,56 дин."));
94-
Assert.AreEqual(-1234, fmt.Parse("-1.234,00 дин."));
95-
Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56 дин."));
99+
Assert.AreEqual(1234, fmt.Parse("1.234,00 дин."));
100+
Assert.AreEqual(1234.56, fmt.Parse("1.234,56 дин."));
101+
Assert.AreEqual(-1234, fmt.Parse("-1.234,00 дин."));
102+
Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56 дин."));
96103
#endif
97104
}
98105

@@ -122,10 +129,10 @@ public void FormatUsingCustomSettings()
122129
fmt.GroupSeparator = "'";
123130

124131
#if NETFRAMEWORK
125-
Assert.AreEqual("1'23'4,00 дин.", fmt.Format(1234));
126-
Assert.AreEqual("1'23'4,56 дин.", fmt.Format(1234.56));
127-
Assert.AreEqual("-1'23'4,00 дин.", fmt.Format(-1234));
128-
Assert.AreEqual("-1'23'4,56 дин.", fmt.Format(-1234.56));
132+
Assert.AreEqual("1'23'4,00 дин.", fmt.Format(1234));
133+
Assert.AreEqual("1'23'4,56 дин.", fmt.Format(1234.56));
134+
Assert.AreEqual("-1'23'4,00 дин.", fmt.Format(-1234));
135+
Assert.AreEqual("-1'23'4,56 дин.", fmt.Format(-1234.56));
129136
#else
130137
Assert.AreEqual("1'23'4 RSD", fmt.Format(1234));
131138
Assert.AreEqual("1'23'5 RSD", fmt.Format(1234.56));
@@ -159,10 +166,10 @@ public void ParseUsingCustomSettings()
159166
fmt.GroupSeparator = "'";
160167

161168
#if NETFRAMEWORK
162-
Assert.AreEqual(1234, fmt.Parse("1'23'4,00 дин."));
163-
Assert.AreEqual(1234.56, fmt.Parse("1'23'4,56 дин."));
164-
Assert.AreEqual(-1234, fmt.Parse("-1'23'4,00 дин."));
165-
Assert.AreEqual(-1234.56, fmt.Parse("-1'23'4,56 дин."));
169+
Assert.AreEqual(1234, fmt.Parse("1'23'4,00 дин."));
170+
Assert.AreEqual(1234.56, fmt.Parse("1'23'4,56 дин."));
171+
Assert.AreEqual(-1234, fmt.Parse("-1'23'4,00 дин."));
172+
Assert.AreEqual(-1234.56, fmt.Parse("-1'23'4,56 дин."));
166173
#endif
167174
}
168175
}

0 commit comments

Comments
 (0)