Skip to content

[release/6.0-staging] Fix Ordinal Ignore Case string compare #84386

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
tarekgh merged 1 commit into from
Apr 6, 2023
Merged

[release/6.0-staging] Fix Ordinal Ignore Case string compare #84386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Globalization/OrdinalCasing.Icu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ internal static int CompareStringIgnoreCase(ref char strA, int lengthA, ref char
continue;
}

return a - b;
return aUpper - bUpper;
}

//
Expand Down
17 changes: 17 additions & 0 deletions src/libraries/System.Runtime/tests/System/StringTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,5 +1960,22 @@ public static void EqualityTests_AsciiOptimizations()
}
}
}

[Theory]
[InlineData("a", "A", 0)]
[InlineData("A", "a", 0)]
[InlineData("Ab", "aB", 0)]
[InlineData("aB", "Ab", 0)]
[InlineData("aB", "Aa", 1)]
[InlineData("aa", "aB", -1)]
[InlineData("\u0160a", "\u0160A", 0)]
[InlineData("\u0160a", "\u0160B", -1)]
[InlineData("\u0160b", "\u0160A", 1)]
[InlineData("\u0160b\u0160\u0160\u0160", "\u0160A\u0160\u0160\u0160", 1)]
[InlineData("\u0160A\u0160\u0160\u0160", "\u0160b\u0160\u0160\u0160", -1)]
public static void TestCompareOrdinalIgnoreCase(string a, string b, int sign)
{
Assert.Equal(sign, Math.Sign(string.Compare(a, b, StringComparison.OrdinalIgnoreCase)));
}
}
}