Skip to content

Commit 5c9d4bf

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 Issue 18015
1 parent b862fce commit 5c9d4bf

File tree

7 files changed

+8
-6
lines changed

7 files changed

+8
-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
@@ -93,7 +94,6 @@ import com.ichi2.anki.ui.internationalization.toSentenceCase
9394
import com.ichi2.anki.utils.ext.getCurrentDialogFragment
9495
import com.ichi2.anki.utils.ext.showDialogFragment
9596
import com.ichi2.testutils.IntentAssert
96-
import com.ichi2.testutils.TestClass
9797
import com.ichi2.testutils.common.Flaky
9898
import com.ichi2.testutils.common.OS
9999
import com.ichi2.testutils.getSharedPrefs

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ 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.observability.ChangeManager
5051
import com.ichi2.anki.observability.undoableOp
5152
import com.ichi2.anki.preferences.sharedPrefs
5253
import com.ichi2.compat.customtabs.CustomTabActivityHelper
5354
import com.ichi2.testutils.AndroidTest
5455
import com.ichi2.testutils.CollectionManagerTestAdapter
5556
import com.ichi2.testutils.TaskSchedulerRule
56-
import com.ichi2.testutils.TestClass
5757
import com.ichi2.testutils.common.FailOnUnhandledExceptionRule
5858
import com.ichi2.testutils.common.IgnoreFlakyTestsInCIRule
5959
import com.ichi2.testutils.filter

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import com.ichi2.anki.libanki.Note
6262
import com.ichi2.anki.libanki.QueueType
6363
import com.ichi2.anki.libanki.QueueType.ManuallyBuried
6464
import com.ichi2.anki.libanki.QueueType.New
65+
import com.ichi2.anki.libanki.testutils.TestClass
6566
import com.ichi2.anki.model.CardsOrNotes
6667
import com.ichi2.anki.model.SortType
6768
import com.ichi2.anki.model.SortType.NO_SORTING
@@ -71,7 +72,6 @@ import com.ichi2.anki.setFlagFilterSync
7172
import com.ichi2.anki.utils.ext.ifNotZero
7273
import com.ichi2.testutils.IntentAssert
7374
import com.ichi2.testutils.JvmTest
74-
import com.ichi2.testutils.TestClass
7575
import com.ichi2.testutils.createTransientDirectory
7676
import com.ichi2.testutils.ensureNoOpsExecuted
7777
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ 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
28+
import com.ichi2.anki.libanki.testutils.TestCollectionManager
2729
import com.ichi2.anki.observability.ChangeManager
2830
import kotlinx.coroutines.Dispatchers
2931
import kotlinx.coroutines.runBlocking

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)