From 5bb27b6e51dcff50fb37b4291080c1e8983c9337 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Fri, 26 Apr 2024 17:39:45 +0900 Subject: [PATCH] Remove unused BoxWithConstraints. Change-Id: I9c90a7c238dc9964c95f7d917cb25d4a40135f83 --- .../feature/foryou/ForYouScreenTest.kt | 183 ++++++++---------- 1 file changed, 85 insertions(+), 98 deletions(-) diff --git a/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt index 5477493ef9..02fdf91d4a 100644 --- a/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt +++ b/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt @@ -17,7 +17,6 @@ package com.google.samples.apps.nowinandroid.feature.foryou import androidx.activity.ComponentActivity -import androidx.compose.foundation.layout.BoxWithConstraints import androidx.compose.ui.test.assertHasClickAction import androidx.compose.ui.test.assertIsEnabled import androidx.compose.ui.test.assertIsNotEnabled @@ -52,20 +51,18 @@ class ForYouScreenTest { @Test fun circularProgressIndicator_whenScreenIsLoading_exists() { composeTestRule.setContent { - BoxWithConstraints { - ForYouScreen( - isSyncing = false, - onboardingUiState = OnboardingUiState.Loading, - feedState = NewsFeedUiState.Loading, - deepLinkedUserNewsResource = null, - onTopicCheckedChanged = { _, _ -> }, - onTopicClick = {}, - saveFollowedTopics = {}, - onNewsResourcesCheckedChanged = { _, _ -> }, - onNewsResourceViewed = {}, - onDeepLinkOpened = {}, - ) - } + ForYouScreen( + isSyncing = false, + onboardingUiState = OnboardingUiState.Loading, + feedState = NewsFeedUiState.Loading, + deepLinkedUserNewsResource = null, + onTopicCheckedChanged = { _, _ -> }, + onTopicClick = {}, + saveFollowedTopics = {}, + onNewsResourcesCheckedChanged = { _, _ -> }, + onNewsResourceViewed = {}, + onDeepLinkOpened = {}, + ) } composeTestRule @@ -78,20 +75,18 @@ class ForYouScreenTest { @Test fun circularProgressIndicator_whenScreenIsSyncing_exists() { composeTestRule.setContent { - BoxWithConstraints { - ForYouScreen( - isSyncing = true, - onboardingUiState = OnboardingUiState.NotShown, - feedState = NewsFeedUiState.Success(emptyList()), - deepLinkedUserNewsResource = null, - onTopicCheckedChanged = { _, _ -> }, - onTopicClick = {}, - saveFollowedTopics = {}, - onNewsResourcesCheckedChanged = { _, _ -> }, - onNewsResourceViewed = {}, - onDeepLinkOpened = {}, - ) - } + ForYouScreen( + isSyncing = true, + onboardingUiState = OnboardingUiState.NotShown, + feedState = NewsFeedUiState.Success(emptyList()), + deepLinkedUserNewsResource = null, + onTopicCheckedChanged = { _, _ -> }, + onTopicClick = {}, + saveFollowedTopics = {}, + onNewsResourcesCheckedChanged = { _, _ -> }, + onNewsResourceViewed = {}, + onDeepLinkOpened = {}, + ) } composeTestRule @@ -106,24 +101,22 @@ class ForYouScreenTest { val testData = followableTopicTestData.map { it.copy(isFollowed = false) } composeTestRule.setContent { - BoxWithConstraints { - ForYouScreen( - isSyncing = false, - onboardingUiState = OnboardingUiState.Shown( - topics = testData, - ), - feedState = NewsFeedUiState.Success( - feed = emptyList(), - ), - deepLinkedUserNewsResource = null, - onTopicCheckedChanged = { _, _ -> }, - onTopicClick = {}, - saveFollowedTopics = {}, - onNewsResourcesCheckedChanged = { _, _ -> }, - onNewsResourceViewed = {}, - onDeepLinkOpened = {}, - ) - } + ForYouScreen( + isSyncing = false, + onboardingUiState = OnboardingUiState.Shown( + topics = testData, + ), + feedState = NewsFeedUiState.Success( + feed = emptyList(), + ), + deepLinkedUserNewsResource = null, + onTopicCheckedChanged = { _, _ -> }, + onTopicClick = {}, + saveFollowedTopics = {}, + onNewsResourcesCheckedChanged = { _, _ -> }, + onNewsResourceViewed = {}, + onDeepLinkOpened = {}, + ) } testData.forEach { testTopic -> @@ -149,28 +142,26 @@ class ForYouScreenTest { @Test fun topicSelector_whenSomeTopicsSelected_showsTopicChipsAndEnabledDoneButton() { composeTestRule.setContent { - BoxWithConstraints { - ForYouScreen( - isSyncing = false, - onboardingUiState = - OnboardingUiState.Shown( - // Follow one topic - topics = followableTopicTestData.mapIndexed { index, testTopic -> - testTopic.copy(isFollowed = index == 1) - }, - ), - feedState = NewsFeedUiState.Success( - feed = emptyList(), - ), - deepLinkedUserNewsResource = null, - onTopicCheckedChanged = { _, _ -> }, - onTopicClick = {}, - saveFollowedTopics = {}, - onNewsResourcesCheckedChanged = { _, _ -> }, - onNewsResourceViewed = {}, - onDeepLinkOpened = {}, - ) - } + ForYouScreen( + isSyncing = false, + onboardingUiState = + OnboardingUiState.Shown( + // Follow one topic + topics = followableTopicTestData.mapIndexed { index, testTopic -> + testTopic.copy(isFollowed = index == 1) + }, + ), + feedState = NewsFeedUiState.Success( + feed = emptyList(), + ), + deepLinkedUserNewsResource = null, + onTopicCheckedChanged = { _, _ -> }, + onTopicClick = {}, + saveFollowedTopics = {}, + onNewsResourcesCheckedChanged = { _, _ -> }, + onNewsResourceViewed = {}, + onDeepLinkOpened = {}, + ) } followableTopicTestData.forEach { testTopic -> @@ -196,21 +187,19 @@ class ForYouScreenTest { @Test fun feed_whenInterestsSelectedAndLoading_showsLoadingIndicator() { composeTestRule.setContent { - BoxWithConstraints { - ForYouScreen( - isSyncing = false, - onboardingUiState = - OnboardingUiState.Shown(topics = followableTopicTestData), - feedState = NewsFeedUiState.Loading, - deepLinkedUserNewsResource = null, - onTopicCheckedChanged = { _, _ -> }, - onTopicClick = {}, - saveFollowedTopics = {}, - onNewsResourcesCheckedChanged = { _, _ -> }, - onNewsResourceViewed = {}, - onDeepLinkOpened = {}, - ) - } + ForYouScreen( + isSyncing = false, + onboardingUiState = + OnboardingUiState.Shown(topics = followableTopicTestData), + feedState = NewsFeedUiState.Loading, + deepLinkedUserNewsResource = null, + onTopicCheckedChanged = { _, _ -> }, + onTopicClick = {}, + saveFollowedTopics = {}, + onNewsResourcesCheckedChanged = { _, _ -> }, + onNewsResourceViewed = {}, + onDeepLinkOpened = {}, + ) } composeTestRule @@ -223,20 +212,18 @@ class ForYouScreenTest { @Test fun feed_whenNoInterestsSelectionAndLoading_showsLoadingIndicator() { composeTestRule.setContent { - BoxWithConstraints { - ForYouScreen( - isSyncing = false, - onboardingUiState = OnboardingUiState.NotShown, - feedState = NewsFeedUiState.Loading, - deepLinkedUserNewsResource = null, - onTopicCheckedChanged = { _, _ -> }, - onTopicClick = {}, - saveFollowedTopics = {}, - onNewsResourcesCheckedChanged = { _, _ -> }, - onNewsResourceViewed = {}, - onDeepLinkOpened = {}, - ) - } + ForYouScreen( + isSyncing = false, + onboardingUiState = OnboardingUiState.NotShown, + feedState = NewsFeedUiState.Loading, + deepLinkedUserNewsResource = null, + onTopicCheckedChanged = { _, _ -> }, + onTopicClick = {}, + saveFollowedTopics = {}, + onNewsResourcesCheckedChanged = { _, _ -> }, + onNewsResourceViewed = {}, + onDeepLinkOpened = {}, + ) } composeTestRule