A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix broken test in Firebase Test Lab
Jolanda Verhoef45dd9d0ed61a
diff --git a/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.ktindex 5afd3a02c..bc54741e6 100644--- a/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt+++ b/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt@@ -20,11 +20,11 @@ import androidx.activity.ComponentActivityimport androidx.compose.foundation.layout.BoxWithConstraintsimport androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApiimport androidx.compose.material3.windowsizeclass.WindowSizeClass+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClassimport androidx.compose.ui.test.assertHasClickActionimport androidx.compose.ui.test.assertIsDisplayedimport androidx.compose.ui.test.assertIsEnabledimport androidx.compose.ui.test.assertIsNotEnabled-import androidx.compose.ui.test.assertIsOffimport androidx.compose.ui.test.hasContentDescriptionimport androidx.compose.ui.test.hasScrollToNodeActionimport androidx.compose.ui.test.hasText@@ -37,7 +37,12 @@ import androidx.compose.ui.unit.DpSizeimport com.google.samples.apps.nowinandroid.core.model.data.Authorimport com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthorimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic+import com.google.samples.apps.nowinandroid.core.model.data.NewsResource+import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Video+import com.google.samples.apps.nowinandroid.core.model.data.SaveableNewsResourceimport com.google.samples.apps.nowinandroid.core.model.data.Topic+import kotlinx.datetime.Instant+import org.junit.Assertimport org.junit.Ruleimport org.junit.Test@@ -78,7 +83,7 @@ class ForYouScreenTest {}@Test- fun topicSelector_whenNoTopicsSelected_showsTopicChipsAndDisabledDoneButton() {+ fun topicSelector_whenNoTopicsSelected_showsAuthorAndTopicChipsAndDisabledDoneButton() {composeTestRule.setContent {BoxWithConstraints {ForYouScreen(@@ -87,65 +92,8 @@ class ForYouScreenTest {),interestsSelectionState =ForYouInterestsSelectionUiState.WithInterestsSelection(- topics = listOf(- FollowableTopic(- topic = Topic(- id = "0",- name = "Headlines",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "1",- name = "UI",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "2",- name = "Tools",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- ),- authors = listOf(- FollowableAuthor(- author = Author(- id = "0",- name = "Android Dev",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = false- ),- FollowableAuthor(- author = Author(- id = "1",- name = "Android Dev 2",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = false- ),- )+ topics = testTopics,+ authors = testAuthors),feedState = ForYouFeedUiState.Success(feed = emptyList()@@ -158,20 +106,19 @@ class ForYouScreenTest {}}- composeTestRule- .onNodeWithText("Headlines")- .assertIsDisplayed()- .assertHasClickAction()-- composeTestRule- .onNodeWithText("UI")- .assertIsDisplayed()- .assertHasClickAction()+ testAuthors.forEach { testAuthor ->+ composeTestRule+ .onNodeWithText(testAuthor.author.name)+ .assertIsDisplayed()+ .assertHasClickAction()+ }- composeTestRule- .onNodeWithText("Tools")- .assertIsDisplayed()- .assertHasClickAction()+ testTopics.forEach { testTopic ->+ composeTestRule+ .onNodeWithText(testTopic.topic.name)+ .assertIsDisplayed()+ .assertHasClickAction()+ }// Scroll until the Done button is visiblecomposeTestRule@@ -187,7 +134,7 @@ class ForYouScreenTest {}@Test- fun topicSelector_whenSomeTopicsSelected_showsTopicChipsAndEnabledDoneButton() {+ fun topicSelector_whenSomeTopicsSelected_showsAuthorAndTopicChipsAndEnabledDoneButton() {composeTestRule.setContent {BoxWithConstraints {ForYouScreen(@@ -196,65 +143,11 @@ class ForYouScreenTest {),interestsSelectionState =ForYouInterestsSelectionUiState.WithInterestsSelection(- topics = listOf(- FollowableTopic(- topic = Topic(- id = "0",- name = "Headlines",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "1",- name = "UI",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = true- ),- FollowableTopic(- topic = Topic(- id = "2",- name = "Tools",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- ),- authors = listOf(- FollowableAuthor(- author = Author(- id = "0",- name = "Android Dev",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = false- ),- FollowableAuthor(- author = Author(- id = "1",- name = "Android Dev 2",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = false- ),- ),+ // Follow one topic+ topics = testTopics.mapIndexed { index, testTopic ->+ testTopic.copy(isFollowed = index == 1)+ },+ authors = testAuthors),feedState = ForYouFeedUiState.Success(feed = emptyList()@@ -267,26 +160,19 @@ class ForYouScreenTest {}}- composeTestRule- .onNodeWithText("Headlines")- .assertIsDisplayed()- .assertHasClickAction()-- composeTestRule- .onNodeWithText("UI")- .assertIsDisplayed()- .assertHasClickAction()-- composeTestRule- .onNodeWithText("Tools")- .assertIsDisplayed()- .assertHasClickAction()+ testAuthors.forEach { testAuthor ->+ composeTestRule+ .onNodeWithText(testAuthor.author.name)+ .assertIsDisplayed()+ .assertHasClickAction()+ }- composeTestRule- .onNodeWithText("Android Dev")- .assertIsDisplayed()- .assertIsOff()- .assertHasClickAction()+ testTopics.forEach { testTopic ->+ composeTestRule+ .onNodeWithText(testTopic.topic.name)+ .assertIsDisplayed()+ .assertHasClickAction()+ }// Scroll until the Done button is visiblecomposeTestRule@@ -302,7 +188,7 @@ class ForYouScreenTest {}@Test- fun topicSelector_whenSomeAuthorsSelected_showsTopicChipsAndEnabledDoneButton() {+ fun topicSelector_whenSomeAuthorsSelected_showsAuthorAndTopicChipsAndEnabledDoneButton() {composeTestRule.setContent {BoxWithConstraints {ForYouScreen(@@ -311,65 +197,11 @@ class ForYouScreenTest {),interestsSelectionState =ForYouInterestsSelectionUiState.WithInterestsSelection(- topics = listOf(- FollowableTopic(- topic = Topic(- id = "0",- name = "Headlines",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "1",- name = "UI",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = true- ),- FollowableTopic(- topic = Topic(- id = "2",- name = "Tools",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- ),- authors = listOf(- FollowableAuthor(- author = Author(- id = "0",- name = "Android Dev",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = false- ),- FollowableAuthor(- author = Author(- id = "1",- name = "Android Dev 2",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = false- ),- ),+ // Follow one topic+ topics = testTopics,+ authors = testAuthors.mapIndexed { index, testAuthor ->+ testAuthor.copy(isFollowed = index == 1)+ }),feedState = ForYouFeedUiState.Success(feed = emptyList()@@ -382,26 +214,19 @@ class ForYouScreenTest {}}- composeTestRule- .onNodeWithText("Headlines")- .assertIsDisplayed()- .assertHasClickAction()-- composeTestRule- .onNodeWithText("UI")- .assertIsDisplayed()- .assertHasClickAction()-- composeTestRule- .onNodeWithText("Tools")- .assertIsDisplayed()- .assertHasClickAction()+ testAuthors.forEach { testAuthor ->+ composeTestRule+ .onNodeWithText(testAuthor.author.name)+ .assertIsDisplayed()+ .assertHasClickAction()+ }- composeTestRule- .onNodeWithText("Android Dev")- .assertIsDisplayed()- .assertIsOff()- .assertHasClickAction()+ testTopics.forEach { testTopic ->+ composeTestRule+ .onNodeWithText(testTopic.topic.name)+ .assertIsDisplayed()+ .assertHasClickAction()+ }// Scroll until the Done button is visiblecomposeTestRule@@ -426,65 +251,8 @@ class ForYouScreenTest {),interestsSelectionState =ForYouInterestsSelectionUiState.WithInterestsSelection(- topics = listOf(- FollowableTopic(- topic = Topic(- id = "0",- name = "Headlines",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "1",- name = "UI",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- FollowableTopic(- topic = Topic(- id = "2",- name = "Tools",- shortDescription = "",- longDescription = "",- url = "",- imageUrl = ""- ),- isFollowed = false- ),- ),- authors = listOf(- FollowableAuthor(- author = Author(- id = "0",- name = "Android Dev",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = true- ),- FollowableAuthor(- author = Author(- id = "1",- name = "Android Dev 2",- imageUrl = "",- twitter = "",- mediumPage = "",- bio = "",- ),- isFollowed = false- ),- ),+ topics = testTopics,+ authors = testAuthors),feedState = ForYouFeedUiState.Loading,onAuthorCheckedChanged = { _, _ -> },@@ -547,155 +315,170 @@ class ForYouScreenTest {.assertExists()}-// @Test-// fun feed_whenNoInterestsSelectionAndLoaded_showsFeed() {-// lateinit var windowSizeClass: WindowSizeClass-//-// val saveableNewsResources = listOf(-// SaveableNewsResource(-// newsResource = NewsResource(-// id = "1",-// episodeId = "52",-// title = "Thanks for helping us reach 1M YouTube Subscribers",-// content = "Thank you everyone for following the Now in Android series " +-// "and everything the Android Developers YouTube channel has to offer. " +-// "During the Android Developer Summit, our YouTube channel reached 1 " +-// "million subscribers! Here’s a small video to thank you all.",-// url = "https://youtu.be/-fJ6poHQrjM",-// headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg",-// publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),-// type = Video,-// topics = listOf(-// Topic(-// id = "0",-// name = "Headlines",-// shortDescription = "",-// longDescription = "",-// url = "",-// imageUrl = ""-// )-// ),-// authors = emptyList()-// ),-// isSaved = false-// ),-// SaveableNewsResource(-// newsResource = NewsResource(-// id = "2",-// episodeId = "52",-// title = "Transformations and customisations in the Paging Library",-// content = "A demonstration of different operations that can be performed " +-// "with Paging. Transformations like inserting separators, when to " +-// "create a new pager, and customisation options for consuming " +-// "PagingData.",-// url = "https://youtu.be/ZARz0pjm5YM",-// headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",-// publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),-// type = Video,-// topics = listOf(-// Topic(-// id = "1",-// name = "UI",-// shortDescription = "",-// longDescription = "",-// url = "",-// imageUrl = ""-// ),-// ),-// authors = emptyList()-// ),-// isSaved = false-// ),-// SaveableNewsResource(-// newsResource = NewsResource(-// id = "3",-// episodeId = "52",-// title = "Community tip on Paging",-// content = "Tips for using the Paging library from the developer community",-// url = "https://youtu.be/r5JgIyS3t3s",-// headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",-// publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),-// type = Video,-// topics = listOf(-// Topic(-// id = "1",-// name = "UI",-// shortDescription = "",-// longDescription = "",-// url = "",-// imageUrl = ""-// ),-// ),-// authors = emptyList()-// ),-// isSaved = false-// ),-// )-//-// composeTestRule.setContent {-// BoxWithConstraints {-// windowSizeClass = WindowSizeClass.calculateFromSize(-// DpSize(maxWidth, maxHeight)-// )-//-// ForYouScreen(-// windowSizeClass = windowSizeClass,-// interestsSelectionState = ForYouInterestsSelectionUiState.NoInterestsSelection,-// feedState = ForYouFeedUiState.Success(-// feed = saveableNewsResources-// ),-// onAuthorCheckedChanged = { _, _ -> },-// onTopicCheckedChanged = { _, _ -> },-// saveFollowedTopics = {},-// onNewsResourcesCheckedChanged = { _, _ -> }-// )-// }-// }-//-// // Scroll until the second feed item is visible-// // This will cause both the first and second feed items to be visible at the same time,-// // so we can compare their positions to each other.-// composeTestRule-// .onAllNodes(hasScrollToNodeAction())-// .onFirst()-// .performScrollToNode(-// hasText(-// "Transformations and customisations in the Paging Library",-// substring = true-// )-// )-//-// val firstFeedItem = composeTestRule-// .onNodeWithText(-// "Thanks for helping us reach 1M YouTube Subscribers",-// substring = true-// )-// .assertHasClickAction()-// .fetchSemanticsNode()-//-// val secondFeedItem = composeTestRule-// .onNodeWithText(-// "Transformations and customisations in the Paging Library",-// substring = true-// )-// .assertHasClickAction()-// .fetchSemanticsNode()-//-// when (windowSizeClass.widthSizeClass) {-// WindowWidthSizeClass.Compact, Companion.Medium -> {-// // On smaller screen widths, the second feed item should be below the first because-// // they are displayed in a single column-// assertTrue(-// firstFeedItem.positionInRoot.y < secondFeedItem.positionInRoot.y-// )-// }-// else -> {-// // On larger screen widths, the second feed item should be inline with the first-// // because they are displayed in more than one column-// assertTrue(-// firstFeedItem.positionInRoot.y == secondFeedItem.positionInRoot.y-// )-// }-// }-// }+ @Test+ fun feed_whenNoInterestsSelectionAndLoaded_showsFeed() {+ lateinit var windowSizeClass: WindowSizeClass++ composeTestRule.setContent {+ BoxWithConstraints {+ windowSizeClass = WindowSizeClass.calculateFromSize(+ DpSize(maxWidth, maxHeight)+ )++ ForYouScreen(+ windowSizeClass = windowSizeClass,+ interestsSelectionState = ForYouInterestsSelectionUiState.NoInterestsSelection,+ feedState = ForYouFeedUiState.Success(+ feed = testNewsResources+ ),+ onAuthorCheckedChanged = { _, _ -> },+ onTopicCheckedChanged = { _, _ -> },+ saveFollowedTopics = {},+ onNewsResourcesCheckedChanged = { _, _ -> }+ )+ }+ }++ val firstFeedItem = composeTestRule+ .onNodeWithText(+ testNewsResources[0].newsResource.title,+ substring = true+ )+ .assertHasClickAction()+ .fetchSemanticsNode()++ val secondFeedItem = composeTestRule+ .onNodeWithText(+ testNewsResources[1].newsResource.title,+ substring = true+ )+ .assertHasClickAction()+ .fetchSemanticsNode()++ when (windowSizeClass.widthSizeClass) {+ WindowWidthSizeClass.Compact, WindowWidthSizeClass.Medium -> {+ // On smaller screen widths, the second feed item should be below the first because+ // they are displayed in a single column+ Assert.assertTrue(+ firstFeedItem.positionInRoot.y < secondFeedItem.positionInRoot.y+ )+ }+ else -> {+ // On larger screen widths, the second feed item should be inline with the first+ // because they are displayed in more than one column+ Assert.assertTrue(+ firstFeedItem.positionInRoot.y == secondFeedItem.positionInRoot.y+ )+ }+ }+ }}++private val testTopic = Topic(+ id = "",+ name = "",+ shortDescription = "",+ longDescription = "",+ url = "",+ imageUrl = ""+)+private val testAuthor = Author(+ id = "",+ name = "",+ imageUrl = "",+ twitter = "",+ mediumPage = "",+ bio = ""+)+private val testTopics = listOf(+ FollowableTopic(+ topic = testTopic.copy(id = "0", name = "Headlines"),+ isFollowed = false+ ),+ FollowableTopic(+ topic = testTopic.copy(id = "1", name = "UI"),+ isFollowed = false+ ),+ FollowableTopic(+ topic = testTopic.copy(id = "2", name = "Tools"),+ isFollowed = false+ ),+)+private val testAuthors = listOf(+ FollowableAuthor(+ author = testAuthor.copy(id = "0", name = "Android Dev"),+ isFollowed = false+ ),+ FollowableAuthor(+ author = testAuthor.copy(id = "1", name = "Android Dev 2"),+ isFollowed = false+ ),+)+private val testNewsResources = listOf(+ SaveableNewsResource(+ newsResource = NewsResource(+ id = "1",+ episodeId = "52",+ title = "Small Title",+ content = "small.",+ url = "https://youtu.be/-fJ6poHQrjM",+ headerImageUrl = null,+ publishDate = Instant.parse("2021-11-09T00:00:00.000Z"),+ type = Video,+ topics = emptyList(),+ authors = emptyList()+ ),+ isSaved = false+ ),+ SaveableNewsResource(+ newsResource = NewsResource(+ id = "2",+ episodeId = "52",+ title = "Transformations and customisations in the Paging Library",+ content = "A demonstration of different operations that can be performed " ++ "with Paging. Transformations like inserting separators, when to " ++ "create a new pager, and customisation options for consuming " ++ "PagingData.",+ url = "https://youtu.be/ZARz0pjm5YM",+ headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg",+ publishDate = Instant.parse("2021-11-01T00:00:00.000Z"),+ type = Video,+ topics = listOf(+ Topic(+ id = "1",+ name = "UI",+ shortDescription = "",+ longDescription = "",+ url = "",+ imageUrl = ""+ ),+ ),+ authors = emptyList()+ ),+ isSaved = false+ ),+ SaveableNewsResource(+ newsResource = NewsResource(+ id = "3",+ episodeId = "52",+ title = "Community tip on Paging",+ content = "Tips for using the Paging library from the developer community",+ url = "https://youtu.be/r5JgIyS3t3s",+ headerImageUrl = "https://i.ytimg.com/vi/r5JgIyS3t3s/maxresdefault.jpg",+ publishDate = Instant.parse("2021-11-08T00:00:00.000Z"),+ type = Video,+ topics = listOf(+ Topic(+ id = "1",+ name = "UI",+ shortDescription = "",+ longDescription = "",+ url = "",+ imageUrl = ""+ ),+ ),+ authors = emptyList()+ ),+ isSaved = false+ ),+)