From 72fcab6399a562197bc283e8369e41283aa98b6a Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Wed, 8 Oct 2025 11:41:21 -0700 Subject: [PATCH 1/2] Fix NumberFormatInfoGroupSize test --- .../NumberFormatInfoNumberGroupSizes.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs index 62ae02d3aa4a4c..95c4aa6e923ebf 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs @@ -10,21 +10,24 @@ public class NumberFormatInfoNumberGroupSizes { public static IEnumerable NumberGroupSizes_TestData() { - yield return new object[] { NumberFormatInfo.InvariantInfo, new int[] { 3 } }; - yield return new object[] { CultureInfo.GetCultureInfo("en-US").NumberFormat, new int[] { 3 } }; + yield return new object[] { "Invariant", NumberFormatInfo.InvariantInfo, new int[] { 3 }, null }; + yield return new object[] { "en-US", CultureInfo.GetCultureInfo("en-US").NumberFormat, new int[] { 3 }, null }; // Culture does not exist on Windows 7 and in Browser's ICU if (!PlatformDetection.IsWindows7 && PlatformDetection.IsNotBrowser) { - yield return new object[] { CultureInfo.GetCultureInfo("ur-IN").NumberFormat, NumberFormatInfoData.UrINNumberGroupSizes() }; + yield return new object[] { "ur-IN", CultureInfo.GetCultureInfo("ur-IN").NumberFormat, NumberFormatInfoData.UrINNumberGroupSizes(), new int[] { 3, 2 } }; } } [Theory] [MemberData(nameof(NumberGroupSizes_TestData))] - public void NumberGroupSizes_Get_ReturnsExpected(NumberFormatInfo format, int[] expected) + public void NumberGroupSizes_Get_ReturnsExpected(string cultureName, NumberFormatInfo format, int[] expected1, int[] expected2) { - Assert.Equal(expected, format.NumberGroupSizes); + int[] actual = format.NumberGroupSizes; + Assert.True(expected1.SequenceEqual(actual) || (expected2 != null && expected2.SequenceEqual(actual)), + $"Expected: [{string.Join(", ", expected1)}] or [{(expected2 is null ? "" : string.Join(", ", expected2))}], Actual: [{string.Join(", ", actual)}]" + + $"{Environment.NewLine}Culture: {cultureName}"); } [Theory] From 74e892c114b063721023e7f9d7ae27943d08c044 Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed Date: Wed, 8 Oct 2025 11:55:52 -0700 Subject: [PATCH 2/2] Fix coding style --- .../NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs index 95c4aa6e923ebf..f88f59aa82a241 100644 --- a/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs +++ b/src/libraries/System.Runtime/tests/System.Globalization.Tests/NumberFormatInfo/NumberFormatInfoNumberGroupSizes.cs @@ -25,7 +25,7 @@ public static IEnumerable NumberGroupSizes_TestData() public void NumberGroupSizes_Get_ReturnsExpected(string cultureName, NumberFormatInfo format, int[] expected1, int[] expected2) { int[] actual = format.NumberGroupSizes; - Assert.True(expected1.SequenceEqual(actual) || (expected2 != null && expected2.SequenceEqual(actual)), + Assert.True(expected1.SequenceEqual(actual) || (expected2 is not null && expected2.SequenceEqual(actual)), $"Expected: [{string.Join(", ", expected1)}] or [{(expected2 is null ? "" : string.Join(", ", expected2))}], Actual: [{string.Join(", ", actual)}]" + $"{Environment.NewLine}Culture: {cultureName}"); }