From d5c886c8eef8652c36d1b66ff38a150b4bf72bef Mon Sep 17 00:00:00 2001 From: Edgar Date: Sun, 14 Feb 2021 10:55:32 +0100 Subject: [PATCH] :white_check_mark: Added Emojis test back --- conanfile.txt | 1 + tests/CMakeLists.txt | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index 8b7d83b47..793e3d664 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -10,6 +10,7 @@ settings/0.1@chatterino/local signals/0.1@chatterino/local WebSocketpp/0.8.1@chatterino/local + [generators] cmake diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index dc68b5f65..558a0f496 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,6 +19,13 @@ set(chatterino_SOURCES ${main_dir}/BaseSettings.cpp ${main_dir}/common/UsernameSet.cpp ${main_dir}/controllers/highlights/HighlightPhrase.cpp + ${main_dir}/providers/emoji/Emojis.cpp + ${main_dir}/messages/Emote.cpp + ${main_dir}/messages/Image.cpp + ${main_dir}/messages/ImageSet.cpp + ${main_dir}/util/RapidjsonHelpers.cpp + ${CMAKE_SOURCE_DIR}/resources/resources.qrc + ${CMAKE_SOURCE_DIR}/resources/resources_autogenerated.qrc ) message("++ Tests enabled") @@ -29,6 +36,7 @@ add_executable(${PROJECT_NAME} src/NetworkRequest.cpp src/UsernameSet.cpp src/HighlightPhrase.cpp + src/Emojis.cpp ) target_link_libraries(${PROJECT_NAME} @@ -54,7 +62,8 @@ else () ) endif () -target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO UNICODE USEWINSDK AB_CUSTOM_THEME AB_CUSTOM_SETTINGS IRC_STATIC IRC_NAMESPACE=Communi) +target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO CHATTERINO_TEST UNICODE USEWINSDK AB_CUSTOM_THEME AB_CUSTOM_SETTINGS IRC_STATIC IRC_NAMESPACE=Communi) target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO_GIT_HASH=\"XD\" CHATTERINO_GIT_RELEASE=\"XD\" CHATTERINO_GIT_COMMIT=\"XD\") -gtest_discover_tests(${PROJECT_NAME}) \ No newline at end of file + +#gtest_discover_tests(${PROJECT_NAME}) \ No newline at end of file