refactor(AndroidTest): remove col dependency

ankidroid · Dec 17, 2024 · 110a177 · 110a177
1 parent 0d4d515
commit 110a177
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt
@@ -45,6 +45,7 @@ import com.ichi2.libanki.utils.TimeManager
 import com.ichi2.testutils.AndroidTest
 import com.ichi2.testutils.MockTime
 import com.ichi2.testutils.TaskSchedulerRule
+import com.ichi2.testutils.TestClass
 import com.ichi2.testutils.common.FailOnUnhandledExceptionRule
 import com.ichi2.testutils.common.IgnoreFlakyTestsInCIRule
 import com.ichi2.testutils.filter
@@ -75,7 +76,9 @@ import org.robolectric.shadows.ShadowMediaPlayer
 import timber.log.Timber
 import kotlin.test.assertNotNull
 
-open class RobolectricTest : AndroidTest {
+open class RobolectricTest :
+    TestClass,
+    AndroidTest {
     @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
     private fun Any.wait(timeMs: Long) = (this as Object).wait(timeMs)
 

diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/AndroidTest.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/AndroidTest.kt
@@ -20,10 +20,21 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import androidx.test.core.app.ApplicationProvider
+import com.ichi2.anki.RobolectricTest
 import com.ichi2.anki.preferences.sharedPrefs
 
-/** Marker interface for classes annotated with `@RunWith(AndroidJUnit4.class)` */
-interface AndroidTest : TestClass
+/**
+ * Marker interface for classes annotated with `@RunWith(AndroidJUnit4.class)` which do
+ * not need access to the collection
+ *
+ * Classes should also be marked with `@Config(application = EmptyApplication::class)` for
+ * performance improvements
+ *
+ * Use [JvmTest] if a reference to Android is not necessary but the collection is required
+ *
+ * Use [RobolectricTest] if access the collection is necessary
+ */
+interface AndroidTest
 
 val AndroidTest.targetContext: Context
     get() {