Migrate from Koin to Dagger/Hilt

2022-07-25 17:47:35 +03:00
parent 0757a31381
commit 2bbdd3f044
181 changed files with 1751 additions and 1379 deletions
--- a/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/Instrumentation.kt
@@ -6,4 +6,4 @@ import kotlin.coroutines.suspendCoroutine

 suspend fun Instrumentation.awaitForIdle() = suspendCoroutine<Unit> { cont ->
 	waitForIdle { cont.resume(Unit) }
-}
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/db/MangaDatabaseTest.kt
@@ -3,10 +3,10 @@ package org.koitharu.kotatsu.core.db
 import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import kotlin.test.assertEquals

@RunWith(AndroidJUnit4::class)
 class MangaDatabaseTest {
@@ -37,7 +37,7 @@ class MangaDatabaseTest {
 				TEST_DB,
 				migration.endVersion,
 				true,
-				migration
+				migration,
 			).close()
 		}
 	}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/core/os/ShortcutsUpdaterTest.kt
@@ -6,28 +6,40 @@ import android.os.Build
 import androidx.core.content.getSystemService
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
 import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
 import org.koitharu.kotatsu.SampleData
 import org.koitharu.kotatsu.awaitForIdle
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.history.domain.HistoryRepository
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue

+@HiltAndroidTest
@RunWith(AndroidJUnit4::class)
-class ShortcutsUpdaterTest : KoinTest {
+class ShortcutsUpdaterTest {

-	private val historyRepository by inject<HistoryRepository>()
-	private val shortcutsUpdater by inject<ShortcutsUpdater>()
-	private val database by inject<MangaDatabase>()
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var historyRepository: HistoryRepository
+
+	@Inject
+	lateinit var shortcutsUpdater: ShortcutsUpdater
+
+	@Inject
+	lateinit var database: MangaDatabase

 	@Before
 	fun setUp() {
+		hiltRule.inject()
 		database.clearAllTables()
 	}

@@ -43,7 +55,7 @@ class ShortcutsUpdaterTest : KoinTest {
 			chapterId = SampleData.chapter.id,
 			page = 4,
 			scroll = 2,
-			percent = 0.3f
+			percent = 0.3f,
 		)
 		awaitUpdate()

@@ -62,4 +74,4 @@ class ShortcutsUpdaterTest : KoinTest {
 		instrumentation.awaitForIdle()
 		shortcutsUpdater.await()
 	}
-}
+}
--- a/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/settings/backup/AppBackupAgentTest.kt
@@ -3,33 +3,46 @@ package org.koitharu.kotatsu.settings.backup
 import android.content.res.AssetManager
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import java.io.File
+import javax.inject.Inject
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
+import org.junit.Assert.*
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.get
-import org.koin.test.inject
 import org.koitharu.kotatsu.SampleData
 import org.koitharu.kotatsu.core.backup.BackupRepository
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.toMangaTags
 import org.koitharu.kotatsu.favourites.domain.FavouritesRepository
 import org.koitharu.kotatsu.history.domain.HistoryRepository
-import java.io.File
-import kotlin.test.*

+@HiltAndroidTest
@RunWith(AndroidJUnit4::class)
-class AppBackupAgentTest : KoinTest {
+class AppBackupAgentTest {

-	private val historyRepository by inject<HistoryRepository>()
-	private val favouritesRepository by inject<FavouritesRepository>()
-	private val backupRepository by inject<BackupRepository>()
-	private val database by inject<MangaDatabase>()
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var historyRepository: HistoryRepository
+
+	@Inject
+	lateinit var favouritesRepository: FavouritesRepository
+
+	@Inject
+	lateinit var backupRepository: BackupRepository
+
+	@Inject
+	lateinit var database: MangaDatabase

 	@Before
 	fun setUp() {
+		hiltRule.inject()
 		database.clearAllTables()
 	}

@@ -51,7 +64,10 @@ class AppBackupAgentTest : KoinTest {
 		val history = checkNotNull(historyRepository.getOne(SampleData.manga))

 		val agent = AppBackupAgent()
-		val backup = agent.createBackupFile(get(), backupRepository)
+		val backup = agent.createBackupFile(
+			context = InstrumentationRegistry.getInstrumentation().targetContext,
+			repository = backupRepository,
+		)

 		database.clearAllTables()
 		assertTrue(favouritesRepository.getAllManga().isEmpty())
@@ -63,10 +79,10 @@ class AppBackupAgentTest : KoinTest {

 		assertEquals(category, favouritesRepository.getCategory(category.id))
 		assertEquals(history, historyRepository.getOne(SampleData.manga))
-		assertContentEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))
+		assertEquals(listOf(SampleData.manga), favouritesRepository.getManga(category.id))

 		val allTags = database.tagsDao.findTags(SampleData.tag.source.name).toMangaTags()
-		assertContains(allTags, SampleData.tag)
+		assertTrue(SampleData.tag in allTags)
 	}

 	@Test
--- a/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
+++ b/app/src/androidTest/java/org/koitharu/kotatsu/tracker/domain/TrackerTest.kt
@@ -1,24 +1,39 @@
 package org.koitharu.kotatsu.tracker.domain

 import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
+import junit.framework.TestCase.*
 import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.koin.test.KoinTest
-import org.koin.test.inject
 import org.koitharu.kotatsu.SampleData
 import org.koitharu.kotatsu.base.domain.MangaDataRepository
 import org.koitharu.kotatsu.parsers.model.Manga
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue

+@HiltAndroidTest
@RunWith(AndroidJUnit4::class)
-class TrackerTest : KoinTest {
+class TrackerTest {

-	private val repository by inject<TrackingRepository>()
-	private val dataRepository by inject<MangaDataRepository>()
-	private val tracker by inject<Tracker>()
+	@get:Rule
+	var hiltRule = HiltAndroidRule(this)
+
+	@Inject
+	lateinit var repository: TrackingRepository
+
+	@Inject
+	lateinit var dataRepository: MangaDataRepository
+
+	@Inject
+	lateinit var tracker: Tracker
+
+	@Before
+	fun setUp() {
+		hiltRule.inject()
+	}

 	@Test
 	fun noUpdates() = runTest {
@@ -180,4 +195,4 @@ class TrackerTest : KoinTest {
 		dataRepository.storeManga(manga)
 		return manga
 	}
-}
+}