Skip to content

Re-adding some tests that were commented out now that IgnoreCase work is done #67709

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

Merged
joperezr merged 2 commits into from
Apr 9, 2022
Merged

Re-adding some tests that were commented out now that IgnoreCase work is done #67709

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
017a62a
Re-adding some tests that were commented out now that IgnoreCase work…
joperezr Apr 7, 2022
ad9bbf2
Rever tests that are still failing on Android
joperezr Apr 7, 2022
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
14 changes: 5 additions & 9 deletions src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/RegexCultureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static IEnumerable<object[]> TurkishI_Is_Differently_LowerUpperCased_In_T
/// </summary>
[Theory]
[MemberData(nameof(TurkishI_Is_Differently_LowerUpperCased_In_Turkish_Culture_TestData))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/56407", TestPlatforms.Android)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/37069", TestPlatforms.Android)]
public void TurkishI_Is_Differently_LowerUpperCased_In_Turkish_Culture(int length, RegexOptions options)
{
var turkish = new CultureInfo("tr-TR");
Expand Down Expand Up @@ -191,7 +191,6 @@ public async Task TurkishI_Is_Differently_LowerUpperCased_In_Turkish_Culture_Non
Assert.True(turkishRegex.IsMatch(input.ToUpper(turkish)));
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/58958")]
[Theory]
[MemberData(nameof(RegexHelpers.AvailableEngines_MemberData), MemberType = typeof(RegexHelpers))]
public async Task TurkishCulture_Handling_Of_IgnoreCase(RegexEngine engine)
Expand All @@ -217,7 +216,6 @@ public static IEnumerable<object[]> TurkishCulture_MatchesWordChar_MemberData()
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/60568", TestPlatforms.Android)]
[MemberData(nameof(TurkishCulture_MatchesWordChar_MemberData))]
public async Task TurkishCulture_MatchesWordChar(RegexEngine engine, string input, RegexOptions options, string expectedResult)
{
Expand Down Expand Up @@ -314,8 +312,6 @@ public static IEnumerable<object[]> Match_In_Different_Cultures_CriticalCases_Te
public static IEnumerable<object[]> Match_In_Different_Cultures_CriticalCases_TestData() =>
Match_In_Different_Cultures_CriticalCases_TestData_For(RegexEngine.Interpreter).Union(Match_In_Different_Cultures_CriticalCases_TestData_For(RegexEngine.Compiled));

[ActiveIssue("https://github.com/dotnet/runtime/issues/60899", TestPlatforms.Browser)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/60697", TestPlatforms.iOS | TestPlatforms.tvOS)]
[Theory]
[MemberData(nameof(Match_In_Different_Cultures_TestData))]
public async Task Match_In_Different_Cultures(string pattern, RegexOptions options, RegexEngine engine, CultureInfo culture, string input, string match_expected)
Expand All @@ -325,8 +321,9 @@ public async Task Match_In_Different_Cultures(string pattern, RegexOptions optio
Assert.Equal(match_expected, match.Value);
}

[ActiveIssue("Incorrect treatment of IgnoreCase in Turkish and Invariant cultures, https://github.com/dotnet/runtime/issues/58956, https://github.com/dotnet/runtime/issues/58958 ")]
[Theory]
// .NET Framework doesn't use the Regex Casing table for case equivalences.
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
[MemberData(nameof(Match_In_Different_Cultures_CriticalCases_TestData))]
public async Task Match_In_Different_Cultures_CriticalCases(string pattern, RegexOptions options, RegexEngine engine, CultureInfo culture, string input, string match_expected)
{
Expand All @@ -335,8 +332,9 @@ public async Task Match_In_Different_Cultures_CriticalCases(string pattern, Rege
Assert.Equal(match_expected, match.Value);
}

[ActiveIssue("Incorrect result of match in complied mode in Invariant culture, https://github.com/dotnet/runtime/issues/58956")]
[Fact]
// .NET Framework doesn't use the Regex Casing table for case equivalences.
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
public void Match_InvariantCulture_None_vs_Compiled()
{
string pattern = "(?i:iI+)";
Expand All @@ -353,7 +351,6 @@ public void Match_InvariantCulture_None_vs_Compiled()
/// This test is to make sure that the generated IgnoreCaseRelation table for NonBacktracking does not need to be updated.
/// It would need to be updated/regenerated if this test fails.
/// </summary>
[ActiveIssue("https://github.com/dotnet/runtime/issues/60753")]
[OuterLoop("May take several seconds due to large number of cultures tested")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)]
[Fact]
Expand Down Expand Up @@ -415,7 +412,6 @@ public void TestIgnoreCaseRelation()
/// <summary>
/// This test currently only works correctly in NonBacktracking mode.
/// </summary>
[ActiveIssue("https://github.com/dotnet/runtime/issues/60753")]
[OuterLoop("May take tens of seconds")]
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Doesn't support NonBacktracking")]
[Theory]
Expand Down