Update DataCollectionFragmentTest

google · Dec 20, 2024 · 86213bf · 86213bf
1 parent b898bcb
commit 86213bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...d/src/test/java/com/google/android/ground/ui/datacollection/DataCollectionFragmentTest.kt b/...d/src/test/java/com/google/android/ground/ui/datacollection/DataCollectionFragmentTest.kt
@@ -127,7 +127,7 @@ class DataCollectionFragmentTest : BaseHiltTest() {
     runner()
       .inputText(TASK_1_RESPONSE)
       .clickNextButton()
-      .selectMultipleChoiceOption(TASK_2_OPTION_LABEL)
+      .validateMultipleChoiceOptionIsDisplayed(TASK_2_OPTION_LABEL)
       .clickPreviousButton()
 
     assertDraftSaved(listOf(TASK_1_VALUE_DELTA, TASK_2_VALUE_DELTA), currentTaskId = TASK_ID_1)
@@ -169,7 +169,7 @@ class DataCollectionFragmentTest : BaseHiltTest() {
     runner()
       .validateTextIsDisplayed(TASK_1_RESPONSE)
       .clickNextButton()
-      .validateTextIsDisplayed(TASK_2_OPTION_LABEL)
+      .validateMultipleChoiceOptionIsDisplayed(TASK_2_OPTION_LABEL)
   }
 
   @Test

diff --git a/ground/src/test/java/com/google/android/ground/ui/datacollection/TaskFragmentRunner.kt b/ground/src/test/java/com/google/android/ground/ui/datacollection/TaskFragmentRunner.kt
@@ -27,7 +27,6 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.typeText
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
@@ -77,7 +76,12 @@ class TaskFragmentRunner(
   }
 
   internal fun selectMultipleChoiceOption(optionText: String): TaskFragmentRunner {
-    onView(withText(optionText)).perform(click())
+    baseHiltTest.composeTestRule.onNodeWithText(optionText).performClick()
+    return this
+  }
+
+  internal fun validateMultipleChoiceOptionIsDisplayed(text: String): TaskFragmentRunner {
+    baseHiltTest.composeTestRule.onNodeWithText(text).performClick()
     return this
   }