Improved testing displayed paths in the hierarchy view

getodk · Apr 22, 2024 · f670f10 · f670f10
1 parent 997ef98
commit f670f10
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/...app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java b/...app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormHierarchyTest.java
@@ -197,7 +197,7 @@ public void regularGroupThatWrapsARepeatableGroupShouldBeTreatedAsARegularOne()
                 .clickGoToArrow()
                 .clickGoUpIcon()
                 .clickGoUpIcon()
-                .assertText("Outer")
+                .assertPath("Outer")
                 .assertNotRemovableGroup();
     }
 }
diff --git a/...ect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormStylingTest.kt b/...ect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/FormStylingTest.kt
@@ -223,7 +223,7 @@ class FormStylingTest {
             .startBlankForm(FORM_NAME)
             .clickGoToArrow()
             .clickOnGroup("selectOneQuestions")
-            .assertText("selectOneQuestions")
+            .assertPath("selectOneQuestions")
             .clickOnQuestion("Select one widget")
             .assertText("selectOneQuestions")
     }

diff --git a/...androidTest/java/org/odk/collect/android/regression/FillBlankFormWithRepeatGroupTest.java b/...androidTest/java/org/odk/collect/android/regression/FillBlankFormWithRepeatGroupTest.java
@@ -62,7 +62,7 @@ public void dynamicGroupLabel_should_beCalculatedProperly() {
                 .swipeToNextQuestion("Photo")
                 .assertText("gr1 > 1 > Person: 25")
                 .clickGoToArrow()
-                .assertText("gr1 > 1 > Person: 25")
+                .assertPath("gr1 > 1 > Person: 25")
                 .clickOnQuestion("Photo")
                 .swipeToNextQuestionWithRepeatGroup("gr1")
                 .clickOnDoNotAdd(new FormEntryPage("Repeat titles 1648"))
@@ -71,7 +71,7 @@ public void dynamicGroupLabel_should_beCalculatedProperly() {
                 .swipeToNextQuestion("Date")
                 .assertText("Part1 > 1 > Xxx: SecondPart")
                 .clickGoToArrow()
-                .assertText("Part1 > 1 > Xxx: SecondPart")
+                .assertPath("Part1 > 1 > Xxx: SecondPart")
                 .clickOnQuestion("Date")
                 .swipeToNextQuestion("Multi Select")
                 .swipeToNextQuestionWithRepeatGroup("Part1")
@@ -254,7 +254,7 @@ public void when_navigateOnHierarchyView_should_breadcrumbPathBeVisible() {
                 .swipeToNextQuestion("Age")
                 .inputText("3")
                 .clickGoToArrow()
-                .assertText("People > 3 > Person: C")
+                .assertPath("People > 3 > Person: C")
                 .clickGoUpIcon()
                 .assertText("3.\u200E Person: C")
                 .clickJumpEndButton()

diff --git a/...ect_app/src/androidTest/java/org/odk/collect/android/support/pages/FormHierarchyPage.java b/...ect_app/src/androidTest/java/org/odk/collect/android/support/pages/FormHierarchyPage.java
@@ -88,6 +88,11 @@ public FormHierarchyPage assertHierarchyItem(int position, String primaryText, S
         return this;
     }
 
+    public FormHierarchyPage assertPath(String text) {
+        onView(withId(R.id.pathtext)).check(matches(withText(text)));
+        return this;
+    }
+
     public FormEntryPage clickOnQuestion(String questionLabel) {
         return clickOnQuestion(questionLabel, false);
     }