adjust tests

photos-network · Aug 24, 2023 · 500e122 · 500e122
1 parent a91322c
commit 500e122
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/domain/photos/src/main/kotlin/photos/network/domain/photos/Module.kt b/domain/photos/src/main/kotlin/photos/network/domain/photos/Module.kt
@@ -31,6 +31,7 @@ val domainPhotosModule = module {
 
     factory {
         GetFacesUseCase(
+            application = get(),
             photoRepository = get(),
         )
     }

diff --git a/domain/photos/src/main/kotlin/photos/network/domain/photos/usecase/GetFacesUseCase.kt b/domain/photos/src/main/kotlin/photos/network/domain/photos/usecase/GetFacesUseCase.kt
@@ -15,15 +15,20 @@
  */
 package photos.network.domain.photos.usecase
 
+import android.app.Application
+import android.graphics.Bitmap
 import android.net.Uri
+import android.provider.MediaStore
 import kotlinx.coroutines.flow.Flow
 import photos.network.repository.photos.PhotoRepository
 import photos.network.repository.photos.model.Box
 
 class GetFacesUseCase(
+    private val application: Application,
     private val photoRepository: PhotoRepository,
 ) {
     operator fun invoke(photoUri: Uri): Flow<List<Box>> {
-        return photoRepository.getFaces(photoUri = photoUri)
+        val bitmap: Bitmap = MediaStore.Images.Media.getBitmap(application.contentResolver, photoUri)
+        return photoRepository.getFaces(bitmap = bitmap)
     }
 }
diff --git a/fastlane/metadata/android/en-US/changelogs/102.txt b/fastlane/metadata/android/en-US/changelogs/102.txt
diff --git a/repository/photos/src/main/kotlin/photos/network/repository/photos/Module.kt b/repository/photos/src/main/kotlin/photos/network/repository/photos/Module.kt
@@ -53,7 +53,6 @@ val repositoryPhotosModule = module {
 
     single<PhotoRepository> {
         PhotoRepositoryImpl(
-            application = get(),
             photoApi = get(),
             photoDao = get(),
             workManager = get(),

diff --git a/repository/photos/src/main/kotlin/photos/network/repository/photos/PhotoRepository.kt b/repository/photos/src/main/kotlin/photos/network/repository/photos/PhotoRepository.kt
@@ -15,7 +15,7 @@
  */
 package photos.network.repository.photos
 
-import android.net.Uri
+import android.graphics.Bitmap
 import kotlinx.coroutines.flow.Flow
 import photos.network.repository.photos.model.Box
 import photos.network.repository.photos.worker.SyncStatus
@@ -26,7 +26,7 @@ interface PhotoRepository {
     fun getPhotos(): Flow<List<Photo>>
     fun getPhoto(identifier: String): Flow<Photo?>
 
-    fun getFaces(photoUri: Uri): Flow<List<Box>>
+    fun getFaces(bitmap: Bitmap): Flow<List<Box>>
 
     suspend fun addPhoto(photo: Photo)
 }
diff --git a/repository/photos/src/main/kotlin/photos/network/repository/photos/PhotoRepositoryImpl.kt b/repository/photos/src/main/kotlin/photos/network/repository/photos/PhotoRepositoryImpl.kt
@@ -15,10 +15,8 @@
  */
 package photos.network.repository.photos
 
-import android.app.Application
 import android.content.res.AssetManager
 import android.graphics.Bitmap
-import android.net.Uri
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
@@ -39,7 +37,6 @@ import java.time.Instant
 import java.util.concurrent.TimeUnit
 
 class PhotoRepositoryImpl(
-    private val application: Application,
     private val mediaStore: MediaStore,
     private val photoApi: PhotoApi,
     private val photoDao: PhotoDao,
@@ -115,12 +112,10 @@ class PhotoRepositoryImpl(
         photoDao.insertAll(photos = arrayOf(photo.toDatabasePhoto()))
     }
 
-    override fun getFaces(photoUri: Uri): Flow<List<Box>> {
+    override fun getFaces(bitmap: Bitmap): Flow<List<Box>> {
         return flow {
             emit(emptyList())
 
-            val bitmap: Bitmap = android.provider.MediaStore.Images.Media.getBitmap(application.contentResolver, photoUri)
-
             val faces = MTCNN(assetManager).detectFaces(
                 bitmap,
                 40,

diff --git a/repository/photos/src/test/kotlin/photos/network/repository/photos/PhotoRepositoryTest.kt b/repository/photos/src/test/kotlin/photos/network/repository/photos/PhotoRepositoryTest.kt
@@ -15,7 +15,7 @@
  */
 package photos.network.repository.photos
 
-import android.content.Context
+import android.content.res.AssetManager
 import androidx.work.WorkManager
 import com.google.common.truth.Truth
 import io.mockk.every
@@ -33,7 +33,7 @@ import photos.network.system.mediastore.MediaStore
  */
 class PhotoRepositoryTest {
 
-    private val applicationContext = mockk<Context>()
+    private val assetManager = mockk<AssetManager>()
     private val photoApi = mockk<PhotoApi>()
     private val photoDao = mockk<PhotoDao>()
     private val mediaStore = mockk<MediaStore>()
@@ -45,6 +45,7 @@ class PhotoRepositoryTest {
             photoDao = photoDao,
             workManager = workManager,
             mediaStore = mediaStore,
+            assetManager = assetManager,
         )
     }
 

diff --git a/ui/photos/src/test/kotlin/photos/network/ui/photos/photos/PhotosViewModelTests.kt b/ui/photos/src/test/kotlin/photos/network/ui/photos/photos/PhotosViewModelTests.kt
@@ -32,6 +32,7 @@ import kotlinx.coroutines.test.setMain
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import photos.network.domain.photos.usecase.GetFacesUseCase
 import photos.network.domain.photos.usecase.GetPhotosUseCase
 import photos.network.domain.photos.usecase.StartPhotosSyncUseCase
 import photos.network.domain.settings.usecase.GetSettingsUseCase
@@ -45,12 +46,14 @@ class PhotosViewModelTests {
     private val togglePrivacyUseCase = mockk<TogglePrivacyUseCase>()
     private val getPhotosUseCase = mockk<GetPhotosUseCase>()
     private val startPhotosSyncUseCase = mockk<StartPhotosSyncUseCase>()
+    private val getFacesUseCase = mockk<GetFacesUseCase>()
     private val viewmodel by lazy {
         photos.network.ui.photos.PhotosViewModel(
             getSettingsUseCase = getSettingsUseCase,
             togglePrivacyStateUseCase = togglePrivacyUseCase,
             getPhotosUseCase = getPhotosUseCase,
             startPhotosSyncUseCase = startPhotosSyncUseCase,
+            getFacesUseCase = getFacesUseCase
         )
     }
     private val photo1 = Photo(