Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix DateTimeFormatterTests for Windows 10 Build 10586

Browse Source
This commit is contained in:
Steve Bohlen
2015-11-24 19:02:25 -05:00
parent 6d95db75aa
commit ee37c447a1
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs
View File

@@ -76,6 +76,13 @@ namespace Spring.Globalization.Formatters
Assert.AreEqual("14. avgust 2004.", fmt.Format(new DateTime(2004, 8, 14)));
Assert.AreEqual("24. avgust 1974.", fmt.Format(new DateTime(1974, 8, 24)));
}
else if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)
{
Assert.AreEqual("subota, 14. avgust 2004.", fmt.Format(new DateTime(2004, 8, 14)));
Assert.AreEqual("subota, 24. avgust 1974.", fmt.Format(new DateTime(1974, 8, 24)));
}
else
{
Assert.AreEqual("14. avgust 2004", fmt.Format(new DateTime(2004, 8, 14)));
@@ -84,7 +91,7 @@ namespace Spring.Globalization.Formatters
fmt = new DateTimeFormatter("dd-MMM-yyyy", CultureInfoUtils.SerbianCyrillicCultureName);
if (CultureInfoUtils.OperatingSystemIsAfterWindows7AndBeforeWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)
if (CultureInfoUtils.OperatingSystemIsAfterWindows7 && CultureInfoUtils.ClrIsVersion4OrLater)
{
Assert.AreEqual("14-авг.-2004", fmt.Format(new DateTime(2004, 8, 14)));
Assert.AreEqual("24-авг.-1974", fmt.Format(new DateTime(1974, 8, 24)));
@@ -115,6 +122,13 @@ namespace Spring.Globalization.Formatters
Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14. avgust 2004."));
Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("24. avgust 1974."));
}
else if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)
{
Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("subota, 14. avgust 2004."));
Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("subota, 24. avgust 1974."));
}
else
{
Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14. avgust 2004"));
@@ -123,7 +137,7 @@ namespace Spring.Globalization.Formatters
fmt = new DateTimeFormatter("dd-MMM-yyyy", CultureInfoUtils.SerbianCyrillicCultureName);
if (CultureInfoUtils.OperatingSystemIsAfterWindows7AndBeforeWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)
if (CultureInfoUtils.OperatingSystemIsAfterWindows7 && CultureInfoUtils.ClrIsVersion4OrLater)
{
Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14-авг.-2004"));
Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("24-авг.-1974"));