Skip to content

Commit b419674

Browse files
committed
refactor(test): move 'TestClass' to 'libanki:testutils'
`com.ichi2.testutils.TestClass` => `com.ichi2.anki.libanki.testutils.TestClass` No Android/AnkiDroid references allow this to occur Rationale: Most of the libanki tests rely on `JvmTest`, which relies on `TestClass` This is the next step in moving these tests across to `libanki` which should speed up our test process
1 parent 8b03c05 commit b419674

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ import com.ichi2.anki.libanki.CardType
8282
import com.ichi2.anki.libanki.Note
8383
import com.ichi2.anki.libanki.NotetypeJson
8484
import com.ichi2.anki.libanki.QueueType
85+
import com.ichi2.anki.libanki.testutils.TestClass
8586
import com.ichi2.anki.model.CardsOrNotes.CARDS
8687
import com.ichi2.anki.model.CardsOrNotes.NOTES
8788
import com.ichi2.anki.model.SortType
@@ -94,7 +95,6 @@ import com.ichi2.anki.utils.ext.getCurrentDialogFragment
9495
import com.ichi2.anki.utils.ext.showDialogFragment
9596
import com.ichi2.testutils.AnkiAssert.assertDoesNotThrow
9697
import com.ichi2.testutils.IntentAssert
97-
import com.ichi2.testutils.TestClass
9898
import com.ichi2.testutils.common.Flaky
9999
import com.ichi2.testutils.common.OS
100100
import com.ichi2.testutils.getSharedPrefs

AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import com.ichi2.anki.libanki.Collection
4646
import com.ichi2.anki.libanki.Note
4747
import com.ichi2.anki.libanki.NotetypeJson
4848
import com.ichi2.anki.libanki.Storage
49+
import com.ichi2.anki.libanki.testutils.TestClass
4950
import com.ichi2.anki.libanki.testutils.TestCollectionManager
5051
import com.ichi2.anki.observability.ChangeManager
5152
import com.ichi2.anki.observability.undoableOp
@@ -54,13 +55,13 @@ import com.ichi2.compat.customtabs.CustomTabActivityHelper
5455
import com.ichi2.testutils.AndroidTest
5556
import com.ichi2.testutils.CollectionManagerTestAdapter
5657
import com.ichi2.testutils.TaskSchedulerRule
57-
import com.ichi2.testutils.TestClass
5858
import com.ichi2.testutils.common.FailOnUnhandledExceptionRule
5959
import com.ichi2.testutils.common.IgnoreFlakyTestsInCIRule
6060
import com.ichi2.testutils.filter
6161
import com.ichi2.utils.InMemorySQLiteOpenHelperFactory
6262
import kotlinx.coroutines.Dispatchers
6363
import kotlinx.coroutines.runBlocking
64+
import kotlinx.coroutines.test.TestDispatcher
6465
import kotlinx.coroutines.test.resetMain
6566
import net.ankiweb.rsdroid.BackendException
6667
import net.ankiweb.rsdroid.testing.RustBackendLoader
@@ -217,6 +218,11 @@ open class RobolectricTest :
217218
println("""-- completed test "${testName.methodName}"""")
218219
}
219220

221+
override fun setupTestDispatcher(dispatcher: TestDispatcher) {
222+
super.setupTestDispatcher(dispatcher)
223+
ioDispatcher = dispatcher
224+
}
225+
220226
/**
221227
* Click on a dialog button for an AlertDialog dialog box. Replaces the above helper.
222228
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import com.ichi2.anki.libanki.Note
5858
import com.ichi2.anki.libanki.QueueType
5959
import com.ichi2.anki.libanki.QueueType.ManuallyBuried
6060
import com.ichi2.anki.libanki.QueueType.New
61+
import com.ichi2.anki.libanki.testutils.TestClass
6162
import com.ichi2.anki.model.CardsOrNotes
6263
import com.ichi2.anki.model.SortType
6364
import com.ichi2.anki.model.SortType.NO_SORTING
@@ -67,7 +68,6 @@ import com.ichi2.anki.setFlagFilterSync
6768
import com.ichi2.anki.utils.ext.ifNotZero
6869
import com.ichi2.testutils.IntentAssert
6970
import com.ichi2.testutils.JvmTest
70-
import com.ichi2.testutils.TestClass
7171
import com.ichi2.testutils.createTransientDirectory
7272
import com.ichi2.testutils.ensureNoOpsExecuted
7373
import com.ichi2.testutils.ensureOpsExecuted

AnkiDroid/src/test/java/com/ichi2/anki/instanteditor/InstantEditorViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.ichi2.anki.RobolectricTest
2323
import com.ichi2.anki.instantnoteeditor.InstantEditorViewModel
2424
import com.ichi2.anki.instantnoteeditor.InstantNoteEditorActivity
2525
import com.ichi2.anki.instantnoteeditor.SaveNoteResult
26-
import com.ichi2.testutils.TestClass
26+
import com.ichi2.anki.libanki.testutils.TestClass
2727
import org.junit.Assert.assertEquals
2828
import org.junit.Assert.assertTrue
2929
import org.junit.Test

AnkiDroid/src/test/java/com/ichi2/testutils/JvmTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.ichi2.anki.common.time.TimeManager
2424
import com.ichi2.anki.ioDispatcher
2525
import com.ichi2.anki.libanki.Collection
2626
import com.ichi2.anki.libanki.Storage
27+
import com.ichi2.anki.libanki.testutils.TestClass
2728
import com.ichi2.anki.libanki.testutils.TestCollectionManager
2829
import com.ichi2.anki.observability.ChangeManager
2930
import kotlinx.coroutines.Dispatchers

AnkiDroid/src/test/java/com/ichi2/testutils/ext/TestClass.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import anki.collection.OpChanges
2020
import com.ichi2.anki.libanki.Consts
2121
import com.ichi2.anki.libanki.Note
2222
import com.ichi2.anki.libanki.NotetypeJson
23+
import com.ichi2.anki.libanki.testutils.TestClass
2324
import com.ichi2.anki.observability.undoableOp
24-
import com.ichi2.testutils.TestClass
2525

2626
suspend fun TestClass.addBasicNoteWithOp(
2727
fields: List<String> = listOf("foo", "bar"),

AnkiDroid/src/test/java/com/ichi2/testutils/TestClass.kt renamed to libanki/testutils/src/main/java/com/ichi2/anki/libanki/testutils/TestClass.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616

17-
package com.ichi2.testutils
17+
package com.ichi2.anki.libanki.testutils
1818

1919
import android.annotation.SuppressLint
2020
import com.ichi2.anki.libanki.Card

0 commit comments

Comments
 (0)