Make end-to-end tests LOI task resilient. (#2589)

google · Aug 2, 2024 · 82e8378 · 82e8378
1 parent fd197fc
commit 82e8378
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt b/e2eTest/src/main/java/com/google/android/ground/e2etest/SurveyRunnerTest.kt
@@ -35,6 +35,7 @@ import com.google.android.ground.e2etest.TestConfig.GROUND_PACKAGE
 import com.google.android.ground.e2etest.TestConfig.LONG_TIMEOUT
 import com.google.android.ground.e2etest.TestConfig.SHORT_TIMEOUT
 import com.google.android.ground.e2etest.TestConfig.TEST_SURVEY_IDENTIFIER
+import com.google.android.ground.e2etest.TestConfig.TEST_SURVEY_LOI_TASK_INDEX
 import com.google.android.ground.e2etest.TestConfig.TEST_SURVEY_TASKS_ADHOC
 import com.google.android.ground.model.task.Task
 import java.io.IOException
@@ -61,7 +62,7 @@ class SurveyRunnerTest : AutomatorRunner {
     fillOutTaskData(isAdHoc = true, TEST_SURVEY_TASKS_ADHOC)
     clickSubmissionConfirmationDone()
     startPredefinedLoiTask()
-    fillOutTaskData(isAdHoc = false, TEST_SURVEY_TASKS_ADHOC.drop(1))
+    fillOutTaskData(isAdHoc = false, TEST_SURVEY_TASKS_ADHOC)
     clickSubmissionConfirmationDone()
   }
 
@@ -154,6 +155,9 @@ class SurveyRunnerTest : AutomatorRunner {
   private fun fillOutTaskData(isAdHoc: Boolean, taskList: List<Task.Type>) {
     taskList.forEachIndexed { i, it ->
       device.waitForIdle()
+      if (!isAdHoc && i == TEST_SURVEY_LOI_TASK_INDEX) {
+        return@forEachIndexed
+      }
       when (it) {
         Task.Type.DROP_PIN -> completeDropPinTask()
         Task.Type.DRAW_AREA -> completeDrawArea()
@@ -168,7 +172,7 @@ class SurveyRunnerTest : AutomatorRunner {
       }
       if (i < taskList.size - 1) {
         clickNext()
-        if (isAdHoc && i == 0) {
+        if (isAdHoc && i == TEST_SURVEY_LOI_TASK_INDEX) {
           setLoiName()
         }
       } else {

diff --git a/e2eTest/src/main/java/com/google/android/ground/e2etest/TestConfig.kt b/e2eTest/src/main/java/com/google/android/ground/e2etest/TestConfig.kt
@@ -23,6 +23,7 @@ object TestConfig {
   const val GROUND_PACKAGE = "com.google.android.ground"
   val TEST_SURVEY_TASKS_ADHOC =
     listOf(
+      Task.Type.CAPTURE_LOCATION,
       Task.Type.DROP_PIN,
       Task.Type.TEXT,
       Task.Type.MULTIPLE_CHOICE,
@@ -33,5 +34,6 @@ object TestConfig {
       Task.Type.PHOTO,
       Task.Type.CAPTURE_LOCATION,
     )
+  val TEST_SURVEY_LOI_TASK_INDEX = 1
   const val TEST_SURVEY_IDENTIFIER = "test"
 }