chore(core): ldml update keyboard -> keyboard3 🙀

For: #9604

- yes, C++ changes also
This commit is contained in:
Steven R. Loomis 2023-09-20 18:55:49 -05:00
parent 0a8eec113c
commit 9add2cb99c

View file

@ -698,15 +698,15 @@ int LdmlJsonTestSourceFactory::load(const km::kbp::path &compiled, const km::kbp
return __LINE__;
}
auto conformsTo = data["/keyboardTest/conformsTo"_json_pointer].get<std::string>();
auto conformsTo = data["/keyboardTest3/conformsTo"_json_pointer].get<std::string>();
assert_or_return(std::string(LDML_CLDR_VERSION_LATEST) == conformsTo);
auto info_keyboard = data["/keyboardTest/info/keyboard"_json_pointer].get<std::string>();
auto info_author = data["/keyboardTest/info/author"_json_pointer].get<std::string>();
auto info_name = data["/keyboardTest/info/name"_json_pointer].get<std::string>();
auto info_keyboard = data["/keyboardTest3/info/keyboard"_json_pointer].get<std::string>();
auto info_author = data["/keyboardTest3/info/author"_json_pointer].get<std::string>();
auto info_name = data["/keyboardTest3/info/name"_json_pointer].get<std::string>();
// TODO-LDML: store these elsewhere?
std::cout << "JSON: reading " << info_name << " test of " << info_keyboard << " by " << info_author << std::endl;
auto all_tests = data["/keyboardTest/tests"_json_pointer];
auto all_tests = data["/keyboardTest3/tests"_json_pointer];
assert_or_return((!all_tests.empty()) && (all_tests.size() > 0)); // TODO-LDML: can be empty if repertoire only?
for(auto tests : all_tests) {
@ -724,7 +724,7 @@ int LdmlJsonTestSourceFactory::load(const km::kbp::path &compiled, const km::kbp
}
#if defined(HAVE_ICU4C)
auto rep_tests = data["/keyboardTest/repertoire"_json_pointer];
auto rep_tests = data["/keyboardTest3/repertoire"_json_pointer];
assert_or_return((!rep_tests.empty()) && (rep_tests.size() > 0)); // TODO-LDML: can be empty if tests only?
for(auto rep : rep_tests) {