Fix coreclr Test570 due to ICU on Windows feature (dotnet#35435)

* Remove test and add testcase to PercentDecimalDigits tests
kmett · Apr 25, 2020 · 1db71ea · 1db71ea
1 parent ab7ef9b
commit 1db71ea
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 59 deletions.
diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/Utilities.cs b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/Utilities.cs
@@ -73,6 +73,7 @@ public static bool Verbose
         // Windows 10 October 2018 Update
         public static bool IsWindows10Version1809OrGreater =>
             IsWindows && GetWindowsVersion() == 10 && GetWindowsMinorVersion() == 0 && GetWindowsBuildNumber() >= 17763;
+
         public static bool IsWindowsIoTCore
         {
             get

diff --git a/src/coreclr/tests/src/Regressions/coreclr/0570/Test570.csproj b/src/coreclr/tests/src/Regressions/coreclr/0570/Test570.csproj
diff --git a/src/coreclr/tests/src/Regressions/coreclr/0570/test570.cs b/src/coreclr/tests/src/Regressions/coreclr/0570/test570.cs
diff --git a/...aries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentDecimalDigits.cs b/...aries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoPercentDecimalDigits.cs
@@ -2,16 +2,25 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using Xunit;
 
 namespace System.Globalization.Tests
 {
     public class NumberFormatInfoPercentDecimalDigits
     {
-        [Fact]
-        public void PercentDecimalDigits_GetInvariantInfo_ReturnsExpected()
+        public static IEnumerable<object[]> PercentDecimalDigits_TestData()
+        {
+            yield return new object[] { NumberFormatInfo.InvariantInfo, 2, 2 };
+            yield return new object[] { CultureInfo.GetCultureInfo("en-US").NumberFormat, 2, 3 };
+        }
+
+        [Theory]
+        [MemberData(nameof(PercentDecimalDigits_TestData))]
+        public void PercentDecimalDigits_Get_ReturnsExpected(NumberFormatInfo format, int expectedNls, int expectedIcu)
         {
-            Assert.Equal(2, NumberFormatInfo.InvariantInfo.PercentDecimalDigits);
+            int expected = PlatformDetection.IsNlsGlobalization ? expectedNls : expectedIcu;
+            Assert.Equal(expected, format.PercentDecimalDigits);
         }
 
         [Theory]