Fix tests

proninyaroslav · Jan 3, 2024 · c57dbf7 · c57dbf7
1 parent 9fe0b6b
commit c57dbf7
Show file tree

Hide file tree

Showing 21 changed files with 433 additions and 194 deletions.
diff --git a/app/src/androidTest/java/org/proninyaroslav/opencomicvine/model/AppPreferencesTest.kt b/app/src/androidTest/java/org/proninyaroslav/opencomicvine/model/AppPreferencesTest.kt
@@ -14,7 +14,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.proninyaroslav.opencomicvine.data.preferences.*
+import org.proninyaroslav.opencomicvine.types.preferences.*
 import java.util.*
 
 @OptIn(ExperimentalCoroutinesApi::class)

diff --git a/...a/org/proninyaroslav/opencomicvine/model/paging/favorites/CharactersRemoteMediatorTest.kt b/...a/org/proninyaroslav/opencomicvine/model/paging/favorites/CharactersRemoteMediatorTest.kt
@@ -1,17 +1,37 @@
 package org.proninyaroslav.opencomicvine.model.paging.favorites
 
-import androidx.paging.*
-import io.mockk.*
+import androidx.paging.ExperimentalPagingApi
+import androidx.paging.LoadType
+import androidx.paging.PagingConfig
+import androidx.paging.PagingState
+import androidx.paging.RemoteMediator
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.confirmVerified
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyAll
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.proninyaroslav.opencomicvine.model.AppPreferences
+import org.proninyaroslav.opencomicvine.model.repo.CharactersRepository
+import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingCharacterRepository
 import org.proninyaroslav.opencomicvine.types.CharacterInfo
 import org.proninyaroslav.opencomicvine.types.CharactersResponse
 import org.proninyaroslav.opencomicvine.types.FavoriteInfo
@@ -22,14 +42,8 @@ import org.proninyaroslav.opencomicvine.types.paging.favorites.FavoritesCharacte
 import org.proninyaroslav.opencomicvine.types.paging.favorites.PagingFavoritesCharacterItem
 import org.proninyaroslav.opencomicvine.types.preferences.PrefFavoritesSort
 import org.proninyaroslav.opencomicvine.types.preferences.PrefSortDirection
-import org.proninyaroslav.opencomicvine.model.AppPreferences
-import org.proninyaroslav.opencomicvine.model.repo.CharactersRepository
-import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingCharacterRepository
-import java.util.*
+import java.util.Date
+import java.util.GregorianCalendar
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class CharactersRemoteMediatorTest {
@@ -199,6 +213,7 @@ class CharactersRemoteMediatorTest {
                 clearBeforeSave = true,
             )
         }
+        verify { characterItemRepo.toString() }
         confirmVerified(charactersRepo, characterItemRepo, favoritesRepo, pref, response)
     }
 

diff --git a/...ava/org/proninyaroslav/opencomicvine/model/paging/favorites/ConceptsRemoteMediatorTest.kt b/...ava/org/proninyaroslav/opencomicvine/model/paging/favorites/ConceptsRemoteMediatorTest.kt
@@ -1,17 +1,37 @@
 package org.proninyaroslav.opencomicvine.model.paging.favorites
 
-import androidx.paging.*
-import io.mockk.*
+import androidx.paging.ExperimentalPagingApi
+import androidx.paging.LoadType
+import androidx.paging.PagingConfig
+import androidx.paging.PagingState
+import androidx.paging.RemoteMediator
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.confirmVerified
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyAll
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.proninyaroslav.opencomicvine.model.AppPreferences
+import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
+import org.proninyaroslav.opencomicvine.model.repo.ConceptsRepository
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingConceptRepository
 import org.proninyaroslav.opencomicvine.types.ConceptInfo
 import org.proninyaroslav.opencomicvine.types.ConceptsResponse
 import org.proninyaroslav.opencomicvine.types.FavoriteInfo
@@ -22,14 +42,8 @@ import org.proninyaroslav.opencomicvine.types.paging.favorites.FavoritesConceptI
 import org.proninyaroslav.opencomicvine.types.paging.favorites.PagingFavoritesConceptItem
 import org.proninyaroslav.opencomicvine.types.preferences.PrefFavoritesSort
 import org.proninyaroslav.opencomicvine.types.preferences.PrefSortDirection
-import org.proninyaroslav.opencomicvine.model.AppPreferences
-import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
-import org.proninyaroslav.opencomicvine.model.repo.ConceptsRepository
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingConceptRepository
-import java.util.*
+import java.util.Date
+import java.util.GregorianCalendar
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class ConceptsRemoteMediatorTest {
@@ -199,6 +213,7 @@ class ConceptsRemoteMediatorTest {
                 clearBeforeSave = true,
             )
         }
+        verify { conceptItemRepo.toString() }
         confirmVerified(conceptsRepo, conceptItemRepo, favoritesRepo, pref, response)
     }
 

diff --git a/.../java/org/proninyaroslav/opencomicvine/model/paging/favorites/IssuesRemoteMediatorTest.kt b/.../java/org/proninyaroslav/opencomicvine/model/paging/favorites/IssuesRemoteMediatorTest.kt
@@ -1,17 +1,37 @@
 package org.proninyaroslav.opencomicvine.model.paging.favorites
 
-import androidx.paging.*
-import io.mockk.*
+import androidx.paging.ExperimentalPagingApi
+import androidx.paging.LoadType
+import androidx.paging.PagingConfig
+import androidx.paging.PagingState
+import androidx.paging.RemoteMediator
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.confirmVerified
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyAll
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.proninyaroslav.opencomicvine.model.AppPreferences
+import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
+import org.proninyaroslav.opencomicvine.model.repo.IssuesRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingIssueRepository
 import org.proninyaroslav.opencomicvine.types.FavoriteInfo
 import org.proninyaroslav.opencomicvine.types.IssueInfo
 import org.proninyaroslav.opencomicvine.types.IssuesResponse
