Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Globalization Tests #88969

Merged
merged 3 commits into from
Jul 17, 2023
Merged

Fix Globalization Tests #88969

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95288fa
Fix Globalization Tests
tarekgh Jul 16, 2023
5906369
Address the feedback
tarekgh Jul 17, 2023
33e66d9
Exclude one of the tests from running on server core
tarekgh Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ public static IEnumerable<object[]> Ctor_String_TestData()
yield return new object[] { "pa-IN", new [] { "pa-IN" }};
yield return new object[] { "pl", new [] { "pl" } };
yield return new object[] { "pl-PL", new [] { "pl-PL" } };
yield return new object[] { "prs", new [] { "prs" }};
yield return new object[] { "prs-AF", new [] { "prs-AF" }};
yield return new object[] { "prs", new [] { "prs", "fa" } };
yield return new object[] { "prs-AF", new [] { "prs-AF", "fa-AF" }};
yield return new object[] { "ps", new [] { "ps" }};
yield return new object[] { "ps-AF", new [] { "ps-AF" }};
yield return new object[] { "pt", new [] { "pt" } };
Expand Down Expand Up @@ -386,7 +386,6 @@ public static IEnumerable<object[]> Ctor_String_TestData()

[Theory]
[MemberData(nameof(Ctor_String_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/79867", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows))]
public void Ctor_String(string name, string[] expectedNames)
{
CultureInfo culture = new CultureInfo(name);
Expand Down
35 changes: 29 additions & 6 deletions ...braries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,44 @@ public class NumberFormatInfoCurrencyGroupSizes
{
public static IEnumerable<object[]> CurrencyGroupSizes_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[] { NumberFormatInfo.InvariantInfo, new int[] { 3 }, null };
yield return new object[] { CultureInfo.GetCultureInfo("en-US").NumberFormat, new int[] { 3 }, null };

if (PlatformDetection.IsNotUsingLimitedCultures && !PlatformDetection.IsUbuntu && !PlatformDetection.IsWindows7 && !PlatformDetection.IsWindows8x && !PlatformDetection.IsFedora)
{
yield return new object[] { CultureInfo.GetCultureInfo("ur-IN").NumberFormat, new int[] { 3, 2 } };
yield return new object[] { CultureInfo.GetCultureInfo("ur-IN").NumberFormat, new int[] { 3, 2 }, new int[] { 3 }};
}
}

private static bool ArrayEqual<T>(T[] a, T[] b)
{
if (a == null || b == null)
{
return a == b;
}

if (a.Length != b.Length)
tarekgh marked this conversation as resolved.
Show resolved Hide resolved
{
return false;
}

for (int i = 0; i < a.Length; ++i)
{
if (!a[i].Equals(b[i]))
{
return false;
}
}

return true;
}

[Theory]
[MemberData(nameof(CurrencyGroupSizes_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/79867", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows))]
public void CurrencyGroupSizes_Get_ReturnsExpected(NumberFormatInfo format, int[] expected)
public void CurrencyGroupSizes_Get_ReturnsExpected(NumberFormatInfo format, int[] expected, int [] expectedAlternative)
{
Assert.Equal(expected, format.CurrencyGroupSizes);
Assert.True(ArrayEqual(expected, format.CurrencyGroupSizes) || ArrayEqual(expectedAlternative, format.CurrencyGroupSizes),
$"Expected {string.Join(", ", expected)} or {string.Join(", ", expectedAlternative ?? Array.Empty<int>())}, got {string.Join(", ", format.CurrencyGroupSizes)}");
}

[Theory]
Expand Down
21 changes: 18 additions & 3 deletions src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ public static IEnumerable<object[]> DigitSubstitution_TestData()
yield return new object[] { "nqo-GN" , DigitShapes.NativeNational };
yield return new object[] { "pa-Arab" , DigitShapes.NativeNational };
yield return new object[] { "pa-Arab-PK", DigitShapes.NativeNational };
yield return new object[] { "prs" , DigitShapes.NativeNational };
yield return new object[] { "prs-AF" , DigitShapes.NativeNational };
yield return new object[] { "ps" , DigitShapes.NativeNational };
yield return new object[] { "ps-AF" , DigitShapes.NativeNational };
yield return new object[] { "sd" , DigitShapes.NativeNational };
Expand Down Expand Up @@ -102,7 +100,6 @@ public void TestNFIFormatLimits()

[Theory]
[MemberData(nameof(DigitSubstitution_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/79867", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows))]
public void DigitSubstitutionListTest(string cultureName, DigitShapes shape)
{
try
Expand All @@ -116,6 +113,24 @@ public void DigitSubstitutionListTest(string cultureName, DigitShapes shape)
}
}

[Theory]
[InlineData("prs")]
[InlineData("prs-AF")]
public void PrsNativeDigitsTest(string cultureName)
{
try
{
CultureInfo ci = CultureInfo.GetCultureInfo(cultureName);

// Some OS's set the DigitSubstitution to Context for the culture "prs" and "prs-AF". Majority of Os's set it to NativeNational.
Assert.True(ci.NumberFormat.DigitSubstitution == DigitShapes.Context || ci.NumberFormat.DigitSubstitution == DigitShapes.NativeNational);
}
catch (CultureNotFoundException)
{
// ignore the cultures that we cannot create as it is not supported on the platforms
}
}

public static IEnumerable<object[]> NativeDigitTestData()
{
yield return new object[] { "ccp-Cakm-BD", new string[] { "\U0001E950", "\U0001E951", "\U0001E952", "\U0001E953", "\U0001E954", "\U0001E955", "\U0001E956", "\U0001E957", "\U0001E958", "\U0001E959" }};
Expand Down