-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Allow search to show subdecks if they match the searched term #18298
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
110 changes: 110 additions & 0 deletions
110
AnkiDroid/src/test/java/com/ichi2/libanki/DeckNodeTest.kt
This file contains hidden or 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,110 @@ | ||
| /**************************************************************************************** | ||
| * * | ||
| * Copyright (c) 2025 Shridhar Goel <shridhar.goel@gmail.com> * | ||
| * * | ||
| * 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.ichi2.libanki | ||
|
|
||
| import anki.decks.deckTreeNode | ||
| import com.ichi2.libanki.sched.DeckNode | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Test | ||
|
|
||
| class DeckNodeTest { | ||
| private fun makeNode( | ||
| name: String, | ||
| deckId: Long, | ||
| level: Int, | ||
| collapsed: Boolean = false, | ||
| children: List<DeckNode> = emptyList(), | ||
| ): DeckNode { | ||
| val treeNode = | ||
| deckTreeNode { | ||
| this.name = name | ||
| this.deckId = deckId | ||
| this.level = level | ||
| this.collapsed = collapsed | ||
| children.forEach { this.children.add(it.node) } | ||
| this.reviewCount = 0 | ||
| this.newCount = 0 | ||
| this.learnCount = 0 | ||
| this.filtered = false | ||
| } | ||
| return DeckNode(treeNode, name) | ||
| } | ||
|
|
||
| @Test | ||
| fun `search finds subdeck even if parent collapsed`() { | ||
| // Science::Math::Algebra::Group | ||
| val group = makeNode("Group", 4, 4) | ||
| val algebra = makeNode("Algebra", 3, 3, children = listOf(group)) | ||
| val math = makeNode("Math", 2, 2, collapsed = true, children = listOf(algebra)) | ||
| val science = makeNode("Science", 1, 1, children = listOf(math)) | ||
|
|
||
| val results1 = science.filterAndFlatten("group") | ||
| assertEquals(listOf("Science", "Math", "Algebra", "Group"), results1.map { it.lastDeckNameComponent }) | ||
|
|
||
Arthur-Milchior marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| val results2 = science.filterAndFlatten("math") | ||
| assertEquals(listOf("Science", "Math"), results2.map { it.lastDeckNameComponent }) | ||
| } | ||
|
|
||
| @Test | ||
| fun `collapsed parent hides children when not searching`() { | ||
| val group = makeNode("Group", 4, 4) | ||
| val algebra = makeNode("Algebra", 3, 3, children = listOf(group)) | ||
| val math = makeNode("Math", 2, 2, collapsed = true, children = listOf(algebra)) | ||
| val science = makeNode("Science", 1, 1, children = listOf(math)) | ||
|
|
||
| val results = math.filterAndFlatten(null) | ||
| assertEquals(1, results.size) | ||
| assertEquals("Math", results[0].lastDeckNameComponent) | ||
| } | ||
|
|
||
| @Test | ||
| fun `search for non-matching term returns no results`() { | ||
| // Science::Math::Algebra::Group | ||
| val group = makeNode("Group", 4, 4) | ||
| val algebra = makeNode("Algebra", 3, 3, children = listOf(group)) | ||
| val math = makeNode("Math", 2, 2, collapsed = true, children = listOf(algebra)) | ||
| val science = makeNode("Science", 1, 1, children = listOf(math)) | ||
|
|
||
| val results = science.filterAndFlatten("complex") | ||
| assertEquals(emptyList<String>(), results.map { it.lastDeckNameComponent }) | ||
| } | ||
|
|
||
| @Test | ||
| fun `search for algebra shows all decks in the path`() { | ||
| // Science::Math::Algebra::Group | ||
| val group = makeNode("Group", 4, 4) | ||
| val algebra = makeNode("Algebra", 3, 3, children = listOf(group)) | ||
| val math = makeNode("Math", 2, 2, collapsed = false, children = listOf(algebra)) | ||
| val science = makeNode("Science", 1, 1, children = listOf(math)) | ||
|
|
||
| val results = science.filterAndFlatten("algebra") | ||
| assertEquals(listOf("Science", "Math", "Algebra", "Group"), results.map { it.lastDeckNameComponent }) | ||
| } | ||
|
|
||
| @Test | ||
| fun `search for non-existent path pattern returns no results`() { | ||
| // Science::Math::Algebra::Group | ||
| val group = makeNode("Group", 4, 4) | ||
| val algebra = makeNode("Algebra", 3, 3, children = listOf(group)) | ||
| val math = makeNode("Math", 2, 2, collapsed = false, children = listOf(algebra)) | ||
| val science = makeNode("Science", 1, 1, children = listOf(math)) | ||
|
|
||
| val results = science.filterAndFlatten("th::alg") | ||
| assertEquals(emptyList<String>(), results.map { it.lastDeckNameComponent }) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.