From 7e98c8eaf66698fb28a8c3ac825559ce380c1624 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Fri, 18 Mar 2022 18:02:07 +0000 Subject: AK+Tests: Fix StringUtils::contains() being confused by repeating text Previously, case-insensitively searching the haystack "Go Go Back" for the needle "Go Back" would return false: 1. Match the first three characters. "Go ". 2. Notice that 'G' and 'B' don't match. 3. Skip ahead 3 characters, plus 1 for the outer for-loop. 4. Now, the haystack is effectively "o Back", so the match fails. Reducing the skip by 1 fixes this issue. I'm not 100% convinced this fixes all cases, but I haven't been able to find any cases where it doesn't work now. :^) --- Tests/AK/TestStringUtils.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Tests') diff --git a/Tests/AK/TestStringUtils.cpp b/Tests/AK/TestStringUtils.cpp index bff9aa5dcd..b82a73886d 100644 --- a/Tests/AK/TestStringUtils.cpp +++ b/Tests/AK/TestStringUtils.cpp @@ -321,6 +321,10 @@ TEST_CASE(contains) EXPECT(!AK::StringUtils::contains("", test_string, CaseSensitivity::CaseInsensitive)); EXPECT(!AK::StringUtils::contains(test_string, "L", CaseSensitivity::CaseSensitive)); EXPECT(!AK::StringUtils::contains(test_string, "L", CaseSensitivity::CaseInsensitive)); + + String command_palette_bug_string = "Go Go Back"; + EXPECT(AK::StringUtils::contains(command_palette_bug_string, "Go Back", AK::CaseSensitivity::CaseSensitive)); + EXPECT(AK::StringUtils::contains(command_palette_bug_string, "gO bAcK", AK::CaseSensitivity::CaseInsensitive)); } TEST_CASE(is_whitespace) -- cgit v1.2.3