Skip to content

Improve error messaging on missing configurations #102

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
lucianbc merged 1 commit into from
Oct 28, 2025
Merged

Improve error messaging on missing configurations #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion ...emory-footprint/src/main/java/com/google/wear/watchface/dfx/memory/ResourceConfigTable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,14 @@ internal class ResourceConfigTable(
// in this object's resourceNameToKeys, replace each reference to a user config key with the
// top level user config definition, which contains all allowed values
val resourceNameToTopLevelKeys = resourceNameToKeys.entries().asSequence()
.map { it.key!! to userConfigKeys[it.value.keyId]!! }
.map {
val configurationId = it.value.keyId!!
if (userConfigKeys.containsKey(configurationId)) {
it.key!! to userConfigKeys[configurationId]!!
} else {
throw TestFailedException("Configuration $configurationId is not declared in UserConfigurations.")
}
}
.toMultimap()

return ResourceConfigTable(resourceNameToTopLevelKeys)
Expand Down
18 changes: 18 additions & 0 deletions ...print/src/test/java/com/google/wear/watchface/dfx/memory/ResourceMemoryEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,24 @@ public void evaluateWatchFaceForLayout_failsOnMissingResource() throws Exception
}
}

@Test
public void evaluateWatchFaceForLayout_failsOnMissingConfigurationDeclaration()
throws Exception {
try (InputStream is =
getClass().getResourceAsStream("/MissingConfigurationDeclaration.xml")) {
Document document =
DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(is);

assertThrows(
TestFailedException.class,
() ->
evaluateWatchFaceForLayout(
Collections.emptyMap(),
document,
getTestEvaluationSettings()));
}
}

@Test
public void evaluateWatchFaceForLayout_greedyEvaluationCountsTTFs() throws Exception {
// arrange
Expand Down
24 changes: 24 additions & 0 deletions play-validations/memory-footprint/src/test/resources/MissingConfigurationDeclaration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<WatchFace width="450" height="450" clipShape="CIRCLE">
<UserConfigurations>
<ColorConfiguration id="themeColor">
<ColorOption id="0" colors="#ffffffff #ffffffff #ffffffff" />
<ColorOption id="1" colors="#ffe7e9ec #ffe7e9ec #ffe7e9ec" />
</ColorConfiguration>
</UserConfigurations>
<Scene backgroundColor="#ff000000">
<Group x="0" y="0" width="450" height="450" name="Image2_c630" alpha="255">
<ListConfiguration id="c26cc07d_8aa0_47ea_8fed_db9ff00e2192">
<ListOption id="0">
<PartImage x="0" y="0" width="450" height="450" name="Image2_c630">
<Image resource="wfs_b2_b9574894_f99b_46ed_8bac_e77c72c1543b"/>
</PartImage>
</ListOption>
<ListOption id="1">
<PartImage x="0" y="0" width="450" height="450" name="Image2_c630">
<Image resource="wfs_10_9e935b0e_0763_4121_a3d6_5a6e649c1947"/>
</PartImage>
</ListOption>
</ListConfiguration>
</Group>
</Scene>
</WatchFace>
Loading