msb-public
/
nowinandroid
mirror of https://github.com/android/nowinandroid.git
1
0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'goog/main' into jun9merge2

Browse Source 
Change-Id: Ie5d6e5d0f88c9b2c6beeeaf0598f32487d86b82c
pull/128/head
Jolanda Verhoef 3 years ago
parent 2acae8f709 45dd9d0ed6
commit 03c11df958
1 changed files with 225 additions and 442 deletions
Show Stats Download Patch File Download Diff File

631
feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
Unescape View File

@ -20,11 +20,11 @@ import androidx.activity.ComponentActivity
import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
import androidx.compose.material3.windowsizeclass.WindowSizeClass import androidx.compose.material3.windowsizeclass.WindowSizeClass
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.ui.test.assertHasClickAction import androidx.compose.ui.test.assertHasClickAction
import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsEnabled import androidx.compose.ui.test.assertIsEnabled
import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.assertIsNotEnabled
import androidx.compose.ui.test.assertIsOff
import androidx.compose.ui.test.hasContentDescription import androidx.compose.ui.test.hasContentDescription
import androidx.compose.ui.test.hasScrollToNodeAction import androidx.compose.ui.test.hasScrollToNodeAction
import androidx.compose.ui.test.hasText import androidx.compose.ui.test.hasText
@ -37,7 +37,12 @@ import androidx.compose.ui.unit.DpSize
import com.google.samples.apps.nowinandroid.core.model.data.Author import com.google.samples.apps.nowinandroid.core.model.data.Author
import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor
import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic import 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.SaveableNewsResource
import com.google.samples.apps.nowinandroid.core.model.data.Topic import com.google.samples.apps.nowinandroid.core.model.data.Topic
import kotlinx.datetime.Instant
import org.junit.Assert
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
@ -78,7 +83,7 @@ class ForYouScreenTest {
} }
@Test @Test
fun topicSelector_whenNoTopicsSelected_showsTopicChipsAndDisabledDoneButton() { fun topicSelector_whenNoTopicsSelected_showsAuthorAndTopicChipsAndDisabledDoneButton() {
composeTestRule.setContent { composeTestRule.setContent {
BoxWithConstraints { BoxWithConstraints {
ForYouScreen( ForYouScreen(
@ -87,65 +92,8 @@ class ForYouScreenTest {
), ),
interestsSelectionState = interestsSelectionState =
ForYouInterestsSelectionUiState.WithInterestsSelection( ForYouInterestsSelectionUiState.WithInterestsSelection(
topics = listOf( topics = testTopics,
FollowableTopic( authors = testAuthors
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
),
)
), ),
feedState = ForYouFeedUiState.Success( feedState = ForYouFeedUiState.Success(
feed = emptyList() feed = emptyList()
@ -158,20 +106,19 @@ class ForYouScreenTest {
} }
} }
testAuthors.forEach { testAuthor ->
composeTestRule composeTestRule
.onNodeWithText("Headlines") .onNodeWithText(testAuthor.author.name)
.assertIsDisplayed()
.assertHasClickAction()
composeTestRule
.onNodeWithText("UI")
.assertIsDisplayed() .assertIsDisplayed()
.assertHasClickAction() .assertHasClickAction()
}
testTopics.forEach { testTopic ->
composeTestRule composeTestRule
.onNodeWithText("Tools") .onNodeWithText(testTopic.topic.name)
.assertIsDisplayed() .assertIsDisplayed()
.assertHasClickAction() .assertHasClickAction()
}
// Scroll until the Done button is visible // Scroll until the Done button is visible
composeTestRule composeTestRule
@ -187,7 +134,7 @@ class ForYouScreenTest {
} }
@Test @Test
fun topicSelector_whenSomeTopicsSelected_showsTopicChipsAndEnabledDoneButton() { fun topicSelector_whenSomeTopicsSelected_showsAuthorAndTopicChipsAndEnabledDoneButton() {
composeTestRule.setContent { composeTestRule.setContent {
BoxWithConstraints { BoxWithConstraints {
ForYouScreen( ForYouScreen(
@ -196,65 +143,11 @@ class ForYouScreenTest {
), ),
interestsSelectionState = interestsSelectionState =
ForYouInterestsSelectionUiState.WithInterestsSelection( ForYouInterestsSelectionUiState.WithInterestsSelection(
topics = listOf( // Follow one topic
FollowableTopic( topics = testTopics.mapIndexed { index, testTopic ->
topic = Topic( testTopic.copy(isFollowed = index == 1)
id = "0", },
name = "Headlines", authors = testAuthors
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
),
),
), ),
feedState = ForYouFeedUiState.Success( feedState = ForYouFeedUiState.Success(
feed = emptyList() feed = emptyList()
@ -267,26 +160,19 @@ class ForYouScreenTest {
} }
} }
testAuthors.forEach { testAuthor ->
composeTestRule composeTestRule
.onNodeWithText("Headlines") .onNodeWithText(testAuthor.author.name)
.assertIsDisplayed()
.assertHasClickAction()
composeTestRule
.onNodeWithText("UI")
.assertIsDisplayed()
.assertHasClickAction()
composeTestRule
.onNodeWithText("Tools")
.assertIsDisplayed() .assertIsDisplayed()
.assertHasClickAction() .assertHasClickAction()
}
testTopics.forEach { testTopic ->
composeTestRule composeTestRule
.onNodeWithText("Android Dev") .onNodeWithText(testTopic.topic.name)
.assertIsDisplayed() .assertIsDisplayed()
.assertIsOff()
.assertHasClickAction() .assertHasClickAction()
}
// Scroll until the Done button is visible // Scroll until the Done button is visible
composeTestRule composeTestRule
@ -302,7 +188,7 @@ class ForYouScreenTest {
} }
@Test @Test
fun topicSelector_whenSomeAuthorsSelected_showsTopicChipsAndEnabledDoneButton() { fun topicSelector_whenSomeAuthorsSelected_showsAuthorAndTopicChipsAndEnabledDoneButton() {
composeTestRule.setContent { composeTestRule.setContent {
BoxWithConstraints { BoxWithConstraints {
ForYouScreen( ForYouScreen(
@ -311,65 +197,11 @@ class ForYouScreenTest {
), ),
interestsSelectionState = interestsSelectionState =
ForYouInterestsSelectionUiState.WithInterestsSelection( ForYouInterestsSelectionUiState.WithInterestsSelection(
topics = listOf( // Follow one topic
FollowableTopic( topics = testTopics,
topic = Topic( authors = testAuthors.mapIndexed { index, testAuthor ->
id = "0", testAuthor.copy(isFollowed = index == 1)
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
),
),
), ),
feedState = ForYouFeedUiState.Success( feedState = ForYouFeedUiState.Success(
feed = emptyList() feed = emptyList()
@ -382,26 +214,19 @@ class ForYouScreenTest {
} }
} }
testAuthors.forEach { testAuthor ->
composeTestRule composeTestRule
.onNodeWithText("Headlines") .onNodeWithText(testAuthor.author.name)
.assertIsDisplayed()
.assertHasClickAction()
composeTestRule
.onNodeWithText("UI")
.assertIsDisplayed()
.assertHasClickAction()
composeTestRule
.onNodeWithText("Tools")
.assertIsDisplayed() .assertIsDisplayed()
.assertHasClickAction() .assertHasClickAction()
}
testTopics.forEach { testTopic ->
composeTestRule composeTestRule
.onNodeWithText("Android Dev") .onNodeWithText(testTopic.topic.name)
.assertIsDisplayed() .assertIsDisplayed()
.assertIsOff()
.assertHasClickAction() .assertHasClickAction()
}
// Scroll until the Done button is visible // Scroll until the Done button is visible
composeTestRule composeTestRule
@ -426,65 +251,8 @@ class ForYouScreenTest {
), ),
interestsSelectionState = interestsSelectionState =
ForYouInterestsSelectionUiState.WithInterestsSelection( ForYouInterestsSelectionUiState.WithInterestsSelection(
topics = listOf( topics = testTopics,
FollowableTopic( authors = testAuthors
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
),
),
), ),
feedState = ForYouFeedUiState.Loading, feedState = ForYouFeedUiState.Loading,
onAuthorCheckedChanged = { _, _ -> }, onAuthorCheckedChanged = { _, _ -> },
@ -547,155 +315,170 @@ class ForYouScreenTest {
.assertExists() .assertExists()
} }
// @Test @Test
// fun feed_whenNoInterestsSelectionAndLoaded_showsFeed() { fun feed_whenNoInterestsSelectionAndLoaded_showsFeed() {
// lateinit var windowSizeClass: WindowSizeClass lateinit var windowSizeClass: WindowSizeClass
//
// val saveableNewsResources = listOf( composeTestRule.setContent {
// SaveableNewsResource( BoxWithConstraints {
// newsResource = NewsResource( windowSizeClass = WindowSizeClass.calculateFromSize(
// id = "1", DpSize(maxWidth, maxHeight)
// episodeId = "52", )
// title = "Thanks for helping us reach 1M YouTube Subscribers",
// content = "Thank you everyone for following the Now in Android series " + ForYouScreen(
// "and everything the Android Developers YouTube channel has to offer. " + windowSizeClass = windowSizeClass,
// "During the Android Developer Summit, our YouTube channel reached 1 " + interestsSelectionState = ForYouInterestsSelectionUiState.NoInterestsSelection,
// "million subscribers! Here’s a small video to thank you all.", feedState = ForYouFeedUiState.Success(
// url = "https://youtu.be/-fJ6poHQrjM", feed = testNewsResources
// headerImageUrl = "https://i.ytimg.com/vi/-fJ6poHQrjM/maxresdefault.jpg", ),
// publishDate = Instant.parse("2021-11-09T00:00:00.000Z"), onAuthorCheckedChanged = { _, _ -> },
// type = Video, onTopicCheckedChanged = { _, _ -> },
// topics = listOf( saveFollowedTopics = {},
// Topic( onNewsResourcesCheckedChanged = { _, _ -> }
// id = "0", )
// name = "Headlines", }
// shortDescription = "", }
// longDescription = "",
// url = "", val firstFeedItem = composeTestRule
// imageUrl = "" .onNodeWithText(
// ) testNewsResources[0].newsResource.title,
// ), substring = true
// authors = emptyList() )
// ), .assertHasClickAction()
// isSaved = false .fetchSemanticsNode()
// ),
// SaveableNewsResource( val secondFeedItem = composeTestRule
// newsResource = NewsResource( .onNodeWithText(
// id = "2", testNewsResources[1].newsResource.title,
// episodeId = "52", substring = true
// title = "Transformations and customisations in the Paging Library", )
// content = "A demonstration of different operations that can be performed " + .assertHasClickAction()
// "with Paging. Transformations like inserting separators, when to " + .fetchSemanticsNode()
// "create a new pager, and customisation options for consuming " +
// "PagingData.", when (windowSizeClass.widthSizeClass) {
// url = "https://youtu.be/ZARz0pjm5YM", WindowWidthSizeClass.Compact, WindowWidthSizeClass.Medium -> {
// headerImageUrl = "https://i.ytimg.com/vi/ZARz0pjm5YM/maxresdefault.jpg", // On smaller screen widths, the second feed item should be below the first because
// publishDate = Instant.parse("2021-11-01T00:00:00.000Z"), // they are displayed in a single column
// type = Video, Assert.assertTrue(
// topics = listOf( firstFeedItem.positionInRoot.y < secondFeedItem.positionInRoot.y
// Topic( )
// id = "1", }
// name = "UI", else -> {
// shortDescription = "", // On larger screen widths, the second feed item should be inline with the first
// longDescription = "", // because they are displayed in more than one column
// url = "", Assert.assertTrue(
// imageUrl = "" firstFeedItem.positionInRoot.y == secondFeedItem.positionInRoot.y
// ), )
// ), }
// 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
// )
// }
// }
// }
} }
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
),
)

Write Preview
Loading…
Cancel
Save