Revert "add robot for topic feature ui tests"

This reverts commit 9dde120cc5.

feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicRobot.kt

@@ -1,70 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       https://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
-
-package com.google.samples.apps.nowinandroid.feature.topic
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.hasScrollToNodeAction
-import androidx.compose.ui.test.hasText
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.onFirst
-import androidx.compose.ui.test.onNodeWithContentDescription
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performScrollToNode
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
-import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
-
-internal class TopicRobot(
-    private val composeTestRule: AndroidComposeTestRule<ActivityScenarioRule<ComponentActivity>, ComponentActivity>
-) {
-    private val topicLoading = composeTestRule.activity.resources.getString(R.string.topic_loading)
-
-    fun setContent(topicUiState: TopicUiState, newsUiState: NewsUiState) {
-        composeTestRule.setContent {
-            TopicScreen(
-                topicUiState = topicUiState,
-                newsUiState = newsUiState,
-                onBackClick = { },
-                onFollowClick = { },
-                onBookmarkChanged = { _, _ -> },
-            )
-        }
-    }
-
-    fun loadingIndicatorExists() {
-        composeTestRule
-            .onNodeWithContentDescription(topicLoading)
-            .assertExists()
-    }
-
-    fun topicExists(topic: FollowableTopic) {
-        composeTestRule
-            .onNodeWithText(topic.topic.name)
-            .assertExists()
-
-        composeTestRule
-            .onNodeWithText(topic.topic.longDescription)
-            .assertExists()
-    }
-
-    fun scrollToNewsResource(newsResource: NewsResource) {
-        composeTestRule
-            .onAllNodes(hasScrollToNodeAction())
-            .onFirst()
-            .performScrollToNode(hasText(newsResource.title))
-    }
-}

feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt

@@ -17,15 +17,20 @@
 package com.google.samples.apps.nowinandroid.feature.topic
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.hasScrollToNodeAction
+import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.compose.ui.test.onFirst
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performScrollToNode
 import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource
 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.Topic
 import kotlinx.datetime.Instant
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
@@ -39,77 +44,107 @@ class TopicScreenTest {
     @get:Rule
     val composeTestRule = createAndroidComposeRule<ComponentActivity>()
 
+    private lateinit var topicLoading: String
+
+    @Before
+    fun setup() {
+        composeTestRule.activity.apply {
+            topicLoading = getString(R.string.topic_loading)
+        }
+    }
+
     @Test
     fun niaLoadingWheel_whenScreenIsLoading_showLoading() {
-        launchTopicRobot(
+        composeTestRule.setContent {
-            composeTestRule,
+            TopicScreen(
-            TopicUiState.Loading,
+                topicUiState = TopicUiState.Loading,
-            NewsUiState.Loading
+                newsUiState = NewsUiState.Loading,
-        ) {
+                onBackClick = { },
-            loadingIndicatorExists()
+                onFollowClick = { },
+                onBookmarkChanged = { _, _ -> },
+            )
         }
+
+        composeTestRule
+            .onNodeWithContentDescription(topicLoading)
+            .assertExists()
     }
 
     @Test
     fun topicTitle_whenTopicIsSuccess_isShown() {
         val testTopic = testTopics.first()
-
+        composeTestRule.setContent {
-        launchTopicRobot(
+            TopicScreen(
-            composeTestRule,
+                topicUiState = TopicUiState.Success(testTopic),
-            TopicUiState.Success(testTopic),
+                newsUiState = NewsUiState.Loading,
-            NewsUiState.Loading
+                onBackClick = { },
-        ) {
+                onFollowClick = { },
-            topicExists(testTopic)
+                onBookmarkChanged = { _, _ -> },
+            )
         }
+
+        // Name is shown
+        composeTestRule
+            .onNodeWithText(testTopic.topic.name)
+            .assertExists()
+
+        // Description is shown
+        composeTestRule
+            .onNodeWithText(testTopic.topic.longDescription)
+            .assertExists()
     }
 
     @Test
     fun news_whenTopicIsLoading_isNotShown() {
-        launchTopicRobot(
+        composeTestRule.setContent {
-            composeTestRule,
+            TopicScreen(
-            TopicUiState.Loading,
+                topicUiState = TopicUiState.Loading,
-            NewsUiState.Success(
+                newsUiState = NewsUiState.Success(
-                sampleNewsResources.mapIndexed { index, newsResource ->
+                    sampleNewsResources.mapIndexed { index, newsResource ->
-                    SaveableNewsResource(
+                        SaveableNewsResource(
-                        newsResource = newsResource,
+                            newsResource = newsResource,
-                        isSaved = index % 2 == 0,
+                            isSaved = index % 2 == 0,
-                    )
+                        )
-                }
+                    }
+                ),
+                onBackClick = { },
+                onFollowClick = { },
+                onBookmarkChanged = { _, _ -> },
             )
-        ) {
-            loadingIndicatorExists()
         }
+
+        // Loading indicator shown
+        composeTestRule
+            .onNodeWithContentDescription(topicLoading)
+            .assertExists()
     }
 
     @Test
     fun news_whenSuccessAndTopicIsSuccess_isShown() {
         val testTopic = testTopics.first()
-        launchTopicRobot(
+        composeTestRule.setContent {
-            composeTestRule,
+            TopicScreen(
-            TopicUiState.Success(testTopic),
+                topicUiState = TopicUiState.Success(testTopic),
-            NewsUiState.Success(
+                newsUiState = NewsUiState.Success(
-                sampleNewsResources.mapIndexed { index, newsResource ->
+                    sampleNewsResources.mapIndexed { index, newsResource ->
-                    SaveableNewsResource(
+                        SaveableNewsResource(
-                        newsResource = newsResource,
+                            newsResource = newsResource,
-                        isSaved = index % 2 == 0,
+                            isSaved = index % 2 == 0,
-                    )
+                        )
-                }
+                    }
+                ),
+                onBackClick = { },
+                onFollowClick = { },
+                onBookmarkChanged = { _, _ -> },
             )
-        ) {
-            // Scroll to first news title if available
-            scrollToNewsResource(sampleNewsResources.first())
         }
-    }
-}
 
-private fun launchTopicRobot(
+        // Scroll to first news title if available
-    composeTestRule: AndroidComposeTestRule<ActivityScenarioRule<ComponentActivity>, ComponentActivity>,
+        composeTestRule
-    topicUiState: TopicUiState,
+            .onAllNodes(hasScrollToNodeAction())
-    newsUiState: NewsUiState,
+            .onFirst()
-    func: TopicRobot.() -> Unit
+            .performScrollToNode(hasText(sampleNewsResources.first().title))
-) = TopicRobot(composeTestRule).apply {
+    }
-    setContent(topicUiState, newsUiState)
-    func()
 }
 
 private const val TOPIC_1_NAME = "Headlines"