status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(StatusQ): run all unittests via make and on CI 

Closes: #12841
This commit is contained in:
Michał Cieślak 2023-11-23 12:38:09 +01:00 committed by Michał
parent fae038df3b
commit 4d1806a656
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -321,13 +321,11 @@ statusq-tests:
echo -e "\033[92mBuilding:\033[39m StatusQ Unit Tests" echo -e "\033[92mBuilding:\033[39m StatusQ Unit Tests"
cmake \ cmake \
--build $(STATUSQ_BUILD_PATH) \ --build $(STATUSQ_BUILD_PATH) \
--target TestStatusQ \
$(HANDLE_OUTPUT) $(HANDLE_OUTPUT)
run-statusq-tests: statusq-tests run-statusq-tests: statusq-tests
echo -e "\033[92mRunning:\033[39m StatusQ Unit Tests" echo -e "\033[92mRunning:\033[39m StatusQ Unit Tests"
$(STATUSQ_BUILD_PATH)/bin/TestStatusQ ctest -V --test-dir $(STATUSQ_BUILD_PATH) ${ARGS}
## ##
## Storybook ## Storybook

1
ui/StatusQ/CMakeLists.txt
View File

@ -183,5 +183,6 @@ if (${STATUSQ_BUILD_SANITY_CHECKER})
endif () endif ()
if (${STATUSQ_BUILD_TESTS}) if (${STATUSQ_BUILD_TESTS})
enable_testing()
add_subdirectory(tests) add_subdirectory(tests)
endif () endif ()

13
ui/StatusQ/tests/CMakeLists.txt
View File

@ -15,13 +15,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") add_definitions(-DQUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
add_executable(${PROJECT_NAME} main.cpp) add_executable(${PROJECT_NAME} main.cpp)
add_dependencies(${PROJECT_NAME} StatusQ)
add_test(NAME ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} add_test(NAME ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} -input "${CMAKE_CURRENT_SOURCE_DIR}") COMMAND ${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})
# TODO: move this to a test helpers library # TODO: move this to a test helpers library
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}
@ -35,6 +31,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
Qt${QT_VERSION_MAJOR}::QuickTest Qt${QT_VERSION_MAJOR}::QuickTest
Qt${QT_VERSION_MAJOR}::Qml Qt${QT_VERSION_MAJOR}::Qml
Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::Quick
StatusQ
) )
target_compile_definitions(${PROJECT_NAME} PRIVATE target_compile_definitions(${PROJECT_NAME} PRIVATE
@ -44,12 +41,12 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
add_executable(RolesRenamingModelTest tst_RolesRenamingModel.cpp) add_executable(RolesRenamingModelTest tst_RolesRenamingModel.cpp)
target_link_libraries(RolesRenamingModelTest PRIVATE Qt5::Qml Qt5::Test StatusQ) 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) add_executable(LeftJoinModelTest tst_LeftJoinModel.cpp)
target_link_libraries(LeftJoinModelTest PRIVATE Qt5::Test StatusQ) 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) add_executable(SubmodelProxyModelTest tst_SubmodelProxyModel.cpp)
target_link_libraries(SubmodelProxyModelTest PRIVATE Qt5::Qml Qt5::Test StatusQ) target_link_libraries(SubmodelProxyModelTest PRIVATE Qt5::Qml Qt5::Test StatusQ)
add_test(SubmodelProxyModelTest COMMAND SubmodelProxyModelTest) add_test(NAME SubmodelProxyModelTest COMMAND SubmodelProxyModelTest)