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.

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

[TestOnly] port test fixes #89065

Merged
merged 1 commit into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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" }, true };
yield return new object[] { "pl", new [] { "pl" } };
yield return new object[] { "pl-PL", new [] { "pl-PL" } };
yield return new object[] { "prs", new [] { "prs" }, true };
yield return new object[] { "prs-AF", new [] { "prs-AF" }, true };
yield return new object[] { "prs", new [] { "prs", "fa" }, true };
yield return new object[] { "prs-AF", new [] { "prs-AF", "fa-AF" }, true};
yield return new object[] { "ps", new [] { "ps" }, true };
yield return new object[] { "ps-AF", new [] { "ps-AF" }, true };
yield return new object[] { "pt", new [] { "pt" } };
Expand Down Expand Up @@ -460,7 +460,7 @@ public void TestCreationWithMangledSortName(string cultureName, string expectedC
Assert.Equal(expectedSortName, ci.CompareInfo.Name);
}

private static bool SupportRemoteExecutionWithIcu => RemoteExecutor.IsSupported && PlatformDetection.IsIcuGlobalization;
private static bool SupportRemoteExecutionWithIcu => RemoteExecutor.IsSupported && PlatformDetection.IsIcuGlobalization && PlatformDetection.IsNotWindowsServerCore;

[InlineData("xx-u-XX", "xx-u-xx")]
[InlineData("xx-u-XX-u-yy", "xx-u-xx-u-yy")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@ 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 }};
}
}

[Theory]
[MemberData(nameof(CurrencyGroupSizes_TestData))]
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(format.CurrencyGroupSizes.AsSpan().SequenceEqual(expected.AsSpan()) || format.CurrencyGroupSizes.AsSpan().SequenceEqual(expectedAlternative.AsSpan()),
$"Expected {string.Join(", ", expected)} or {string.Join(", ", expectedAlternative ?? Array.Empty<int>())}, got {string.Join(", ", format.CurrencyGroupSizes)}");
}

[Theory]
Expand Down
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 @@ -115,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
Loading