Skip to content

Commit 6ece043

Browse files
committed
Use absolute references in body
These relative refs were likely introduced by analogy to itemset declarations
1 parent 5ae6894 commit 6ece043

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/test/java/org/javarosa/core/model/DynamicSelectUpdateTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ private static XFormsElement getSelectFromRepeatForm(String predicate) {
131131
t("select"))))),
132132
body(
133133
repeat("/data/repeat",
134-
input("value"),
135-
input("label")),
136-
input("filter"),
137-
select1Dynamic("/data/select", "../repeat" + (!predicate.isEmpty() ? "[" + predicate + "]" : ""))
134+
input("/data/repeat/value"),
135+
input("/data/repeat/label")),
136+
input("/data/filter"),
137+
select1Dynamic("/data/select", "/data/repeat" + (!predicate.isEmpty() ? "[" + predicate + "]" : ""))
138138
));
139139
}
140140
//endregion
@@ -274,7 +274,7 @@ public void selectInRepeat_withRefToRepeatChildInPredicate_evaluatesChoiceListFo
274274
item("bb", "BB")))),
275275
body(
276276
repeat("/data/repeat",
277-
input("filter"),
277+
input("/data/filter"),
278278
select1Dynamic("/data/repeat/select", "instance('choices')/root/item[starts-with(value,current()/../filter)]"))
279279
)));
280280

src/test/java/org/javarosa/core/model/SelectCachingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public void eqChoiceFilter_inRepeat_onlyEvaluatedOnce() throws Exception {
336336
item("b", "B"),
337337
item("bb", "BB")))),
338338
body(
339-
input("filter"),
339+
input("/data/filter"),
340340
repeat("/data/repeat",
341341
select1Dynamic("/data/repeat/select", "instance('choices')/root/item[value=/data/filter]"))
342342
)));
@@ -372,7 +372,7 @@ public void eqChoiceFiltersInRepeatsWithCurrentPathExpressionsAreOnlyEvaluatedOn
372372
item("b", "B")))),
373373
body(
374374
repeat("/data/outer",
375-
input("filter"),
375+
input("/data/filter"),
376376
repeat("/data/outer/inner",
377377
select1Dynamic("/data/outer/inner/select", "instance('choices')/root/item[value=current()/../../filter]"))
378378
))));

src/test/java/org/javarosa/core/model/SelectChoiceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public void getChild_updates_whenChoicesAreFromRepeat() throws IOException, XFor
132132
input("value"),
133133
input("label"),
134134
input("special-property")),
135-
input("filter"),
136-
select1Dynamic("/data/select", "../repeat")
135+
input("/data/filter"),
136+
select1Dynamic("/data/select", "/data/repeat")
137137
)));
138138
scenario.answer("/data/repeat[0]/value", "a");
139139
scenario.answer("/data/repeat[0]/label", "A");
@@ -201,8 +201,8 @@ public void getChildren_updates_whenChoicesAreFromRepeat() throws IOException, X
201201
input("value"),
202202
input("label"),
203203
input("special-property")),
204-
input("filter"),
205-
select1Dynamic("/data/select", "../repeat")
204+
input("/data/filter"),
205+
select1Dynamic("/data/select", "/data/repeat")
206206
)));
207207
scenario.answer("/data/repeat[0]/value", "a");
208208
scenario.answer("/data/repeat[0]/label", "A");

0 commit comments

Comments
 (0)