Skip to content

Commit 283ff6f

Browse files
david-allisonlukstbit
authored andcommitted
refactor: clean up IDE and style issues
* Fixed IDE warnings * Moved non-test methods outside the test class
1 parent e8b3481 commit 283ff6f

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

AnkiDroid/src/test/java/com/ichi2/anki/browser/CardBrowserViewModelTest.kt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class CardBrowserViewModelTest : JvmTest() {
162162
val newDeck = addDeck("World")
163163
selectDefaultDeck()
164164

165-
for (i in 0 until 5) {
165+
repeat(5) {
166166
addBasicAndReversedNote()
167167
}
168168
setCardsOrNotes(CardsOrNotes.NOTES)
@@ -777,10 +777,6 @@ class CardBrowserViewModelTest : JvmTest() {
777777
assertThat("selection is now marked", queryAllSelectedNotes().all { it.isMarked() })
778778
}
779779

780-
private suspend fun CardBrowserViewModel.queryAllSelectedNotes() = queryAllSelectedNoteIds().map { col.getNote(it) }
781-
782-
private suspend fun Note.isMarked(): Boolean = NoteService.isMarked(this)
783-
784780
@Test
785781
fun `changing note types changes columns`() =
786782
runViewModelTest {
@@ -1235,7 +1231,7 @@ class CardBrowserViewModelTest : JvmTest() {
12351231
)
12361232
}
12371233

1238-
@Suppress("UNUSED_VARIABLE")
1234+
@Suppress("UNUSED_VARIABLE", "unused")
12391235
val unused = updateActiveColumns(listOf(CARD, DECK, SFLD, DUE, FSRS_STABILITY), cardsOrNotes)
12401236

12411237
previewColumnHeadings(cardsOrNotes).also { columns ->
@@ -1556,7 +1552,7 @@ class CardBrowserViewModelTest : JvmTest() {
15561552
testBody: suspend CardBrowserViewModel.() -> Unit,
15571553
) = runTest {
15581554
CardsOrNotes.NOTES.saveToCollection(col)
1559-
for (i in 0 until notes) {
1555+
repeat(notes) {
15601556
// ensure 1 note = 2 cards
15611557
addBasicAndReversedNote()
15621558
}
@@ -1584,7 +1580,7 @@ class CardBrowserViewModelTest : JvmTest() {
15841580
options: CardBrowserLaunchOptions? = null,
15851581
testBody: suspend CardBrowserViewModel.() -> Unit,
15861582
) = runTest {
1587-
for (i in 0 until notes) {
1583+
repeat(notes) {
15881584
addBasicNote()
15891585
}
15901586
notes.ifNotZero { count -> Timber.d("added %d notes", count) }
@@ -1668,7 +1664,7 @@ private fun CardBrowserViewModel.selectRowsWithPositions(vararg positions: Int)
16681664
private fun <T> TurbineTestContext<T>.ignoreEventsDuringViewModelInit() {
16691665
try {
16701666
expectMostRecentItem()
1671-
} catch (e: AssertionError) {
1667+
} catch (_: AssertionError) {
16721668
// explicitly ignored: no items
16731669
}
16741670
}
@@ -1792,3 +1788,8 @@ suspend fun CardBrowserViewModel.setSelectedDeck(targetDid: DeckId) {
17921788
val deck = SelectableDeck.fromCollection(includeFiltered = false).single { it.deckId == targetDid }
17931789
setSelectedDeck(deck)
17941790
}
1791+
1792+
context(test: AnkiTest)
1793+
private suspend fun CardBrowserViewModel.queryAllSelectedNotes() = queryAllSelectedNoteIds().map { test.col.getNote(it) }
1794+
1795+
private suspend fun Note.isMarked(): Boolean = NoteService.isMarked(this)

0 commit comments

Comments
 (0)