Skip to content

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

Merge remote-tracking branch 'goog/github/main'

Jolanda Verhoef4b5587340fcb
diff --cc feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt
index be2228cf5,01f70c04f..9ab24160b
--- a/feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt
+++ b/feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt
@@@ -102,9 -95,8 +98,8 @@@ class AuthorViewModelTest
@Test
fun uiStateAuthor_whenFollowedIdsSuccessAndAuthorLoading_thenShowLoading() = runTest {
viewModel.uiState.test {
- authorsRepository.setFollowedAuthorIds(setOf(testInputAuthors[1].author.id))
+ userDataRepository.setFollowedAuthorIds(setOf(testInputAuthors[1].author.id))
assertEquals(AuthorUiState.Loading, awaitItem().authorState)
- cancel()
}
}
diff --cc feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
index e39f10f3b,89ec4f8c0..dba50dccb
--- a/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
+++ b/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt
@@@ -133,9 -125,7 +128,7 @@@ class ForYouViewModelTest
),
awaitItem()
)
- topicsRepository.setFollowedTopicIds(emptySet())
+ userDataRepository.setFollowedTopicIds(emptySet())
-
- cancel()
}
}
@@@ -149,9 -139,7 +142,7 @@@
),
awaitItem()
)
- authorsRepository.setFollowedAuthorIds(emptySet())
+ userDataRepository.setFollowedAuthorIds(emptySet())
-
- cancel()
}
}
@@@ -1200,9 -1179,8 +1182,8 @@@
),
expectMostRecentItem()
)
- assertEquals(setOf("1"), topicsRepository.getCurrentFollowedTopics())
- assertEquals(emptySet<Int>(), authorsRepository.getCurrentFollowedAuthors())
+ assertEquals(setOf("1"), userDataRepository.getCurrentFollowedTopics())
+ assertEquals(emptySet<Int>(), userDataRepository.getCurrentFollowedAuthors())
- cancel()
}
}
@@@ -1238,9 -1216,8 +1219,8 @@@
),
expectMostRecentItem()
)
- assertEquals(emptySet<Int>(), topicsRepository.getCurrentFollowedTopics())
- assertEquals(setOf("0"), authorsRepository.getCurrentFollowedAuthors())
+ assertEquals(emptySet<Int>(), userDataRepository.getCurrentFollowedTopics())
+ assertEquals(setOf("0"), userDataRepository.getCurrentFollowedAuthors())
- cancel()
}
}
@@@ -1281,9 -1258,8 +1261,8 @@@
),
expectMostRecentItem()
)
- assertEquals(setOf("1"), topicsRepository.getCurrentFollowedTopics())
- assertEquals(setOf("1"), authorsRepository.getCurrentFollowedAuthors())
+ assertEquals(setOf("1"), userDataRepository.getCurrentFollowedTopics())
+ assertEquals(setOf("1"), userDataRepository.getCurrentFollowedAuthors())
- cancel()
}
}
diff --cc feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
index 249b3329c,4902e9b2e..a341f7fd6
--- a/feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
+++ b/feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
@@@ -64,9 -57,8 +63,8 @@@ class InterestsViewModelTest
fun uiState_whenFollowedTopicsAreLoading_thenShowLoading() = runTest {
viewModel.uiState.test {
assertEquals(InterestsUiState.Loading, awaitItem())
- authorsRepository.setFollowedAuthorIds(setOf("1"))
- topicsRepository.setFollowedTopicIds(emptySet())
+ userDataRepository.setFollowedAuthorIds(setOf("1"))
+ userDataRepository.setFollowedTopicIds(emptySet())
- cancel()
}
}
@@@ -74,9 -66,8 +72,8 @@@
fun uiState_whenFollowedAuthorsAreLoading_thenShowLoading() = runTest {
viewModel.uiState.test {
assertEquals(InterestsUiState.Loading, awaitItem())
- authorsRepository.setFollowedAuthorIds(emptySet())
- topicsRepository.setFollowedTopicIds(setOf("1"))
+ userDataRepository.setFollowedAuthorIds(emptySet())
+ userDataRepository.setFollowedTopicIds(setOf("1"))
- cancel()
}
}
diff --cc feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
index a5e37a4ae,db340c1f7..bbc183003
--- a/feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
+++ b/feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt
@@@ -95,9 -89,8 +92,8 @@@ class TopicViewModelTest
@Test
fun uiStateTopic_whenFollowedIdsSuccessAndTopicLoading_thenShowLoading() = runTest {
viewModel.uiState.test {
- topicsRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
+ userDataRepository.setFollowedTopicIds(setOf(testInputTopics[1].topic.id))
assertEquals(TopicUiState.Loading, awaitItem().topicState)
- cancel()
}
}