mirror of
https://git.libcamera.org/libcamera/libcamera.git
synced 2025-07-12 23:09:45 +03:00
libcamera: yaml-parser: Differentiate between empty and empty string
When accessing a nonexistent key on a dict the YamlObject returns an empty element. This element can happily be cast to a string which is unexpected. For example the following statement: yamlDict["nonexistent"].get<string>("default") is expected to return "default" but actually returns "". Fix this by introducing an empty type to distinguish between an empty YamlObject and a YamlObject of type value containing an empty string. For completeness add an isEmpty() function and an explicit cast to bool to be able to test for that type. Extend the tests accordingly. Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
parent
f623f3ed64
commit
6b67094cd2
4 changed files with 49 additions and 7 deletions
|
@ -73,7 +73,7 @@ internal_tests = [
|
|||
{'name': 'timer-thread', 'sources': ['timer-thread.cpp']},
|
||||
{'name': 'unique-fd', 'sources': ['unique-fd.cpp']},
|
||||
{'name': 'utils', 'sources': ['utils.cpp']},
|
||||
{'name': 'yaml-parser', 'sources': ['yaml-parser.cpp'], 'should_fail': true},
|
||||
{'name': 'yaml-parser', 'sources': ['yaml-parser.cpp']},
|
||||
]
|
||||
|
||||
internal_non_parallel_tests = [
|
||||
|
|
|
@ -542,6 +542,24 @@ protected:
|
|||
return TestFail;
|
||||
}
|
||||
|
||||
/* Test nonexistent object has value type empty. */
|
||||
if (!dictObj["nonexistent"].isEmpty()) {
|
||||
cerr << "Accessing nonexistent object returns non-empty object" << std::endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
/* Test explicit cast to bool on an empty object returns true. */
|
||||
if (!!dictObj["empty"] != true) {
|
||||
cerr << "Casting empty entry to bool returns false" << std::endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
/* Test explicit cast to bool on nonexistent object returns false. */
|
||||
if (!!dictObj["nonexistent"] != false) {
|
||||
cerr << "Casting nonexistent dict entry to bool returns true" << std::endl;
|
||||
return TestFail;
|
||||
}
|
||||
|
||||
/* Make sure utils::map_keys() works on the adapter. */
|
||||
(void)utils::map_keys(dictObj.asDict());
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue