Use absolute references in body

These relative refs were likely introduced by analogy to itemset declarations
getodk · Apr 16, 2024 · 6ece043 · 6ece043
1 parent 5ae6894
commit 6ece043
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/test/java/org/javarosa/core/model/DynamicSelectUpdateTest.java b/src/test/java/org/javarosa/core/model/DynamicSelectUpdateTest.java
@@ -131,10 +131,10 @@ private static XFormsElement getSelectFromRepeatForm(String predicate) {
                             t("select"))))),
             body(
                 repeat("/data/repeat",
-                    input("value"),
-                    input("label")),
-                input("filter"),
-                select1Dynamic("/data/select", "../repeat" + (!predicate.isEmpty() ? "[" + predicate + "]" : ""))
+                    input("/data/repeat/value"),
+                    input("/data/repeat/label")),
+                input("/data/filter"),
+                select1Dynamic("/data/select", "/data/repeat" + (!predicate.isEmpty() ? "[" + predicate + "]" : ""))
             ));
     }
     //endregion
@@ -274,7 +274,7 @@ public void selectInRepeat_withRefToRepeatChildInPredicate_evaluatesChoiceListFo
                         item("bb", "BB")))),
             body(
                 repeat("/data/repeat",
-                    input("filter"),
+                    input("/data/filter"),
                     select1Dynamic("/data/repeat/select", "instance('choices')/root/item[starts-with(value,current()/../filter)]"))
             )));
 

diff --git a/src/test/java/org/javarosa/core/model/SelectCachingTest.java b/src/test/java/org/javarosa/core/model/SelectCachingTest.java
@@ -336,7 +336,7 @@ public void eqChoiceFilter_inRepeat_onlyEvaluatedOnce() throws Exception {
                         item("b", "B"),
                         item("bb", "BB")))),
             body(
-                input("filter"),
+                input("/data/filter"),
                 repeat("/data/repeat",
                     select1Dynamic("/data/repeat/select", "instance('choices')/root/item[value=/data/filter]"))
             )));
@@ -372,7 +372,7 @@ public void eqChoiceFiltersInRepeatsWithCurrentPathExpressionsAreOnlyEvaluatedOn
                         item("b", "B")))),
             body(
                 repeat("/data/outer",
-                    input("filter"),
+                    input("/data/filter"),
                     repeat("/data/outer/inner",
                         select1Dynamic("/data/outer/inner/select", "instance('choices')/root/item[value=current()/../../filter]"))
                 ))));

diff --git a/src/test/java/org/javarosa/core/model/SelectChoiceTest.java b/src/test/java/org/javarosa/core/model/SelectChoiceTest.java
@@ -132,8 +132,8 @@ public void getChild_updates_whenChoicesAreFromRepeat() throws IOException, XFor
                     input("value"),
                     input("label"),
                     input("special-property")),
-                input("filter"),
-                select1Dynamic("/data/select", "../repeat")
+                input("/data/filter"),
+                select1Dynamic("/data/select", "/data/repeat")
             )));
         scenario.answer("/data/repeat[0]/value", "a");
         scenario.answer("/data/repeat[0]/label", "A");
@@ -201,8 +201,8 @@ public void getChildren_updates_whenChoicesAreFromRepeat() throws IOException, X
                     input("value"),
                     input("label"),
                     input("special-property")),
-                input("filter"),
-                select1Dynamic("/data/select", "../repeat")
+                input("/data/filter"),
+                select1Dynamic("/data/select", "/data/repeat")
             )));
         scenario.answer("/data/repeat[0]/value", "a");
         scenario.answer("/data/repeat[0]/label", "A");