Move to Qt

Everything seems to be working
Only timer is not moved over
This commit is contained in:
2024-09-12 16:59:54 +02:00
parent fc181726b9
commit 9eef1fc3ff
39 changed files with 399 additions and 501 deletions
+7 -3
View File
@@ -4,11 +4,14 @@ include_directories(${GTEST_INCLUDE_DIR})
link_directories(${GTEST_LIB_DIR})
find_package(GTest REQUIRED)
find_package(Qt6 REQUIRED COMPONENTS Core)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
# tests
file(GLOB_RECURSE TEST_SOURCES "*.cpp")
file(GLOB_RECURSE TEST_SOURCES "*.[hc]pp")
add_executable(tests ${TEST_SOURCES})
target_link_libraries(tests ${LIBS})
target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
-Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
@@ -19,6 +22,7 @@ target_link_libraries(tests
UI
gtest
GTest::gtest_main
Qt::Core
)
target_include_directories(tests
@@ -30,4 +34,4 @@ target_include_directories(tests
)
include(GoogleTest)
gtest_discover_tests(tests)
gtest_discover_tests(tests)
+1 -13
View File
@@ -1,4 +1,5 @@
#include "Test.hpp"
#include <QObject>
TEST(UI_button, to_from_json)
{
@@ -10,16 +11,3 @@ TEST(UI_button, to_from_json)
EXPECT_EQ(button.fg_color(), button2.fg_color());
EXPECT_EQ(button.bg_color(), button2.bg_color());
}
void on_click(std::string id)
{
UNUSED(id);
EXPECT_EQ(id, "button_id");
}
TEST(UI_button, on_click)
{
UI_button button("button_id", "button_text", Color(255, 255, 255), Color(0, 0, 0), on_click);
button.click();
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
+1 -16
View File
@@ -12,23 +12,8 @@ TEST(UI_slider, to_from_json)
EXPECT_EQ(slider.value(), slider2.value());
}
static double val = 0;
void on_change(std::string id, double value)
{
EXPECT_EQ(id, "slider_id");
val = value;
}
TEST(UI_slider, set_value)
{
UI_slider slider("slider_id", "slider_text", Color(255, 255, 255), Color(0, 0, 0), 0, 100, 50, on_change);
slider.set_value(75);
std::this_thread::sleep_for(std::chrono::milliseconds(1));
EXPECT_EQ(val, 75);
}
TEST(UI_slider, value)
{
UI_slider slider("slider_id", "slider_text", Color(255, 255, 255), Color(0, 0, 0), 0, 100, 50, on_change);
UI_slider slider("slider_id", "slider_text", Color(255, 255, 255), Color(0, 0, 0), 0, 100, 50);
EXPECT_EQ(slider.value(), 50);
}