Merge pull request #27 from marcopla99/process_refactorings_from_todo…

…_list Refactor
marcopla99 · Apr 26, 2023 · 1a6213a · 1a6213a
2 parents 9934dff + f24d33a
commit 1a6213a
Show file tree

Hide file tree

Showing 27 changed files with 332 additions and 187 deletions.
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,2 @@
-/build
+/build
+../.idea/androidTestResultsUserPreferences.xml
diff --git a/app/src/androidTest/java/com/marcopla/flashcards/data/FlashCardRepositoryTest.kt b/app/src/androidTest/java/com/marcopla/flashcards/data/FlashCardRepositoryTest.kt
@@ -121,7 +121,7 @@ class FlashCardRepositoryTest {
     }
 
     @Test
-    fun whenAddingResult_thenIsSaved() {
+    fun whenAddingResult_thenIsSaved() = runTest {
         val quizResult = QuizResult(
             FlashCard("Engels", "English"),
             "Dutch",
@@ -130,7 +130,7 @@ class FlashCardRepositoryTest {
 
         repository.addResult(quizResult)
 
-        val currentResults = repository.getCurrentResults()
+        val currentResults = repository.getCurrentResults().first()
         assertEquals(listOf(quizResult), currentResults)
     }
 }
diff --git a/app/src/androidTest/java/com/marcopla/flashcards/presentation/add/AddScreenRobot.kt b/app/src/androidTest/java/com/marcopla/flashcards/presentation/add/AddScreenRobot.kt
@@ -1,13 +1,18 @@
 package com.marcopla.flashcards.presentation.add
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.*
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsFocused
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextInput
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.marcopla.flashcards.R
 import com.marcopla.flashcards.data.repository.FlashCardRepository
 import com.marcopla.flashcards.domain.usecase.AddUseCase
-import com.marcopla.flashcards.presentation.screen.add.AddScreen
+import com.marcopla.flashcards.presentation.screen.add.AddRoute
 import com.marcopla.flashcards.presentation.screen.add.AddViewModel
 import com.marcopla.testing_shared.TestFlashCardRepository
 
@@ -19,9 +24,8 @@ fun launchAddScreen(
     repository: FlashCardRepository = TestFlashCardRepository(),
     block: AddScreenRobot.() -> Unit
 ): AddScreenRobot {
-    composeRule.setContent {
-        AddScreen(viewModel = AddViewModel(AddUseCase(repository)))
-    }
+    val viewModel = AddViewModel(AddUseCase(repository))
+    composeRule.setContent { AddRoute(viewModel = viewModel) }
     return AddScreenRobot(composeRule).apply(block)
 }
 

diff --git a/app/src/androidTest/java/com/marcopla/flashcards/presentation/carousel/CarouselRobot.kt b/app/src/androidTest/java/com/marcopla/flashcards/presentation/carousel/CarouselRobot.kt
@@ -1,15 +1,19 @@
 package com.marcopla.flashcards.presentation.carousel
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.*
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextInput
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.marcopla.flashcards.R
 import com.marcopla.flashcards.data.model.FlashCard
 import com.marcopla.flashcards.data.repository.FlashCardRepositoryImpl
 import com.marcopla.flashcards.domain.usecase.LoadUseCase
 import com.marcopla.flashcards.domain.usecase.SubmitQuizUseCase
-import com.marcopla.flashcards.presentation.screen.carousel.CarouselScreen
+import com.marcopla.flashcards.presentation.screen.carousel.CarouselRoute
 import com.marcopla.flashcards.presentation.screen.carousel.CarouselViewModel
 import com.marcopla.testing_shared.FakeFlashCardDao
 
@@ -21,15 +25,12 @@ fun launchCarouselScreen(
     flashCards: List<FlashCard>,
     block: CarouselScreenRobot.() -> Unit
 ): CarouselScreenRobot {
-    composeRule.setContent {
-        val repository = FlashCardRepositoryImpl(FakeFlashCardDao(flashCards))
-        CarouselScreen(
-            viewModel = CarouselViewModel(
-                LoadUseCase(repository),
-                SubmitQuizUseCase(repository)
-            )
-        ) {}
-    }
+    val repository = FlashCardRepositoryImpl(FakeFlashCardDao(flashCards))
+    val viewModel = CarouselViewModel(
+        LoadUseCase(repository),
+        SubmitQuizUseCase(repository)
+    )
+    composeRule.setContent { CarouselRoute(viewModel) {} }
     return CarouselScreenRobot(composeRule).apply(block)
 }
 

diff --git a/app/src/androidTest/java/com/marcopla/flashcards/presentation/edit/EditScreenRobot.kt b/app/src/androidTest/java/com/marcopla/flashcards/presentation/edit/EditScreenRobot.kt
@@ -1,8 +1,12 @@
 package com.marcopla.flashcards.presentation.edit
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.*
+import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performTextInput
 import androidx.lifecycle.SavedStateHandle
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.marcopla.flashcards.R
@@ -13,7 +17,7 @@ import com.marcopla.flashcards.domain.usecase.DeleteUseCase
 import com.marcopla.flashcards.domain.usecase.EditUseCase
 import com.marcopla.flashcards.domain.usecase.LoadUseCase
 import com.marcopla.flashcards.presentation.navigation.FLASH_CARD_ID_ARG_KEY
-import com.marcopla.flashcards.presentation.screen.edit.EditScreen
+import com.marcopla.flashcards.presentation.screen.edit.EditRoute
 import com.marcopla.flashcards.presentation.screen.edit.EditViewModel
 import com.marcopla.testing_shared.FakeFlashCardDao
 import com.marcopla.testing_shared.TestFlashCardRepository
@@ -27,19 +31,16 @@ fun launchEditScreenFor(
     flashCardRepository: FlashCardRepository = TestFlashCardRepository(),
     block: EditScreenRobot.() -> Unit
 ): EditScreenRobot {
+    val viewModel = EditViewModel(
+        SavedStateHandle(mapOf(FLASH_CARD_ID_ARG_KEY to selectedFlashCard.id)),
+        EditUseCase(flashCardRepository),
+        LoadUseCase(
+            FlashCardRepositoryImpl(FakeFlashCardDao(listOf(selectedFlashCard)))
+        ),
+        DeleteUseCase(TestFlashCardRepository())
+    )
     composeRule.setContent {
-        EditScreen(
-            viewModel = EditViewModel(
-                SavedStateHandle(mapOf(FLASH_CARD_ID_ARG_KEY to selectedFlashCard.id)),
-                EditUseCase(flashCardRepository),
-                LoadUseCase(
-                    FlashCardRepositoryImpl(FakeFlashCardDao(listOf(selectedFlashCard)))
-                ),
-                DeleteUseCase(TestFlashCardRepository())
-            ),
-            onFlashCardEdited = {},
-            onFlashCardDeleted = {}
-        )
+        EditRoute(viewModel) {}
     }
     return EditScreenRobot(composeRule).apply(block)
 }

diff --git a/app/src/androidTest/java/com/marcopla/flashcards/presentation/home/HomeScreenRobot.kt b/app/src/androidTest/java/com/marcopla/flashcards/presentation/home/HomeScreenRobot.kt
@@ -8,24 +8,20 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import com.marcopla.flashcards.R
 import com.marcopla.flashcards.data.model.FlashCard
-import com.marcopla.flashcards.data.repository.FlashCardRepositoryImpl
-import com.marcopla.flashcards.domain.usecase.LoadUseCase
 import com.marcopla.flashcards.presentation.screen.home.HomeScreen
-import com.marcopla.flashcards.presentation.screen.home.HomeViewModel
-import com.marcopla.testing_shared.FakeFlashCardDao
+import com.marcopla.flashcards.presentation.screen.home.HomeScreenState
 
 typealias ComponentActivityTestRule =
     AndroidComposeTestRule<ActivityScenarioRule<ComponentActivity>, ComponentActivity>
 
 suspend fun launchHomeScreen(
     rule: ComponentActivityTestRule,
-    flashCards: List<FlashCard> = emptyList(),
+    screenState: HomeScreenState,
     block: suspend HomeScreenRobot.() -> Unit
 ): HomeScreenRobot {
-    val repository = FlashCardRepositoryImpl(FakeFlashCardDao(flashCards))
     rule.setContent {
         HomeScreen(
-            viewModel = HomeViewModel(LoadUseCase(repository)),
+            screenState = screenState,
             onNavigateToAddScreen = {},
             onItemClicked = {},
             onNavigateToCarouselScreen = {}

diff --git a/app/src/androidTest/java/com/marcopla/flashcards/presentation/home/HomeScreenTest.kt b/app/src/androidTest/java/com/marcopla/flashcards/presentation/home/HomeScreenTest.kt
@@ -3,6 +3,7 @@ package com.marcopla.flashcards.presentation.home
 import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.marcopla.flashcards.data.model.FlashCard
+import com.marcopla.flashcards.presentation.screen.home.HomeScreenState
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -16,7 +17,7 @@ class HomeScreenTest {
 
     @Test
     fun homeScreen_whenGettingEmptyState_thenShowEmptyMessage() = runTest {
-        launchHomeScreen(composeRule, emptyList()) {
+        launchHomeScreen(composeRule, HomeScreenState.Empty) {
             // Do nothing
         } verify {
             emptyMessageIsDisplayed()
@@ -31,7 +32,7 @@ class HomeScreenTest {
             FlashCard(frontText = "front3", backText = "back3")
         )
 
-        launchHomeScreen(composeRule, flashCards) {
+        launchHomeScreen(composeRule, HomeScreenState.Cards(flashCards)) {
             // Do nothing
         } verify {
             listOfFlashCardsIsDisplayed(flashCards)
@@ -40,7 +41,7 @@ class HomeScreenTest {
 
     @Test
     fun homeScreen_whenNoFlashCards_thenDoNotShowCarouselButton() = runTest {
-        launchHomeScreen(composeRule, emptyList()) {
+        launchHomeScreen(composeRule, HomeScreenState.Empty) {
             // Empty
         } verify {
             carouselButtonIsNotDisplayed()

diff --git a/app/src/main/java/com/marcopla/flashcards/data/repository/FlashCardRepository.kt b/app/src/main/java/com/marcopla/flashcards/data/repository/FlashCardRepository.kt
@@ -19,7 +19,7 @@ interface FlashCardRepository {
 
     fun addResult(quizResult: QuizResult)
 
-    fun getCurrentResults(): List<QuizResult>
+    fun getCurrentResults(): Flow<List<QuizResult>>
 
     fun clearResults()
 }
diff --git a/app/src/main/java/com/marcopla/flashcards/data/repository/FlashCardRepositoryImpl.kt b/app/src/main/java/com/marcopla/flashcards/data/repository/FlashCardRepositoryImpl.kt
@@ -5,6 +5,7 @@ import com.marcopla.flashcards.data.datasource.FlashCardDao
 import com.marcopla.flashcards.data.model.FlashCard
 import com.marcopla.flashcards.data.model.QuizResult
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 
 class FlashCardRepositoryImpl(
     private val flashCardDao: FlashCardDao
@@ -49,8 +50,8 @@ class FlashCardRepositoryImpl(
      * Get the stored results for this session.
      * Note: results are currently just saved in memory.
      */
-    override fun getCurrentResults(): List<QuizResult> {
-        return currentResults
+    override fun getCurrentResults(): Flow<List<QuizResult>> {
+        return flow { emit(currentResults) }
     }
 
     override fun clearResults() {

diff --git a/app/src/main/java/com/marcopla/flashcards/domain/usecase/LoadResultsUseCase.kt b/app/src/main/java/com/marcopla/flashcards/domain/usecase/LoadResultsUseCase.kt
@@ -3,11 +3,12 @@ package com.marcopla.flashcards.domain.usecase
 import com.marcopla.flashcards.data.model.QuizResult
 import com.marcopla.flashcards.data.repository.FlashCardRepository
 import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
 
 // TODO: Currently the results are stored only in memory. Would be better to store them on disk.
 class LoadResultsUseCase @Inject constructor(private val repository: FlashCardRepository) {
 
-    operator fun invoke(): List<QuizResult> {
+    operator fun invoke(): Flow<List<QuizResult>> {
         return repository.getCurrentResults()
     }