Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

change collectJob to backgroundScope coroutine

saeedishayan760356b873e93e
diff --git a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt b/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
index 037e9db64..ff8e6946f 100644
--- a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
+++ b/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt
@@ -64,7 +64,7 @@ class BookmarksViewModelTest {
@Test
fun oneBookmark_showsInFeed() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
newsRepository.sendNewsResources(newsResourcesTestData)
userDataRepository.setNewsResourceBookmarked(newsResourcesTestData[0].id, true)
@@ -72,12 +72,11 @@ class BookmarksViewModelTest {
assertIs<Success>(item)
assertEquals(item.feed.size, 1)
- collectJob.cancel()
}
@Test
fun oneBookmark_whenRemoving_removesFromFeed() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
// Set the news resources to be used by this test
newsRepository.sendNewsResources(newsResourcesTestData)
// Start with the resource saved
@@ -89,6 +88,5 @@ class BookmarksViewModelTest {
assertIs<Success>(item)
assertEquals(item.feed.size, 0)
- collectJob.cancel()
}
}
diff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
index eece140ac..5db2a76f9 100644
--- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
+++ b/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
@@ -98,9 +98,8 @@ class ForYouViewModelTest {
@Test
fun stateIsLoadingWhenFollowedTopicsAreLoading() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
topicsRepository.sendTopics(sampleTopics)
@@ -110,30 +109,25 @@ class ForYouViewModelTest {
)
assertEquals(NewsFeedUiState.Loading, viewModel.feedState.value)
- collectJob1.cancel()
- collectJob2.cancel()
}
@Test
fun stateIsLoadingWhenAppIsSyncingWithNoInterests() = runTest {
syncManager.setSyncing(true)
- val collectJob =
- launch(UnconfinedTestDispatcher()) { viewModel.isSyncing.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.isSyncing.collect() }
assertEquals(
true,
viewModel.isSyncing.value,
)
- collectJob.cancel()
}
@Test
fun onboardingStateIsLoadingWhenTopicsAreLoading() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
userDataRepository.setFollowedTopicIds(emptySet())
@@ -142,16 +136,13 @@ class ForYouViewModelTest {
viewModel.onboardingUiState.value,
)
assertEquals(NewsFeedUiState.Success(emptyList()), viewModel.feedState.value)
-
- collectJob1.cancel()
- collectJob2.cancel()
}
@Test
fun onboardingIsShownWhenNewsResourcesAreLoading() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
topicsRepository.sendTopics(sampleTopics)
userDataRepository.setFollowedTopicIds(emptySet())
@@ -202,16 +193,12 @@ class ForYouViewModelTest {
),
viewModel.feedState.value,
)
-
- collectJob1.cancel()
- collectJob2.cancel()
}
@Test
fun onboardingIsShownAfterLoadingEmptyFollowedTopics() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
topicsRepository.sendTopics(sampleTopics)
userDataRepository.setFollowedTopicIds(emptySet())
@@ -264,15 +251,12 @@ class ForYouViewModelTest {
viewModel.feedState.value,
)
- collectJob1.cancel()
- collectJob2.cancel()
}
@Test
fun onboardingIsNotShownAfterUserDismissesOnboarding() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
topicsRepository.sendTopics(sampleTopics)
@@ -300,15 +284,13 @@ class ForYouViewModelTest {
viewModel.feedState.value,
)
- collectJob1.cancel()
- collectJob2.cancel()
+
}
@Test
fun topicSelectionUpdatesAfterSelectingTopic() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
topicsRepository.sendTopics(sampleTopics)
userDataRepository.setFollowedTopicIds(emptySet())
@@ -352,16 +334,12 @@ class ForYouViewModelTest {
),
viewModel.feedState.value,
)
-
- collectJob1.cancel()
- collectJob2.cancel()
}
@Test
fun topicSelectionUpdatesAfterUnselectingTopic() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
topicsRepository.sendTopics(sampleTopics)
userDataRepository.setFollowedTopicIds(emptySet())
@@ -416,16 +394,12 @@ class ForYouViewModelTest {
),
viewModel.feedState.value,
)
-
- collectJob1.cancel()
- collectJob2.cancel()
}
@Test
fun newsResourceSelectionUpdatesAfterLoadingFollowedTopics() = runTest {
- val collectJob1 =
- launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
- val collectJob2 = launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.onboardingUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.feedState.collect() }
val followedTopicIds = setOf("1")
val userData = emptyUserData.copy(
@@ -461,14 +435,11 @@ class ForYouViewModelTest {
viewModel.feedState.value,
)
- collectJob1.cancel()
- collectJob2.cancel()
}
@Test
fun deepLinkedNewsResourceIsFetchedAndResetAfterViewing() = runTest {
- val collectJob =
- launch(UnconfinedTestDispatcher()) { viewModel.deepLinkedNewsResource.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.deepLinkedNewsResource.collect() }
newsRepository.sendNewsResources(sampleNewsResources)
userDataRepository.setUserData(emptyUserData)
@@ -504,7 +475,6 @@ class ForYouViewModelTest {
),
)
- collectJob.cancel()
}
@Test
diff --git a/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
index 987a5bc01..e1a8ce0db 100644
--- a/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
+++ b/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
@@ -80,17 +80,15 @@ class InterestsViewModelTest {
@Test
fun uiState_whenFollowedTopicsAreLoading_thenShowLoading() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
userDataRepository.setFollowedTopicIds(emptySet())
assertEquals(InterestsUiState.Loading, viewModel.uiState.value)
-
- collectJob.cancel()
}
@Test
fun uiState_whenFollowingNewTopic_thenShowUpdatedTopics() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
val toggleTopicId = testOutputTopics[1].topic.id
topicsRepository.sendTopics(testInputTopics.map { it.topic })
@@ -115,12 +113,11 @@ class InterestsViewModelTest {
viewModel.uiState.value,
)
- collectJob.cancel()
}
@Test
fun uiState_whenUnfollowingTopics_thenShowUpdatedTopics() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.uiState.collect() }
val toggleTopicId = testOutputTopics[1].topic.id
@@ -147,8 +144,6 @@ class InterestsViewModelTest {
),
viewModel.uiState.value,
)
-
- collectJob.cancel()
}
}
diff --git a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt b/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt
index c832401de..13b0b4496 100644
--- a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt
+++ b/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt
@@ -85,20 +85,16 @@ class SearchViewModelTest {
fun stateIsEmptyQuery_withEmptySearchQuery() = runTest {
searchContentsRepository.addNewsResources(newsResourcesTestData)
searchContentsRepository.addTopics(topicsTestData)
- val collectJob =
- launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
viewModel.onSearchQueryChanged("")
assertEquals(EmptyQuery, viewModel.searchResultUiState.value)
-
- collectJob.cancel()
}
@Test
fun emptyResultIsReturned_withNotMatchingQuery() = runTest {
- val collectJob =
- launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
viewModel.onSearchQueryChanged("XXX")
searchContentsRepository.addNewsResources(newsResourcesTestData)
@@ -106,32 +102,27 @@ class SearchViewModelTest {
val result = viewModel.searchResultUiState.value
assertIs<SearchResultUiState.Success>(result)
-
- collectJob.cancel()
}
@Test
fun recentSearches_verifyUiStateIsSuccess() = runTest {
- val collectJob =
- launch(UnconfinedTestDispatcher()) { viewModel.recentSearchQueriesUiState.collect() }
+
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.recentSearchQueriesUiState.collect() }
viewModel.onSearchTriggered("kotlin")
val result = viewModel.recentSearchQueriesUiState.value
assertIs<Success>(result)
- collectJob.cancel()
}
@Test
fun searchNotReady_withNoFtsTableEntity() = runTest {
- val collectJob =
- launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.searchResultUiState.collect() }
viewModel.onSearchQueryChanged("")
assertEquals(SearchNotReady, viewModel.searchResultUiState.value)
- collectJob.cancel()
}
@Test
diff --git a/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt b/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
index 9062abee6..1c36650dd 100644
--- a/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
+++ b/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt
@@ -52,8 +52,7 @@ class SettingsViewModelTest {
@Test
fun stateIsSuccessAfterUserDataLoaded() = runTest {
- val collectJob =
- launch(UnconfinedTestDispatcher()) { viewModel.settingsUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.settingsUiState.collect() }
userDataRepository.setThemeBrand(ANDROID)
userDataRepository.setDarkThemeConfig(DARK)
@@ -69,6 +68,5 @@ class SettingsViewModelTest {
viewModel.settingsUiState.value,
)
- collectJob.cancel()
}
}
diff --git a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
index c14e62e31..d6c2b7381 100644
--- a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
+++ b/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
@@ -85,7 +85,7 @@ class TopicViewModelTest {
@Test
fun uiStateTopic_whenSuccess_matchesTopicFromRepository() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
topicsRepository.sendTopics(testInputTopics.map(FollowableTopic::topic))
userDataRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
@@ -98,7 +98,6 @@ class TopicViewModelTest {
assertEquals(topicFromRepository, item.followableTopic.topic)
- collectJob.cancel()
}
@Test
@@ -113,18 +112,17 @@ class TopicViewModelTest {
@Test
fun uiStateTopic_whenFollowedIdsSuccessAndTopicLoading_thenShowLoading() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
userDataRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
assertEquals(TopicUiState.Loading, viewModel.topicUiState.value)
- collectJob.cancel()
}
@Test
fun uiStateTopic_whenFollowedIdsSuccessAndTopicSuccess_thenTopicSuccessAndNewsLoading() =
runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
topicsRepository.sendTopics(testInputTopics.map { it.topic })
userDataRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
@@ -134,13 +132,12 @@ class TopicViewModelTest {
assertIs<TopicUiState.Success>(topicUiState)
assertIs<NewsUiState.Loading>(newsUiState)
- collectJob.cancel()
}
@Test
fun uiStateTopic_whenFollowedIdsSuccessAndTopicSuccessAndNewsIsSuccess_thenAllSuccess() =
runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) {
+ backgroundScope.launch(UnconfinedTestDispatcher()) {
combine(
viewModel.topicUiState,
viewModel.newsUiState,
@@ -156,12 +153,11 @@ class TopicViewModelTest {
assertIs<TopicUiState.Success>(topicUiState)
assertIs<NewsUiState.Success>(newsUiState)
- collectJob.cancel()
}
@Test
fun uiStateTopic_whenFollowingTopic_thenShowUpdatedTopic() = runTest {
- val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
+ backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.topicUiState.collect() }
topicsRepository.sendTopics(testInputTopics.map { it.topic })
// Set which topic IDs are followed, not including 0.
@@ -174,7 +170,6 @@ class TopicViewModelTest {
viewModel.topicUiState.value,
)
- collectJob.cancel()
}
}