add check for CLR version to conditional Assert branching

sbohlen · sbohlen · commit dd78ba8f522e · 2015-11-25T08:36:45.000-05:00
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/CurrencyFormatterTests.cs
@@ -128,7 +128,7 @@ public void ParseUsingDefaults()
                 Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56 din."));
             }
 
-            else if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586)
+            else if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)
             {
                 Assert.AreEqual(1234, fmt.Parse("1.234 RSD"));
                 Assert.AreEqual(-1234, fmt.Parse("-1.234 RSD"));
@@ -176,7 +176,7 @@ public void FormatUsingCustomSettings()
             fmt.PositivePattern = 1;
             fmt.CurrencySymbol = "din";
 
-            if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586)
+            if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)
             {
                 Assert.AreEqual("1.234din", fmt.Format(1234));
                 Assert.AreEqual("1.235din", fmt.Format(1234.56));

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public void ParseUsingDefaults()`
`128`	`128`	`Assert.AreEqual(-1234.56, fmt.Parse("-1.234,56 din."));`
`129`	`129`	`}`
`130`	`130`
`131`		`- else if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586)`
	`131`	`+ else if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)`
`132`	`132`	`{`
`133`	`133`	`Assert.AreEqual(1234, fmt.Parse("1.234 RSD"));`
`134`	`134`	`Assert.AreEqual(-1234, fmt.Parse("-1.234 RSD"));`
`@@ -176,7 +176,7 @@ public void FormatUsingCustomSettings()`
`176`	`176`	`fmt.PositivePattern = 1;`
`177`	`177`	`fmt.CurrencySymbol = "din";`
`178`	`178`
`179`		`- if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586)`
	`179`	`+ if (CultureInfoUtils.OperatingSystemIsAtLeastWindows10Build10586 && CultureInfoUtils.ClrIsVersion4OrLater)`
`180`	`180`	`{`
`181`	`181`	`Assert.AreEqual("1.234din", fmt.Format(1234));`
`182`	`182`	`Assert.AreEqual("1.235din", fmt.Format(1234.56));`