From 991a8b1bd108c141cfda19649161a2c6d4e3a9ec Mon Sep 17 00:00:00 2001 From: sbohlen Date: Sat, 15 Mar 2014 09:12:02 -0400 Subject: [PATCH] add discriminator to respect CLR version (in addition to OS version) as a factor in choosing which FORMATTER-related expectations to test against --- .../Globalization/CultureInfoUtils.cs | 5 +++++ .../Formatters/CurrencyFormatterTests.cs | 12 ++++++------ .../Formatters/DateTimeFormatterTests.cs | 11 +++++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs b/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs index dbcca79c..181debc8 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/CultureInfoUtils.cs @@ -66,5 +66,10 @@ namespace Spring.Globalization { get { return Environment.OSVersion.Version.Major >= 6 && Environment.OSVersion.Version.Minor >= 2; } } + + public static bool ClrIsVersion4OrLater + { + get { return Environment.Version.Major >= 4; } + } } } diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs index b82e46ad..dee506fa 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs @@ -66,7 +66,7 @@ namespace Spring.Globalization.Formatters fmt = new CurrencyFormatter(CultureInfoUtils.SerbianLatinCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual("1.234,00 din.", fmt.Format(1234)); Assert.AreEqual("1.234,56 din.", fmt.Format(1234.56)); @@ -83,7 +83,7 @@ namespace Spring.Globalization.Formatters fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual("1.234,00 дин.", fmt.Format(1234)); Assert.AreEqual("1.234,56 дин.", fmt.Format(1234.56)); @@ -111,7 +111,7 @@ namespace Spring.Globalization.Formatters fmt = new CurrencyFormatter(CultureInfoUtils.SerbianLatinCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual(1234, fmt.Parse("1.234,00 din.")); Assert.AreEqual(1234.56, fmt.Parse("1.234,56 din.")); @@ -128,7 +128,7 @@ namespace Spring.Globalization.Formatters fmt = new CurrencyFormatter(CultureInfoUtils.SerbianCyrillicCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual(1234, fmt.Parse("1.234,00 дин.")); Assert.AreEqual(1234.56, fmt.Parse("1.234,56 дин.")); @@ -168,7 +168,7 @@ namespace Spring.Globalization.Formatters fmt.GroupSizes = new int[] { 1, 2 }; fmt.GroupSeparator = "'"; - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual("1'23'4,00 дин.", fmt.Format(1234)); Assert.AreEqual("1'23'4,56 дин.", fmt.Format(1234.56)); @@ -207,7 +207,7 @@ namespace Spring.Globalization.Formatters fmt.GroupSizes = new int[] { 1, 2 }; fmt.GroupSeparator = "'"; - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual(1234, fmt.Parse("1'23'4,00 дин.")); Assert.AreEqual(1234.56, fmt.Parse("1'23'4,56 дин.")); diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs index 2fb7af9d..f7e5c7a1 100644 --- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs +++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/DateTimeFormatterTests.cs @@ -68,7 +68,10 @@ namespace Spring.Globalization.Formatters fmt = new DateTimeFormatter("D", CultureInfoUtils.SerbianLatinCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + Console.WriteLine("Steve: " + Environment.Version); + + + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual("14. avgust 2004.", fmt.Format(new DateTime(2004, 8, 14))); Assert.AreEqual("24. avgust 1974.", fmt.Format(new DateTime(1974, 8, 24))); @@ -81,7 +84,7 @@ namespace Spring.Globalization.Formatters fmt = new DateTimeFormatter("dd-MMM-yyyy", CultureInfoUtils.SerbianCyrillicCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual("14-авг.-2004", fmt.Format(new DateTime(2004, 8, 14))); Assert.AreEqual("24-авг.-1974", fmt.Format(new DateTime(1974, 8, 24))); @@ -107,7 +110,7 @@ namespace Spring.Globalization.Formatters fmt = new DateTimeFormatter("D", CultureInfoUtils.SerbianLatinCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14. avgust 2004.")); Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("24. avgust 1974.")); @@ -120,7 +123,7 @@ namespace Spring.Globalization.Formatters fmt = new DateTimeFormatter("dd-MMM-yyyy", CultureInfoUtils.SerbianCyrillicCultureName); - if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7) + if (CultureInfoUtils.OperatingSystemIsLaterThanWindows7 && CultureInfoUtils.ClrIsVersion4OrLater) { Assert.AreEqual(new DateTime(2004, 8, 14), fmt.Parse("14-авг.-2004")); Assert.AreEqual(new DateTime(1974, 8, 24), fmt.Parse("24-авг.-1974"));