@@ -22,14 +42,8 @@ import org.proninyaroslav.opencomicvine.types.paging.favorites.FavoritesIssueIte
 import org.proninyaroslav.opencomicvine.types.paging.favorites.PagingFavoritesIssueItem
 import org.proninyaroslav.opencomicvine.types.preferences.PrefFavoritesSort
 import org.proninyaroslav.opencomicvine.types.preferences.PrefSortDirection
-import org.proninyaroslav.opencomicvine.model.AppPreferences
-import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
-import org.proninyaroslav.opencomicvine.model.repo.IssuesRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingIssueRepository
-import java.util.*
+import java.util.Date
+import java.util.GregorianCalendar
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class IssuesRemoteMediatorTest {
@@ -199,6 +213,7 @@ class IssuesRemoteMediatorTest {
                 clearBeforeSave = true,
             )
         }
+        verify { issueItemRepo.toString() }
         confirmVerified(issuesRepo, issueItemRepo, favoritesRepo, pref, response)
     }
 

diff --git a/...va/org/proninyaroslav/opencomicvine/model/paging/favorites/LocationsRemoteMediatorTest.kt b/...va/org/proninyaroslav/opencomicvine/model/paging/favorites/LocationsRemoteMediatorTest.kt
@@ -1,17 +1,37 @@
 package org.proninyaroslav.opencomicvine.model.paging.favorites
 
-import androidx.paging.*
-import io.mockk.*
+import androidx.paging.ExperimentalPagingApi
+import androidx.paging.LoadType
+import androidx.paging.PagingConfig
+import androidx.paging.PagingState
+import androidx.paging.RemoteMediator
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.confirmVerified
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyAll
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.proninyaroslav.opencomicvine.model.AppPreferences
+import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
+import org.proninyaroslav.opencomicvine.model.repo.LocationsRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingLocationRepository
 import org.proninyaroslav.opencomicvine.types.FavoriteInfo
 import org.proninyaroslav.opencomicvine.types.LocationInfo
 import org.proninyaroslav.opencomicvine.types.LocationsResponse
@@ -22,14 +42,8 @@ import org.proninyaroslav.opencomicvine.types.paging.favorites.FavoritesLocation
 import org.proninyaroslav.opencomicvine.types.paging.favorites.PagingFavoritesLocationItem
 import org.proninyaroslav.opencomicvine.types.preferences.PrefFavoritesSort
 import org.proninyaroslav.opencomicvine.types.preferences.PrefSortDirection
-import org.proninyaroslav.opencomicvine.model.AppPreferences
-import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
-import org.proninyaroslav.opencomicvine.model.repo.LocationsRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingLocationRepository
-import java.util.*
+import java.util.Date
+import java.util.GregorianCalendar
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class LocationsRemoteMediatorTest {
@@ -199,6 +213,7 @@ class LocationsRemoteMediatorTest {
                 clearBeforeSave = true,
             )
         }
+        verify { locationItemRepo.toString() }
         confirmVerified(locationsRepo, locationItemRepo, favoritesRepo, pref, response)
     }
 

diff --git a/.../java/org/proninyaroslav/opencomicvine/model/paging/favorites/MoviesRemoteMediatorTest.kt b/.../java/org/proninyaroslav/opencomicvine/model/paging/favorites/MoviesRemoteMediatorTest.kt
@@ -1,17 +1,37 @@
 package org.proninyaroslav.opencomicvine.model.paging.favorites
 
-import androidx.paging.*
-import io.mockk.*
+import androidx.paging.ExperimentalPagingApi
+import androidx.paging.LoadType
+import androidx.paging.PagingConfig
+import androidx.paging.PagingState
+import androidx.paging.RemoteMediator
+import io.mockk.MockKAnnotations
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.confirmVerified
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.mockk.verify
+import io.mockk.verifyAll
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
+import org.proninyaroslav.opencomicvine.model.AppPreferences
+import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
+import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
+import org.proninyaroslav.opencomicvine.model.repo.MoviesRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
+import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingMovieRepository
 import org.proninyaroslav.opencomicvine.types.FavoriteInfo
 import org.proninyaroslav.opencomicvine.types.MovieInfo
 import org.proninyaroslav.opencomicvine.types.MoviesResponse
@@ -22,14 +42,8 @@ import org.proninyaroslav.opencomicvine.types.paging.favorites.FavoritesMovieIte
 import org.proninyaroslav.opencomicvine.types.paging.favorites.PagingFavoritesMovieItem
 import org.proninyaroslav.opencomicvine.types.preferences.PrefFavoritesSort
 import org.proninyaroslav.opencomicvine.types.preferences.PrefSortDirection
-import org.proninyaroslav.opencomicvine.model.AppPreferences
-import org.proninyaroslav.opencomicvine.model.repo.ComicVineResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesListFetchResult
-import org.proninyaroslav.opencomicvine.model.repo.FavoritesRepository
-import org.proninyaroslav.opencomicvine.model.repo.MoviesRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.ComicVinePagingRepository
-import org.proninyaroslav.opencomicvine.model.repo.paging.favorites.PagingMovieRepository
-import java.util.*
+import java.util.Date
+import java.util.GregorianCalendar
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class MoviesRemoteMediatorTest {
@@ -199,6 +213,7 @@ class MoviesRemoteMediatorTest {
                 clearBeforeSave = true,
             )
         }
+        verify { movieItemRepo.toString() }
         confirmVerified(moviesRepo, movieItemRepo, favoritesRepo, pref, response)
     }