9 files changed, 41 insertions(+), 17 deletions(-)

M enabled_unittests
M module-services/service-cellular/CMakeLists.txt
M module-utils/CMakeLists.txt
M module-utils/test/CMakeLists.txt
A module-utils/ucs2/CMakeLists.txt
A module-utils/ucs2/test/CMakeLists.txt
R module-utils/{ => ucs2}/test/unittest_ucs2.cpp
R module-utils/ucs2/{ => }/ucs2/UCS2.cpp
R module-utils/ucs2/{ => }/ucs2/UCS2.hpp

@@ 363,7 363,7 @@ TESTS_LIST["catch2-utils-time_display"]="
     Time display parser;
 "
 #---------
-TESTS_LIST["catch2-utils-ucs2"]="
+TESTS_LIST["catch2-ucs2"]="
     UCS2 to UTF8 conversion;
     UCS2 from UTF8 emoji 😁;
     UCS2 from UTF8 emoji 🍣;

@@ 54,6 54,7 @@ target_link_libraries(${PROJECT_NAME}
         service-antenna
         service-audio
         service-evtmgr
+        ucs2
     PUBLIC
         time
         utf8

@@ 18,7 18,6 @@ add_subdirectory(EventStore)
 set (SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/i18n/i18n.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/json/json11.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ucs2/UCS2.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/PhoneNumber.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/NumberHolderMatcher.hpp


@@ 76,4 75,6 @@ add_subdirectory(board)
 add_subdirectory(bootconfig)
 add_subdirectory(log)
 add_subdirectory(time)
+add_subdirectory(ucs2)
 add_subdirectory(utf8)
+

@@ 20,16 20,6 @@ add_catch2_executable(
         module-utils
 )
 
-# UCS2 tests
-add_catch2_executable(
-    NAME
-        utils-ucs2
-    SRCS
-        unittest_ucs2.cpp
-    LIBS
-        module-utils
-)
-
 # duration tests
 add_catch2_executable(
     NAME

@@ 0,0 1,25 @@
+add_library(ucs2 STATIC)
+
+module_is_test_entity(ucs2)
+
+target_sources(ucs2
+    PRIVATE
+       ucs2/UCS2.cpp
+)
+
+target_include_directories(ucs2
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+target_link_libraries(ucs2
+    PUBLIC
+        utf8
+
+    PRIVATE
+        log
+)
+
+if (${ENABLE_TESTS})
+    add_subdirectory( test )
+endif()

@@ 0,0 1,8 @@
+add_catch2_executable(
+    NAME
+        ucs2
+    SRCS
+        unittest_ucs2.cpp
+    LIBS
+        ucs2
+)

@@ 1,10 1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
 #include <catch2/catch.hpp>
 
-#include "ucs2/UCS2.hpp"
+#include <ucs2/UCS2.hpp>
 
 TEST_CASE("UCS2 to UTF8 conversion")
 {

@@ 18,8 18,7 @@ namespace ucs2
 } // namespace ucs2
 
 UCS2::UCS2() : sizeAllocated{ucs2::bufferExt}, buffer{std::make_unique<uint32_t[]>(ucs2::bufferExt)}
-{
-}
+{}
 
 UCS2::UCS2(const UTF8 &string)
 {

@@ 5,7 5,7 @@
 
 #include <cstdint>
 #include <memory>
-#include "utf8/UTF8.hpp"
+#include <utf8/UTF8.hpp>
 
 class UCS2
 {