From b40012de233714be0f59af92d0849dcf9792155d Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Thu, 9 Apr 2026 12:16:15 +0200 Subject: [PATCH] chore(core): move test helpers into helpers/ folder Test-bot: skip --- core/tests/unit/{ => helpers}/emscripten_filesystem.cpp | 0 core/tests/unit/{ => helpers}/emscripten_filesystem.h | 0 core/tests/unit/{ => helpers}/load_kmx_file.cpp | 0 core/tests/unit/{ => helpers}/load_kmx_file.hpp | 0 core/tests/unit/km_core_keyboard_api.tests.cpp | 4 ++-- core/tests/unit/kmnkbd/action_api.tests.cpp | 2 +- core/tests/unit/kmnkbd/action_set_api.tests.cpp | 4 ++-- core/tests/unit/kmnkbd/actions_get_api.tests.cpp | 4 ++-- core/tests/unit/kmnkbd/actions_normalize.tests.cpp | 4 ++-- core/tests/unit/kmnkbd/debug_api.tests.cpp | 4 ++-- core/tests/unit/kmnkbd/state_context_api.tests.cpp | 4 ++-- core/tests/unit/kmx/kmx.cpp | 4 ++-- core/tests/unit/kmx/kmx_external_event.tests.cpp | 4 ++-- core/tests/unit/kmx/kmx_imx.tests.cpp | 4 ++-- core/tests/unit/kmx/kmx_key_list.tests.cpp | 4 ++-- core/tests/unit/ldml/context_normalization.tests.cpp | 4 ++-- core/tests/unit/ldml/core_ldml_min.tests.cpp | 2 +- core/tests/unit/ldml/ldml.cpp | 2 +- core/tests/unit/ldml/ldml_test_source.cpp | 2 +- core/tests/unit/ldml/unicode.tests.cpp | 2 +- core/tests/unit/meson.build | 4 ++-- 21 files changed, 29 insertions(+), 29 deletions(-) rename core/tests/unit/{ => helpers}/emscripten_filesystem.cpp (100%) rename core/tests/unit/{ => helpers}/emscripten_filesystem.h (100%) rename core/tests/unit/{ => helpers}/load_kmx_file.cpp (100%) rename core/tests/unit/{ => helpers}/load_kmx_file.hpp (100%) diff --git a/core/tests/unit/emscripten_filesystem.cpp b/core/tests/unit/helpers/emscripten_filesystem.cpp similarity index 100% rename from core/tests/unit/emscripten_filesystem.cpp rename to core/tests/unit/helpers/emscripten_filesystem.cpp diff --git a/core/tests/unit/emscripten_filesystem.h b/core/tests/unit/helpers/emscripten_filesystem.h similarity index 100% rename from core/tests/unit/emscripten_filesystem.h rename to core/tests/unit/helpers/emscripten_filesystem.h diff --git a/core/tests/unit/load_kmx_file.cpp b/core/tests/unit/helpers/load_kmx_file.cpp similarity index 100% rename from core/tests/unit/load_kmx_file.cpp rename to core/tests/unit/helpers/load_kmx_file.cpp diff --git a/core/tests/unit/load_kmx_file.hpp b/core/tests/unit/helpers/load_kmx_file.hpp similarity index 100% rename from core/tests/unit/load_kmx_file.hpp rename to core/tests/unit/helpers/load_kmx_file.hpp diff --git a/core/tests/unit/km_core_keyboard_api.tests.cpp b/core/tests/unit/km_core_keyboard_api.tests.cpp index 262390d7c6..16e6814a05 100644 --- a/core/tests/unit/km_core_keyboard_api.tests.cpp +++ b/core/tests/unit/km_core_keyboard_api.tests.cpp @@ -5,8 +5,8 @@ #include #include -#include "emscripten_filesystem.h" -#include "load_kmx_file.hpp" +#include "./helpers/emscripten_filesystem.h" +#include "./helpers/load_kmx_file.hpp" km::core::path test_dir; diff --git a/core/tests/unit/kmnkbd/action_api.tests.cpp b/core/tests/unit/kmnkbd/action_api.tests.cpp index b4bbb1cd84..281a0aa5ff 100644 --- a/core/tests/unit/kmnkbd/action_api.tests.cpp +++ b/core/tests/unit/kmnkbd/action_api.tests.cpp @@ -12,7 +12,7 @@ #include "action.hpp" #include -#include "../emscripten_filesystem.h" +#include "../helpers/emscripten_filesystem.h" const km_core_action_item alert_action_item(); const km_core_action_item bksp_action_item(uint8_t type, uintptr_t value); diff --git a/core/tests/unit/kmnkbd/action_set_api.tests.cpp b/core/tests/unit/kmnkbd/action_set_api.tests.cpp index 72a2d9be53..92b309e75d 100644 --- a/core/tests/unit/kmnkbd/action_set_api.tests.cpp +++ b/core/tests/unit/kmnkbd/action_set_api.tests.cpp @@ -13,8 +13,8 @@ #include "action.hpp" #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" const km_core_action_item alert_action_item(); const km_core_action_item bksp_action_item(uint8_t type, uintptr_t value); diff --git a/core/tests/unit/kmnkbd/actions_get_api.tests.cpp b/core/tests/unit/kmnkbd/actions_get_api.tests.cpp index 3566add5ec..6a7bc6de4c 100644 --- a/core/tests/unit/kmnkbd/actions_get_api.tests.cpp +++ b/core/tests/unit/kmnkbd/actions_get_api.tests.cpp @@ -14,8 +14,8 @@ #include "context.hpp" #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" km_core_option_item test_env_opts[] = { diff --git a/core/tests/unit/kmnkbd/actions_normalize.tests.cpp b/core/tests/unit/kmnkbd/actions_normalize.tests.cpp index 8e5b873ed1..24833b9246 100644 --- a/core/tests/unit/kmnkbd/actions_normalize.tests.cpp +++ b/core/tests/unit/kmnkbd/actions_normalize.tests.cpp @@ -14,8 +14,8 @@ #include "context.hpp" #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" void compare_context(km_core_context *app_context, const km_core_cu* expected_final_app_context); diff --git a/core/tests/unit/kmnkbd/debug_api.tests.cpp b/core/tests/unit/kmnkbd/debug_api.tests.cpp index d40664436b..c5e01ef43a 100644 --- a/core/tests/unit/kmnkbd/debug_api.tests.cpp +++ b/core/tests/unit/kmnkbd/debug_api.tests.cpp @@ -21,8 +21,8 @@ #include "debug_items.hpp" #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" using namespace km::core::kmx; diff --git a/core/tests/unit/kmnkbd/state_context_api.tests.cpp b/core/tests/unit/kmnkbd/state_context_api.tests.cpp index 34de27cd94..721e744f3f 100644 --- a/core/tests/unit/kmnkbd/state_context_api.tests.cpp +++ b/core/tests/unit/kmnkbd/state_context_api.tests.cpp @@ -7,8 +7,8 @@ #include "path.hpp" #include "mock/mock_processor.hpp" -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" #include //------------------------------------------------------------------------------------- diff --git a/core/tests/unit/kmx/kmx.cpp b/core/tests/unit/kmx/kmx.cpp index 9eac21494a..3f5ebc43c1 100644 --- a/core/tests/unit/kmx/kmx.cpp +++ b/core/tests/unit/kmx/kmx.cpp @@ -28,8 +28,8 @@ #include #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" #include "kmx_test_source.hpp" diff --git a/core/tests/unit/kmx/kmx_external_event.tests.cpp b/core/tests/unit/kmx/kmx_external_event.tests.cpp index 15f2d284df..86ead4c424 100644 --- a/core/tests/unit/kmx/kmx_external_event.tests.cpp +++ b/core/tests/unit/kmx/kmx_external_event.tests.cpp @@ -13,8 +13,8 @@ #include "../kmnkbd/action_items.hpp" #include #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" #include #include diff --git a/core/tests/unit/kmx/kmx_imx.tests.cpp b/core/tests/unit/kmx/kmx_imx.tests.cpp index ab2bbb372b..360605bf97 100644 --- a/core/tests/unit/kmx/kmx_imx.tests.cpp +++ b/core/tests/unit/kmx/kmx_imx.tests.cpp @@ -13,8 +13,8 @@ #include "../kmnkbd/action_items.hpp" #include #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" #include "utfcodec.hpp" #include diff --git a/core/tests/unit/kmx/kmx_key_list.tests.cpp b/core/tests/unit/kmx/kmx_key_list.tests.cpp index 7b811bd0b1..bb4d8719fd 100644 --- a/core/tests/unit/kmx/kmx_key_list.tests.cpp +++ b/core/tests/unit/kmx/kmx_key_list.tests.cpp @@ -14,8 +14,8 @@ #include #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" using namespace km::core::kmx; diff --git a/core/tests/unit/ldml/context_normalization.tests.cpp b/core/tests/unit/ldml/context_normalization.tests.cpp index b9a0020c91..5fb1ad9d2f 100644 --- a/core/tests/unit/ldml/context_normalization.tests.cpp +++ b/core/tests/unit/ldml/context_normalization.tests.cpp @@ -12,8 +12,8 @@ #include "action.hpp" #include -#include "../emscripten_filesystem.h" -#include "../load_kmx_file.hpp" +#include "../helpers/emscripten_filesystem.h" +#include "../helpers/load_kmx_file.hpp" //------------------------------------------------------------------------------------- // Context normalization tests diff --git a/core/tests/unit/ldml/core_ldml_min.tests.cpp b/core/tests/unit/ldml/core_ldml_min.tests.cpp index 9657b104b5..c472245d22 100644 --- a/core/tests/unit/ldml/core_ldml_min.tests.cpp +++ b/core/tests/unit/ldml/core_ldml_min.tests.cpp @@ -14,7 +14,7 @@ #include #include "keyman_core.h" -#include "../load_kmx_file.hpp" +#include "../helpers/load_kmx_file.hpp" int main(int argc, const char *argv[]) { diff --git a/core/tests/unit/ldml/ldml.cpp b/core/tests/unit/ldml/ldml.cpp index 6099aa1085..0b725c7828 100644 --- a/core/tests/unit/ldml/ldml.cpp +++ b/core/tests/unit/ldml/ldml.cpp @@ -36,7 +36,7 @@ #include "ldml/ldml_markers.hpp" #include "processor.hpp" -#include "../load_kmx_file.hpp" +#include "../helpers/load_kmx_file.hpp" namespace { diff --git a/core/tests/unit/ldml/ldml_test_source.cpp b/core/tests/unit/ldml/ldml_test_source.cpp index ab77402afc..9d0314ebaf 100644 --- a/core/tests/unit/ldml/ldml_test_source.cpp +++ b/core/tests/unit/ldml/ldml_test_source.cpp @@ -40,7 +40,7 @@ #include "unicode/uniset.h" #include "unicode/usetiter.h" -#include "../load_kmx_file.hpp" +#include "../helpers/load_kmx_file.hpp" #include #include diff --git a/core/tests/unit/ldml/unicode.tests.cpp b/core/tests/unit/ldml/unicode.tests.cpp index f1bdf6c84f..e2aff3e31d 100644 --- a/core/tests/unit/ldml/unicode.tests.cpp +++ b/core/tests/unit/ldml/unicode.tests.cpp @@ -19,7 +19,7 @@ #include "action.hpp" #include -#include "../emscripten_filesystem.h" +#include "../helpers/emscripten_filesystem.h" #include "core_icu.h" #include diff --git a/core/tests/unit/meson.build b/core/tests/unit/meson.build index 0637ace96e..9e6bee88e1 100644 --- a/core/tests/unit/meson.build +++ b/core/tests/unit/meson.build @@ -16,8 +16,8 @@ else endif test_util_files = [ - meson.current_source_dir() / 'emscripten_filesystem.cpp', - meson.current_source_dir() / 'load_kmx_file.cpp', + meson.current_source_dir() / 'helpers' / 'emscripten_filesystem.cpp', + meson.current_source_dir() / 'helpers' / 'load_kmx_file.cpp', ] common_test_files = [