refactor #605 Modify tests.

toastkidjp · Jun 4, 2023 · c1edf10 · c1edf10
1 parent f041294
commit c1edf10
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 73 deletions.
diff --git a/app/src/test/java/jp/toastkid/yobidashi/browser/bookmark/BookmarkInitializerTest.kt b/app/src/test/java/jp/toastkid/yobidashi/browser/bookmark/BookmarkInitializerTest.kt
@@ -23,12 +23,11 @@ import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import io.mockk.unmockkAll
 import io.mockk.verify
-import jp.toastkid.data.DatabaseFinder
+import jp.toastkid.data.repository.factory.RepositoryFactory
 import jp.toastkid.lib.storage.FilesDir
 import jp.toastkid.yobidashi.browser.FaviconFolderProviderService
 import jp.toastkid.yobidashi.browser.bookmark.model.BookmarkRepository
 import jp.toastkid.yobidashi.browser.icon.WebClipIconLoader
-import jp.toastkid.yobidashi.libs.db.AppDatabase
 import kotlinx.coroutines.Dispatchers
 import org.junit.After
 import org.junit.Before
@@ -45,12 +44,6 @@ class BookmarkInitializerTest {
     @MockK
     private lateinit var webClipIconLoader: WebClipIconLoader
 
-    @MockK
-    private lateinit var databaseFinder: DatabaseFinder
-
-    @MockK
-    private lateinit var appDatabase: AppDatabase
-
     @MockK
     private lateinit var bookmarkRepository: BookmarkRepository
 
@@ -64,8 +57,7 @@ class BookmarkInitializerTest {
     fun setUp() {
         MockKAnnotations.init(this)
 
-        every { databaseFinder.invoke(any()) }.returns(appDatabase)
-        every { appDatabase.bookmarkRepository() }.returns(bookmarkRepository)
+        every { anyConstructed<RepositoryFactory>().bookmarkRepository(context) }.returns(bookmarkRepository)
         coEvery { bookmarkRepository.add(any()) }.just(Runs)
         coEvery { onComplete.invoke() }.just(Runs)
 
@@ -90,16 +82,15 @@ class BookmarkInitializerTest {
 
     @Test
     fun testFrom() {
-        mockkConstructor(FaviconFolderProviderService::class, DatabaseFinder::class)
+        mockkConstructor(FaviconFolderProviderService::class, RepositoryFactory::class)
         every { anyConstructed<FaviconFolderProviderService>().invoke(any()) }.returns(mockk())
-        every { anyConstructed<DatabaseFinder>().invoke(any()) }.returns(appDatabase)
+        every { anyConstructed<RepositoryFactory>().bookmarkRepository(any()) }.returns(bookmarkRepository)
         mockkObject(WebClipIconLoader)
         every { WebClipIconLoader.from(any()) }.returns(mockk())
 
         BookmarkInitializer.from(context)
 
-        verify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        verify(exactly = 1) { appDatabase.bookmarkRepository() }
+        verify(exactly = 1) { anyConstructed<RepositoryFactory>().bookmarkRepository(any()) }
         verify { anyConstructed<FaviconFolderProviderService>().invoke(any()) }
         verify { WebClipIconLoader.from(any()) }
     }

diff --git a/app/src/test/java/jp/toastkid/yobidashi/browser/bookmark/BookmarkInsertionTest.kt b/app/src/test/java/jp/toastkid/yobidashi/browser/bookmark/BookmarkInsertionTest.kt
@@ -15,9 +15,8 @@ import io.mockk.coVerify
 import io.mockk.impl.annotations.MockK
 import io.mockk.mockkConstructor
 import io.mockk.unmockkAll
-import jp.toastkid.data.DatabaseFinder
+import jp.toastkid.data.repository.factory.RepositoryFactory
 import jp.toastkid.yobidashi.browser.bookmark.model.BookmarkRepository
-import jp.toastkid.yobidashi.libs.db.AppDatabase
 import kotlinx.coroutines.Dispatchers
 import org.junit.After
 import org.junit.Before
@@ -33,19 +32,15 @@ class BookmarkInsertionTest {
     @MockK
     private lateinit var context: Context
 
-    @MockK
-    private lateinit var appDatabase: AppDatabase
-
     @MockK
     private lateinit var bookmarkRepository: BookmarkRepository
 
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
 
-        mockkConstructor(DatabaseFinder::class)
-        coEvery { anyConstructed<DatabaseFinder>().invoke(any()) }.returns(appDatabase)
-        coEvery { appDatabase.bookmarkRepository() }.returns(bookmarkRepository)
+        mockkConstructor(RepositoryFactory::class)
+        coEvery { anyConstructed<RepositoryFactory>().bookmarkRepository(any()) }.returns(bookmarkRepository)
         coEvery { bookmarkRepository.add(any()) }.returns(Unit)
     }
 
@@ -60,8 +55,7 @@ class BookmarkInsertionTest {
 
         bookmarkInsertion.insert()
 
-        coVerify(exactly = 0) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        coVerify(exactly = 0) { appDatabase.bookmarkRepository() }
+        coVerify(exactly = 0) { anyConstructed<RepositoryFactory>().bookmarkRepository(any()) }
         coVerify(exactly = 0) { bookmarkRepository.add(any()) }
     }
 
@@ -76,8 +70,7 @@ class BookmarkInsertionTest {
 
         bookmarkInsertion.insert()
 
-        coVerify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        coVerify(exactly = 1) { appDatabase.bookmarkRepository() }
+        coVerify(exactly = 1) { anyConstructed<RepositoryFactory>().bookmarkRepository(any()) }
         coVerify(exactly = 1) { bookmarkRepository.add(any()) }
     }
 

diff --git a/app/src/test/java/jp/toastkid/yobidashi/browser/history/ViewHistoryInsertionTest.kt b/app/src/test/java/jp/toastkid/yobidashi/browser/history/ViewHistoryInsertionTest.kt
@@ -17,8 +17,7 @@ import io.mockk.just
 import io.mockk.mockk
 import io.mockk.mockkConstructor
 import io.mockk.unmockkAll
-import jp.toastkid.data.DatabaseFinder
-import jp.toastkid.yobidashi.libs.db.AppDatabase
+import jp.toastkid.data.repository.factory.RepositoryFactory
 import kotlinx.coroutines.Dispatchers
 import org.junit.After
 import org.junit.Before
@@ -28,20 +27,15 @@ class ViewHistoryInsertionTest {
 
     private lateinit var viewHistoryInsertion: ViewHistoryInsertion
 
-    @MockK
-    private lateinit var appDatabase: AppDatabase
-
     @MockK
     private lateinit var repository: ViewHistoryRepository
 
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
 
-        mockkConstructor(DatabaseFinder::class)
-        coEvery { anyConstructed<DatabaseFinder>().invoke(any()) }.returns(appDatabase)
-
-        coEvery { appDatabase.viewHistoryRepository() }.returns(repository)
+        mockkConstructor(RepositoryFactory::class)
+        coEvery { anyConstructed<RepositoryFactory>().viewHistoryRepository(any()) }.returns(repository)
         coEvery { repository.add(any()) }.just(Runs)
     }
 
@@ -58,8 +52,7 @@ class ViewHistoryInsertionTest {
 
         viewHistoryInsertion.invoke()
 
-        coVerify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        coVerify(exactly = 1) { appDatabase.viewHistoryRepository() }
+        coVerify(exactly = 1) { anyConstructed<RepositoryFactory>().viewHistoryRepository(any()) }
         coVerify(exactly = 1) { repository.add(any()) }
     }
 
@@ -71,8 +64,7 @@ class ViewHistoryInsertionTest {
 
         viewHistoryInsertion.invoke()
 
-        coVerify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        coVerify(exactly = 1) { appDatabase.viewHistoryRepository() }
+        coVerify(exactly = 1) { anyConstructed<RepositoryFactory>().viewHistoryRepository(any()) }
         coVerify(exactly = 0) { repository.add(any()) }
     }
 
@@ -84,8 +76,7 @@ class ViewHistoryInsertionTest {
 
         viewHistoryInsertion.invoke()
 
-        coVerify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        coVerify(exactly = 1) { appDatabase.viewHistoryRepository() }
+        coVerify(exactly = 1) { anyConstructed<RepositoryFactory>().viewHistoryRepository(any()) }
         coVerify(exactly = 0) { repository.add(any()) }
     }
 

diff --git a/app/src/test/java/jp/toastkid/yobidashi/search/favorite/FavoriteSearchInsertionTest.kt b/app/src/test/java/jp/toastkid/yobidashi/search/favorite/FavoriteSearchInsertionTest.kt
@@ -14,11 +14,11 @@ import io.mockk.Runs
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.just
+import io.mockk.mockk
 import io.mockk.mockkConstructor
 import io.mockk.unmockkAll
 import io.mockk.verify
-import jp.toastkid.data.DatabaseFinder
-import jp.toastkid.yobidashi.libs.db.AppDatabase
+import jp.toastkid.data.repository.factory.RepositoryFactory
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import org.junit.After
@@ -29,9 +29,6 @@ class FavoriteSearchInsertionTest {
 
     private lateinit var favoriteSearchInsertion: FavoriteSearchInsertion
 
-    @MockK
-    private lateinit var appDatabase: AppDatabase
-
     @MockK
     private lateinit var repository: FavoriteSearchRepository
 
@@ -48,9 +45,8 @@ class FavoriteSearchInsertionTest {
     fun setUp() {
         MockKAnnotations.init(this)
 
-        mockkConstructor(DatabaseFinder::class)
-        every { anyConstructed<DatabaseFinder>().invoke(any()) }.returns(appDatabase)
-        every { appDatabase.favoriteSearchRepository() }.returns(repository)
+        mockkConstructor(RepositoryFactory::class)
+        every { anyConstructed<RepositoryFactory>().favoriteSearchRepository(mockk()) }.returns(repository)
         every { repository.insert(any()) }.just(Runs)
     }
 
@@ -71,8 +67,7 @@ class FavoriteSearchInsertionTest {
 
         favoriteSearchInsertion.invoke()
 
-        verify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        verify(exactly = 1) { appDatabase.favoriteSearchRepository() }
+        verify(exactly = 1) { anyConstructed<RepositoryFactory>().favoriteSearchRepository(mockk()) }
         verify(exactly = 1) { repository.insert(any()) }
     }
 

diff --git a/app/src/test/java/jp/toastkid/yobidashi/search/history/SearchHistoryInsertionTest.kt b/app/src/test/java/jp/toastkid/yobidashi/search/history/SearchHistoryInsertionTest.kt
@@ -19,7 +19,7 @@ import io.mockk.mockk
 import io.mockk.mockkConstructor
 import io.mockk.unmockkAll
 import io.mockk.verify
-import jp.toastkid.data.DatabaseFinder
+import jp.toastkid.data.repository.factory.RepositoryFactory
 import jp.toastkid.yobidashi.libs.db.AppDatabase
 import kotlinx.coroutines.Dispatchers
 import org.junit.After
@@ -40,9 +40,8 @@ class SearchHistoryInsertionTest {
     fun setUp() {
         MockKAnnotations.init(this)
 
-        mockkConstructor(DatabaseFinder::class)
-        every { anyConstructed<DatabaseFinder>().invoke(any()) }.returns(appDatabase)
-        every { appDatabase.searchHistoryRepository() }.returns(repository)
+        mockkConstructor(RepositoryFactory::class)
+        every { anyConstructed<RepositoryFactory>().searchHistoryRepository(any()) }.returns(repository)
         coEvery { repository.insert(any()) }.just(Runs)
     }
 
@@ -62,8 +61,7 @@ class SearchHistoryInsertionTest {
 
         searchHistoryInsertion.insert()
 
-        verify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        verify(exactly = 1) { appDatabase.searchHistoryRepository() }
+        verify(exactly = 1) { anyConstructed<RepositoryFactory>().searchHistoryRepository(any()) }
         coVerify(exactly = 1) { repository.insert(any()) }
     }
 
@@ -78,8 +76,7 @@ class SearchHistoryInsertionTest {
 
         searchHistoryInsertion.insert()
 
-        verify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        verify(exactly = 1) { appDatabase.searchHistoryRepository() }
+        verify(exactly = 1) { anyConstructed<RepositoryFactory>().searchHistoryRepository(any()) }
         coVerify(exactly = 0) { repository.insert(any()) }
     }
 
@@ -94,8 +91,7 @@ class SearchHistoryInsertionTest {
 
         searchHistoryInsertion.insert()
 
-        verify(exactly = 1) { anyConstructed<DatabaseFinder>().invoke(any()) }
-        verify(exactly = 1) { appDatabase.searchHistoryRepository() }
+        verify(exactly = 1) { anyConstructed<RepositoryFactory>().searchHistoryRepository(any()) }
         coVerify(exactly = 0) { repository.insert(any()) }
     }
 

diff --git a/app/src/test/java/jp/toastkid/yobidashi/settings/color/DefaultColorInsertionTest.kt b/app/src/test/java/jp/toastkid/yobidashi/settings/color/DefaultColorInsertionTest.kt
@@ -16,11 +16,11 @@ import io.mockk.coVerify
 import io.mockk.impl.annotations.InjectMockKs
 import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
+import io.mockk.mockkConstructor
 import io.mockk.mockkObject
 import io.mockk.mockkStatic
 import io.mockk.unmockkAll
-import jp.toastkid.data.DatabaseFinder
-import jp.toastkid.yobidashi.libs.db.AppDatabase
+import jp.toastkid.data.repository.factory.RepositoryFactory
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.test.runBlockingTest
 import org.junit.After
@@ -32,21 +32,15 @@ class DefaultColorInsertionTest {
     @InjectMockKs
     private lateinit var defaultColorInsertion: DefaultColorInsertion
 
-    @MockK
-    private lateinit var databaseFinder: DatabaseFinder
-
-    @MockK
-    private lateinit var appDatabase: AppDatabase
-
     @MockK
     private lateinit var savedColorRepository: SavedColorRepository
 
     @Before
     fun setUp() {
         MockKAnnotations.init(this)
 
-        coEvery { databaseFinder.invoke(any()) }.returns(appDatabase)
-        coEvery { appDatabase.savedColorRepository() }.returns(savedColorRepository)
+        mockkConstructor(RepositoryFactory::class)
+        coEvery { anyConstructed<RepositoryFactory>().savedColorRepository(any()) }.returns(savedColorRepository)
         coEvery { savedColorRepository.add(any()) }.answers { 1L }
 
         mockkStatic(ContextCompat::class)
@@ -67,8 +61,7 @@ class DefaultColorInsertionTest {
 
         delay(1000L)
 
-        coVerify (exactly = 1) { databaseFinder.invoke(any()) }
-        coVerify (exactly = 1) { appDatabase.savedColorRepository() }
+        coVerify (exactly = 1) { anyConstructed<RepositoryFactory>().savedColorRepository(any()) }
         coVerify (atLeast = 1) { savedColorRepository.add(any()) }
         coVerify (atLeast = 1) { ContextCompat.getColor(any(), any()) }
         coVerify (atLeast = 1) { SavedColor.make(any(), any()) }