Skip to content

Add experimental opt-in for entities spec v2025.1 #6930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seadowg merged 5 commits into from
Oct 17, 2025
Merged

Add experimental opt-in for entities spec v2025.1 #6930

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2924e57
Convert EntityXFormParserFactory to kotlin
grzesiek2010 Oct 12, 2025
1d4122b
Add experimental opt-in for entities spec v2025.1
grzesiek2010 Oct 12, 2025
a21def1
Fix existing tests
grzesiek2010 Oct 14, 2025
3fd8aae
Add new tests
grzesiek2010 Oct 14, 2025
01f5dc5
Use getExperimentalOptIn to determine if the spec is enabled
grzesiek2010 Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add new tests
  • Loading branch information
@grzesiek2010
grzesiek2010 committed Oct 14, 2025
commit 3fd8aaed9dc27b87ce1a83ee4ccf607339c16491
68 changes: 68 additions & 0 deletions entities/src/test/java/org/odk/collect/entities/javarosa/EntityFormParseProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,72 @@ public void saveTosWithIncorrectNamespaceAreIgnored() throws XFormParser.ParseEx
FormDef formDef = parser.parse(null);
assertThat(formDef.getExtras().get(EntityFormExtra.class).getSaveTos(), is(empty()));
}

@Test
public void whenVersionIs2025_1_andFeatureIsEnabled_parsesCorrectly() throws XFormParser.ParseException {
String updateVersion = "2025.1.0";

XFormsElement form = XFormsElement.html(
asList(
new Pair<>("entities", "http://www.opendatakit.org/xforms/entities")
),
head(
title("Create entity form"),
model(asList(new Pair<>("entities:entities-version", updateVersion)),
mainInstance(
t("data id=\"update-entity-form\"",
t("name"),
t("meta",
t("entity dataset=\"people\" update=\"1\" id=\"17\"")
)
)
),
bind("/data/name").type("string").withAttribute("entities", "saveto", "name")
)
),
body(
input("/data/name")
)
);

EntityFormParseProcessor processor = new EntityFormParseProcessor(() -> true);
XFormParser parser = new XFormParser(new InputStreamReader(new ByteArrayInputStream(form.asXml().getBytes())));
parser.addProcessor(processor);

FormDef formDef = parser.parse(null);
assertThat(formDef, notNullValue());
}

@Test(expected = UnrecognizedEntityVersionException.class)
public void whenVersionIs2025_1_andFeatureIsDisabled_throwsException() throws XFormParser.ParseException {
String updateVersion = "2025.1.0";

XFormsElement form = XFormsElement.html(
asList(
new Pair<>("entities", "http://www.opendatakit.org/xforms/entities")
),
head(
title("Create entity form"),
model(asList(new Pair<>("entities:entities-version", updateVersion)),
mainInstance(
t("data id=\"update-entity-form\"",
t("name"),
t("meta",
t("entity dataset=\"people\" update=\"1\" id=\"17\"")
)
)
),
bind("/data/name").type("string").withAttribute("entities", "saveto", "name")
)
),
body(
input("/data/name")
)
);

EntityFormParseProcessor processor = new EntityFormParseProcessor(() -> false);
XFormParser parser = new XFormParser(new InputStreamReader(new ByteArrayInputStream(form.asXml().getBytes())));
parser.addProcessor(processor);
parser.parse(null);
}
}