Merge pull request #15833 from keymanapp/chore/core/embed-osk/move-test-helpers

chore(core): move test helpers into helpers/ folder 🔱

core/tests/unit/km_core_keyboard_api.tests.cpp

@@ -5,8 +5,8 @@
 #include <gtest/gtest.h>
 
 #include <keyman/keyman_core_api.h>
-#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;
 

core/tests/unit/kmnkbd/action_api.tests.cpp

@@ -12,7 +12,7 @@
 #include "action.hpp"
 
 #include <test_assert.h>
-#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);

core/tests/unit/kmnkbd/action_set_api.tests.cpp

@@ -13,8 +13,8 @@
 #include "action.hpp"
 
 #include <test_assert.h>
-#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);

core/tests/unit/kmnkbd/actions_get_api.tests.cpp

@@ -14,8 +14,8 @@
 #include "context.hpp"
 
 #include <test_assert.h>
-#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[] =
 {

core/tests/unit/kmnkbd/actions_normalize.tests.cpp

@@ -14,8 +14,8 @@
 #include "context.hpp"
 
 #include <test_assert.h>
-#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);
 

core/tests/unit/kmnkbd/debug_api.tests.cpp

@@ -21,8 +21,8 @@
 #include "debug_items.hpp"
 
 #include <test_assert.h>
-#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;
 

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 <test_assert.h>
 
 //-------------------------------------------------------------------------------------

core/tests/unit/kmx/kmx.cpp

@@ -28,8 +28,8 @@
 
 #include <test_assert.h>
 #include <test_color.h>
-#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"
 

core/tests/unit/kmx/kmx_external_event.tests.cpp

@@ -13,8 +13,8 @@
 #include "../kmnkbd/action_items.hpp"
 #include <test_assert.h>
 #include <test_color.h>
-#include "../emscripten_filesystem.h"
-#include "../load_kmx_file.hpp"
+#include "../helpers/emscripten_filesystem.h"
+#include "../helpers/load_kmx_file.hpp"
 
 #include <map>
 #include <iostream>

core/tests/unit/kmx/kmx_imx.tests.cpp

@@ -13,8 +13,8 @@
 #include "../kmnkbd/action_items.hpp"
 #include <test_assert.h>
 #include <test_color.h>
-#include "../emscripten_filesystem.h"
-#include "../load_kmx_file.hpp"
+#include "../helpers/emscripten_filesystem.h"
+#include "../helpers/load_kmx_file.hpp"
 #include "utfcodec.hpp"
 
 #include <map>

core/tests/unit/kmx/kmx_key_list.tests.cpp

@@ -14,8 +14,8 @@
 
 #include <test_assert.h>
 #include <test_color.h>
-#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;
 

core/tests/unit/ldml/context_normalization.tests.cpp

@@ -12,8 +12,8 @@
 #include "action.hpp"
 
 #include <test_assert.h>
-#include "../emscripten_filesystem.h"
-#include "../load_kmx_file.hpp"
+#include "../helpers/emscripten_filesystem.h"
+#include "../helpers/load_kmx_file.hpp"
 
 //-------------------------------------------------------------------------------------
 // Context normalization tests

core/tests/unit/ldml/core_ldml_min.tests.cpp

@@ -14,7 +14,7 @@
 #include <test_assert.h>
 
 #include "keyman_core.h"
-#include "../load_kmx_file.hpp"
+#include "../helpers/load_kmx_file.hpp"
 
 int main(int argc, const char *argv[]) {
 

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 {
 

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 <test_assert.h>
 #include <test_color.h>

core/tests/unit/ldml/unicode.tests.cpp

@@ -19,7 +19,7 @@
 #include "action.hpp"
 
 #include <test_assert.h>
-#include "../emscripten_filesystem.h"
+#include "../helpers/emscripten_filesystem.h"
 
 #include "core_icu.h"
 #include <unicode/uversion.h>

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 = [