From 015a677c634fbfa619744601f79d64c04c0f39a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= <ln@getodk.org>
Date: Tue, 16 Apr 2024 10:18:48 -0700
Subject: [PATCH] Use absolute references in body

These relative refs were likely introduced by analogy to itemset declarations
---
 .../javarosa/core/model/DynamicSelectUpdateTest.java   | 10 +++++-----
 .../org/javarosa/core/model/SelectCachingTest.java     |  4 ++--
 .../java/org/javarosa/core/model/SelectChoiceTest.java |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/javarosa/core/model/DynamicSelectUpdateTest.java b/src/test/java/org/javarosa/core/model/DynamicSelectUpdateTest.java
index 50d90050d..8aae62703 100644
--- 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
index f5f78c365..264abff8e 100644
--- 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
index a446ddc71..a79b7e982 100644
--- a/src/test/java/org/javarosa/core/model/SelectChoiceTest.java
+++ b/src/test/java/org/javarosa/core/model/SelectChoiceTest.java
@@ -132,7 +132,7 @@ public void getChild_updates_whenChoicesAreFromRepeat() throws IOException, XFor
                     input("value"),
                     input("label"),
                     input("special-property")),
-                input("filter"),
+                input("/data/filter"),
                 select1Dynamic("/data/select", "../repeat")
             )));
         scenario.answer("/data/repeat[0]/value", "a");
@@ -201,7 +201,7 @@ public void getChildren_updates_whenChoicesAreFromRepeat() throws IOException, X
                     input("value"),
                     input("label"),
                     input("special-property")),
-                input("filter"),
+                input("/data/filter"),
                 select1Dynamic("/data/select", "../repeat")
             )));
         scenario.answer("/data/repeat[0]/value", "a");