-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: mention highlight [WPB-3507] (#2166)
Co-authored-by: Jakub Żerko <iot.zerko@gmail.com>
- Loading branch information
1 parent
4a8cabe
commit cee9f7c
Showing
9 changed files
with
151 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
app/src/main/kotlin/com/wire/android/ui/home/conversations/search/QueryExtension.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| */ | ||
| package com.wire.android.ui.home.conversations.search | ||
|
|
||
| fun String.removeQueryPrefix(): String { | ||
| return if (startsWith("@")) { | ||
| removePrefix("@") | ||
| } else { | ||
| this | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
app/src/test/kotlin/com/wire/android/util/QueryMatchExtractorTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Wire | ||
| * Copyright (C) 2023 Wire Swiss GmbH | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see http://www.gnu.org/licenses/. | ||
| * | ||
| * | ||
| */ | ||
|
|
||
| package com.wire.android.util | ||
|
|
||
| import kotlinx.coroutines.test.runTest | ||
| import org.junit.jupiter.api.Assertions.assertEquals | ||
| import org.junit.jupiter.api.Test | ||
|
|
||
| class QueryMatchExtractorTest { | ||
|
|
||
| @Test | ||
| fun `given empty text, when extracting indexes, then return empty list`() = runTest { | ||
| val result = QueryMatchExtractor.extractQueryMatchIndexes(matchText = "test", text = "") | ||
| assertEquals(emptyList<MatchQueryResult>(), result) | ||
| } | ||
|
|
||
| @Test | ||
| fun `given empty matchText, when extracting indexes, then return empty list`() = runTest { | ||
| val result = QueryMatchExtractor.extractQueryMatchIndexes(matchText = "", text = "This is a sample text") | ||
| assertEquals(emptyList<MatchQueryResult>(), result) | ||
| } | ||
|
|
||
| @Test | ||
| fun `given one occurrence of matchText, when extracting indexes, then return list with one match`() = runTest { | ||
| val ten = 10 | ||
| val fourteen = 14 | ||
|
|
||
| val result = QueryMatchExtractor.extractQueryMatchIndexes(matchText = "test", text = "This is a test") | ||
| assertEquals(listOf(MatchQueryResult(ten, fourteen)), result) | ||
| } | ||
|
|
||
| @Test | ||
| fun `given multiple occurrences of matchText, when extracting indexes, then return list with all matches`() = runTest { | ||
| val zero = 0 | ||
| val four = 4 | ||
| val eight = 8 | ||
| val twelve = 12 | ||
|
|
||
| val result = QueryMatchExtractor.extractQueryMatchIndexes(matchText = "test", text = "test or test") | ||
| assertEquals(listOf(MatchQueryResult(zero, four), MatchQueryResult(eight, twelve)), result) | ||
| } | ||
|
|
||
| @Test | ||
| fun `given overlapping occurrences of matchText, when extracting indexes, then return list with non-overlapping matches`() = | ||
| runTest { | ||
| val zero = 0 | ||
| val two = 2 | ||
| val four = 4 | ||
|
|
||
| val result = QueryMatchExtractor.extractQueryMatchIndexes(matchText = "ab", text = "abab") | ||
| assertEquals(listOf(MatchQueryResult(zero, two), MatchQueryResult(two, four)), result) | ||
| } | ||
|
|
||
| @Test | ||
| fun `given matchText is case insensitive, when extracting indexes, then return correct matches`() = runTest { | ||
| val ten = 10 | ||
| val fourteen = 14 | ||
| val fifteen = 15 | ||
| val nineteen = 19 | ||
|
|
||
| val result = QueryMatchExtractor.extractQueryMatchIndexes(matchText = "TeSt", text = "This is a test TEST") | ||
| assertEquals(listOf(MatchQueryResult(ten, fourteen), MatchQueryResult(fifteen, nineteen)), result) | ||
| } | ||
| } |