From 34a64e6ffefaab007578932ddbab931a25f1d56e Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 15 May 2022 14:15:31 +0800 Subject: ... --- test/CMakeLists.txt | 8 ++----- test/common/CMakeLists.txt | 7 +----- test/platform/CMakeLists.txt | 7 ++---- test/platform/graphics/direct2d/CMakeLists.txt | 6 +++++ test/platform/graphics/direct2d/ConvertTest.cpp | 31 +++++++++++++++++++++++++ test/toml/CMakeLists.txt | 2 +- test/win/CMakeLists.txt | 1 - test/win/graphics/CMakeLists.txt | 1 - test/win/graphics/direct/CMakeLists.txt | 13 ----------- test/win/graphics/direct/ConvertTest.cpp | 31 ------------------------- test/xml/CMakeLists.txt | 2 +- 11 files changed, 44 insertions(+), 65 deletions(-) create mode 100644 test/platform/graphics/direct2d/CMakeLists.txt create mode 100644 test/platform/graphics/direct2d/ConvertTest.cpp delete mode 100644 test/win/CMakeLists.txt delete mode 100644 test/win/graphics/CMakeLists.txt delete mode 100644 test/win/graphics/direct/CMakeLists.txt delete mode 100644 test/win/graphics/direct/ConvertTest.cpp (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c354fba9..c4133193 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,14 +1,10 @@ include(Catch) -add_library(cru_test_base INTERFACE) -target_link_libraries(cru_test_base INTERFACE Catch2::Catch2WithMain) +add_library(CruTestBase INTERFACE) +target_link_libraries(CruTestBase INTERFACE Catch2::Catch2WithMain) add_subdirectory(common) add_subdirectory(platform) add_subdirectory(xml) add_subdirectory(toml) add_subdirectory(ui) - -if(WIN32) - add_subdirectory(win) -endif() diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt index 17cfa85b..b3436105 100644 --- a/test/common/CMakeLists.txt +++ b/test/common/CMakeLists.txt @@ -5,7 +5,7 @@ add_executable(CruBaseTest StringToNumberConverterTest.cpp StringUtilTest.cpp ) -target_link_libraries(CruBaseTest PRIVATE CruBase cru_test_base) +target_link_libraries(CruBaseTest PRIVATE CruBase CruTestBase) if (UNIX) target_sources(CruBaseTest PRIVATE @@ -18,11 +18,6 @@ if (WIN32) platform/win/StreamConvertTest.cpp platform/win/Win32FileStreamTest.cpp ) - - add_custom_command(TARGET CruBaseTest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $ $ - COMMAND_EXPAND_LISTS - ) endif() catch_discover_tests(CruBaseTest) diff --git a/test/platform/CMakeLists.txt b/test/platform/CMakeLists.txt index 37bd7e4a..5116d54d 100644 --- a/test/platform/CMakeLists.txt +++ b/test/platform/CMakeLists.txt @@ -2,13 +2,10 @@ add_executable(CruPlatformBaseTest ColorTest.cpp MatrixTest.cpp ) -target_link_libraries(CruPlatformBaseTest PRIVATE CruPlatformBase cru_test_base) +target_link_libraries(CruPlatformBaseTest PRIVATE CruPlatformBase CruTestBase) if (WIN32) - add_custom_command(TARGET CruPlatformBaseTest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $ $ - COMMAND_EXPAND_LISTS - ) + add_subdirectory(graphics/direct2d) endif() catch_discover_tests(CruPlatformBaseTest) diff --git a/test/platform/graphics/direct2d/CMakeLists.txt b/test/platform/graphics/direct2d/CMakeLists.txt new file mode 100644 index 00000000..66a07d15 --- /dev/null +++ b/test/platform/graphics/direct2d/CMakeLists.txt @@ -0,0 +1,6 @@ +add_executable(CruPlatformGraphicsDirect2dTest + ConvertTest.cpp +) +target_link_libraries(CruPlatformGraphicsDirect2dTest PRIVATE CruPlatformGraphicsDirect2d CruTestBase) + +catch_discover_tests(CruPlatformGraphicsDirect2dTest) diff --git a/test/platform/graphics/direct2d/ConvertTest.cpp b/test/platform/graphics/direct2d/ConvertTest.cpp new file mode 100644 index 00000000..c30bb6a5 --- /dev/null +++ b/test/platform/graphics/direct2d/ConvertTest.cpp @@ -0,0 +1,31 @@ +#include "cru/platform/Matrix.h" +#include "cru/platform/graphics/direct2d/ConvertUtil.h" + +#include +#include "catch2/catch_approx.hpp" + +using Catch::Approx; +using cru::platform::Matrix; +using cru::platform::graphics::direct2d::Convert; + +TEST_CASE("MatrixConvert Rotation", "[matrix]") { + auto matrix = Convert(Matrix::Rotation(90)); + + auto m = *D2D1::Matrix3x2F::ReinterpretBaseType(&matrix); + + auto p = m.TransformPoint({1, 1}); + + REQUIRE(p.x == Approx(-1)); + REQUIRE(p.y == Approx(1)); +} + +TEST_CASE("MatrixConvert RotationAndTranslation", "[matrix]") { + auto matrix = Convert(Matrix::Rotation(90) * Matrix::Translation(1, 1)); + + auto m = *D2D1::Matrix3x2F::ReinterpretBaseType(&matrix); + + auto p = m.TransformPoint({1, 1}); + + REQUIRE(p.x == Approx(0)); + REQUIRE(p.y == Approx(2)); +} diff --git a/test/toml/CMakeLists.txt b/test/toml/CMakeLists.txt index 03f81047..30705585 100644 --- a/test/toml/CMakeLists.txt +++ b/test/toml/CMakeLists.txt @@ -1,7 +1,7 @@ add_executable(CruTomlTest ParserTest.cpp ) -target_link_libraries(CruTomlTest PRIVATE CruToml cru_test_base) +target_link_libraries(CruTomlTest PRIVATE CruToml CruTestBase) if (WIN32) add_custom_command(TARGET CruTomlTest POST_BUILD diff --git a/test/win/CMakeLists.txt b/test/win/CMakeLists.txt deleted file mode 100644 index 0ebdd7fe..00000000 --- a/test/win/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(graphics) diff --git a/test/win/graphics/CMakeLists.txt b/test/win/graphics/CMakeLists.txt deleted file mode 100644 index c90537ac..00000000 --- a/test/win/graphics/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(direct) diff --git a/test/win/graphics/direct/CMakeLists.txt b/test/win/graphics/direct/CMakeLists.txt deleted file mode 100644 index c2eb0630..00000000 --- a/test/win/graphics/direct/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_executable(CruPlatformGraphicsDirect2dTest - ConvertTest.cpp -) -target_link_libraries(CruPlatformGraphicsDirect2dTest PRIVATE CruPlatformGraphicsDirect2d cru_test_base) - -if (WIN32) - add_custom_command(TARGET CruPlatformGraphicsDirect2dTest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $ $ - COMMAND_EXPAND_LISTS - ) -endif() - -catch_discover_tests(CruPlatformGraphicsDirect2dTest) diff --git a/test/win/graphics/direct/ConvertTest.cpp b/test/win/graphics/direct/ConvertTest.cpp deleted file mode 100644 index c30bb6a5..00000000 --- a/test/win/graphics/direct/ConvertTest.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "cru/platform/Matrix.h" -#include "cru/platform/graphics/direct2d/ConvertUtil.h" - -#include -#include "catch2/catch_approx.hpp" - -using Catch::Approx; -using cru::platform::Matrix; -using cru::platform::graphics::direct2d::Convert; - -TEST_CASE("MatrixConvert Rotation", "[matrix]") { - auto matrix = Convert(Matrix::Rotation(90)); - - auto m = *D2D1::Matrix3x2F::ReinterpretBaseType(&matrix); - - auto p = m.TransformPoint({1, 1}); - - REQUIRE(p.x == Approx(-1)); - REQUIRE(p.y == Approx(1)); -} - -TEST_CASE("MatrixConvert RotationAndTranslation", "[matrix]") { - auto matrix = Convert(Matrix::Rotation(90) * Matrix::Translation(1, 1)); - - auto m = *D2D1::Matrix3x2F::ReinterpretBaseType(&matrix); - - auto p = m.TransformPoint({1, 1}); - - REQUIRE(p.x == Approx(0)); - REQUIRE(p.y == Approx(2)); -} diff --git a/test/xml/CMakeLists.txt b/test/xml/CMakeLists.txt index 73838a35..b000c368 100644 --- a/test/xml/CMakeLists.txt +++ b/test/xml/CMakeLists.txt @@ -1,7 +1,7 @@ add_executable(CruXmlTest ParserTest.cpp ) -target_link_libraries(CruXmlTest PRIVATE CruXml cru_test_base) +target_link_libraries(CruXmlTest PRIVATE CruXml CruTestBase) if (WIN32) add_custom_command(TARGET CruXmlTest POST_BUILD -- cgit v1.2.3