From ee37c447a195dac738cf5fabf6e95d6fb7d06809 Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Tue, 24 Nov 2015 19:02:25 -0500 Subject: [PATCH] fix DateTimeFormatterTests for Windows 10 Build 10586 --- .../Formatters/DateTimeFormatterTests.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs index aa31bb05..19781274 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs @@ -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"));