~aleteoryx/muditaos: [MOS-783] Fixed tests and simulator for Harmony

7 files changed, 39 insertions(+), 22 deletions(-)

M CMakeLists.txt
M board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp
M cmake/modules/Assets.cmake
M module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp
M module-utils/i18n/tests/test_i18n.cpp
M module-vfs/paths/filesystem_paths.cpp
M products/BellHybrid/CMakeLists.txt

M CMakeLists.txt => CMakeLists.txt +18 -1

@@ 50,7 50,7 @@ endif()
 
 if (${ENABLE_TESTS})
     enable_testing()
-    add_custom_target(check ${CMAKE_CTEST_COMMAND} -V)
+    add_custom_target(check ${CMAKE_CTEST_COMMAND} -V DEPENDS create_test_product_databases create_test_databases_common)
     add_subdirectory(test)
     include(PureCoverage)
 endif ()


@@ 208,6 208,23 @@ add_scripts_target(
         DEST_DIR ${CMAKE_BINARY_DIR}/sysroot/system_a/scripts
 )
 
+# Create and initialize common databases for tests
+add_databases_target(
+        TARGET create_test_databases_common
+        SOURCE_DIR ${CMAKE_SOURCE_DIR}/module-db/databases/scripts
+        DEST_DIR ${CMAKE_BINARY_DIR}/test-sysroot/system_a/db
+        DEVEL ${WITH_DEVELOPMENT_FEATURES}
+)
+
+# Create and initialize product-specific databases for tests
+add_databases_target(
+        TARGET create_test_product_databases
+        SOURCE_DIR ${CMAKE_SOURCE_DIR}/products/${PRODUCT}/services/db/databases/scripts
+        DEST_DIR ${CMAKE_BINARY_DIR}/test-sysroot/system_a/db
+        DEVEL ${WITH_DEVELOPMENT_FEATURES}
+        DEPENDS create_databases_common
+)
+
 add_library(version-header INTERFACE)
 target_include_directories(version-header INTERFACE $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/source/include>)
 add_dependencies(version-header version)

M board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp => board/linux/libiosyscalls/src/syscalls_posix_dirent.cpp +1 -1

@@ 111,7 111,7 @@ extern "C"
 
     int _iosys__openat_2(int fd, const char *dirname, int flags)
     {
-        int ret;
+        int ret = 0;
         if (!dirname) {
             TRACE_SYSCALLN("(%p) invalid argument", dirname);
             errno = EINVAL;

M cmake/modules/Assets.cmake => cmake/modules/Assets.cmake +1 -0

@@ 28,6 28,7 @@ function(add_assets_target)
             ${_ASSETS_SYSTEM_DEST_DIR}
 
         # Create 'golden copy' of DBs
+        COMMAND mkdir -p ${_ASSETS_SYSTEM_DEST_DIR}/db/factory
         COMMAND rsync -qlptgoDu
             ${_ASSETS_SYSTEM_DEST_DIR}/db/*
             ${_ASSETS_SYSTEM_DEST_DIR}/db/factory

M module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp => module-services/service-bluetooth/service-bluetooth/SettingsHolder.hpp +1 -1

@@ 45,7 45,7 @@ namespace bluetooth
     {
         auto operator()(const std::string &input) const -> int
         {
-            int value;
+            int value = 0;
             utils::toNumeric(input, value);
             return value;
         }

M module-utils/i18n/tests/test_i18n.cpp => module-utils/i18n/tests/test_i18n.cpp +8 -8

@@ 12,7 12,7 @@ using namespace std;
 
 TEST_CASE("Test set display language - empty display language string")
 {
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());
 


@@ 23,7 23,7 @@ TEST_CASE("Test set display language - empty display language string")
 
 TEST_CASE("Test set display language - invalid display language string")
 {
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());
 


@@ 34,7 34,7 @@ TEST_CASE("Test set display language - invalid display language string")
 
 TEST_CASE("Test set display language - double invalid display language string")
 {
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());
 


@@ 51,7 51,7 @@ TEST_CASE("Test set display language - set display language with valid string")
 {
     static constexpr auto languageToChange = "Polski";
 
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());
 


@@ 64,7 64,7 @@ TEST_CASE("Test set display language - set display language with valid string an
 {
     static constexpr auto languageToChange = "Polski";
 
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());
 


@@ 79,7 79,7 @@ TEST_CASE("Test set display language - set display language with valid string an
 
 TEST_CASE("Test get string method - no display language set")
 {
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());
 


@@ 89,7 89,7 @@ TEST_CASE("Test get string method - no display language set")
 
 TEST_CASE("Test get string method - invalid display language set")
 {
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());
 


@@ 105,7 105,7 @@ TEST_CASE("Test get string method - valid display language set")
 {
     static constexpr auto languageToChange = "Polski";
 
-    utils::resetAssetsPath(purefs::dir::getDataDirPath());
+    utils::resetAssetsPath(purefs::dir::getSystemDataDirPath());
     utils::resetDisplayLanguages();
     REQUIRE(utils::getDisplayLanguage().empty());

M module-vfs/paths/filesystem_paths.cpp => module-vfs/paths/filesystem_paths.cpp +10 -10

@@ 6,20 6,20 @@
 
 namespace
 {
-    constexpr inline auto PATH_SYSTEM       = "/system";
-    constexpr inline auto PATH_USER         = "/user";
-    constexpr inline auto PATH_CONF         = "/mfgconf";
-    constexpr inline auto PATH_DB           = "db";
-    constexpr inline auto PATH_UPDATE       = "update";
-    constexpr inline auto PATH_SYNC         = "sync";
-    constexpr inline auto PATH_LOGS         = "log";
-    constexpr inline auto PATH_CRASH_DUMPS  = "crash_dumps";
+    constexpr inline auto PATH_SYSTEM      = "/system";
+    constexpr inline auto PATH_USER        = "/user";
+    constexpr inline auto PATH_CONF        = "/mfgconf";
+    constexpr inline auto PATH_DB          = "db";
+    constexpr inline auto PATH_UPDATE      = "update";
+    constexpr inline auto PATH_SYNC        = "sync";
+    constexpr inline auto PATH_LOGS        = "log";
+    constexpr inline auto PATH_CRASH_DUMPS = "crash_dumps";
     constexpr inline auto PATH_USER_MEDIA =
         "media"; // TODO this won't work with our current non-hierarchical MTP implementation
     constexpr inline auto PATH_TMP    = "tmp";
     constexpr inline auto PATH_BACKUP = "backup";
-    constexpr inline auto PATH_ASSETS  = "assets";
-    constexpr inline auto PATH_DATA    = "data";
+    constexpr inline auto PATH_ASSETS = "assets";
+    constexpr inline auto PATH_DATA   = "data";
 } // namespace
 
 namespace purefs

M products/BellHybrid/CMakeLists.txt => products/BellHybrid/CMakeLists.txt +0 -1

@@ 95,7 95,6 @@ if (${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
     add_image(
         PRODUCT BellHybrid
         SYSROOT sysroot
-        LUTS Luts.bin
         DEPENDS
             install_scripts
             create_product_databases