From 4d1806a6561ca44937389dc265bdc590dfbbda58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= <michalcieslak@status.im>
Date: Thu, 23 Nov 2023 12:38:09 +0100
Subject: [PATCH] fix(StatusQ): run all unittests via make and on CI

Closes: #12841
---
 Makefile                        |  4 +---
 ui/StatusQ/CMakeLists.txt       |  1 +
 ui/StatusQ/tests/CMakeLists.txt | 13 +++++--------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 843478473d..f4acd010d7 100644
--- a/Makefile
+++ b/Makefile
@@ -321,13 +321,11 @@ statusq-tests:
 	echo -e "\033[92mBuilding:\033[39m StatusQ Unit Tests"
 	cmake \
 		--build $(STATUSQ_BUILD_PATH) \
-                --target TestStatusQ \
 		$(HANDLE_OUTPUT)
 
 run-statusq-tests: statusq-tests
 	echo -e "\033[92mRunning:\033[39m StatusQ Unit Tests"
-	$(STATUSQ_BUILD_PATH)/bin/TestStatusQ
-
+	ctest -V --test-dir $(STATUSQ_BUILD_PATH) ${ARGS}
 
 ##
 ##	Storybook
diff --git a/ui/StatusQ/CMakeLists.txt b/ui/StatusQ/CMakeLists.txt
index eefb2adbe6..363306439c 100644
--- a/ui/StatusQ/CMakeLists.txt
+++ b/ui/StatusQ/CMakeLists.txt
@@ -183,5 +183,6 @@ if (${STATUSQ_BUILD_SANITY_CHECKER})
 endif ()
 
 if (${STATUSQ_BUILD_TESTS})
+    enable_testing()
     add_subdirectory(tests)
 endif ()
diff --git a/ui/StatusQ/tests/CMakeLists.txt b/ui/StatusQ/tests/CMakeLists.txt
index 2edbea7f41..b221f66713 100644
--- a/ui/StatusQ/tests/CMakeLists.txt
+++ b/ui/StatusQ/tests/CMakeLists.txt
@@ -15,13 +15,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_executable(${PROJECT_NAME} main.cpp)
-add_dependencies(${PROJECT_NAME} StatusQ)
 
 add_test(NAME ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} -input "${CMAKE_CURRENT_SOURCE_DIR}")
-
-add_custom_target("Run_${PROJECT_NAME}" COMMAND ${CMAKE_CTEST_COMMAND} --test-dir "${CMAKE_CURRENT_BINARY_DIR}")
-add_dependencies("Run_${PROJECT_NAME}" ${PROJECT_NAME})
+    COMMAND ${PROJECT_NAME} -input "${CMAKE_CURRENT_SOURCE_DIR}")
 
 # TODO: move this to a test helpers library
 target_include_directories(${PROJECT_NAME}
@@ -35,6 +31,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::QuickTest
     Qt${QT_VERSION_MAJOR}::Qml
     Qt${QT_VERSION_MAJOR}::Quick
+    StatusQ
 )
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE
@@ -44,12 +41,12 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
 
 add_executable(RolesRenamingModelTest tst_RolesRenamingModel.cpp)
 target_link_libraries(RolesRenamingModelTest PRIVATE Qt5::Qml Qt5::Test StatusQ)
-add_test(RolesRenamingModelTest COMMAND RolesRenamingModelTest)
+add_test(NAME RolesRenamingModelTest COMMAND RolesRenamingModelTest)
 
 add_executable(LeftJoinModelTest tst_LeftJoinModel.cpp)
 target_link_libraries(LeftJoinModelTest PRIVATE Qt5::Test StatusQ)
-add_test(LeftJoinModelTest COMMAND LeftJoinModelTest)
+add_test(NAME LeftJoinModelTest COMMAND LeftJoinModelTest)
 
 add_executable(SubmodelProxyModelTest tst_SubmodelProxyModel.cpp)
 target_link_libraries(SubmodelProxyModelTest PRIVATE Qt5::Qml Qt5::Test StatusQ)
-add_test(SubmodelProxyModelTest COMMAND SubmodelProxyModelTest)
+add_test(NAME SubmodelProxyModelTest COMMAND SubmodelProxyModelTest)