schtobia/ModernCppStarter
1
0
Fork 0
mirror of https://github.com/TheLartians/ModernCppStarter.git synced 2025-10-31 18:21:35 +01:00
Code Issues Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Claus Klein 2021-02-27 12:10:53 +01:00 • committed by GitHub
commit 9d1c7413f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

19
test/CMakeLists.txt
View file

@ -20,11 +20,7 @@ include(../cmake/tools.cmake)
include(../cmake/CPM.cmake)
CPMUsePackageLock(package-lock.cmake)
CPMAddPackage(
NAME doctest
GITHUB_REPOSITORY onqtam/doctest
GIT_TAG 2.4.5
)
CPMAddPackage("gh:onqtam/doctest#2.4.5")
if(TEST_INSTALLED_VERSION)
find_package(Greeter ${PROJECT_VERSION} REQUIRED)
@ -45,12 +41,13 @@ CPMAddPackage(
file(GLOB sources CONFIGURE_DEPENDS source/*.cpp)
add_executable(GreeterTests ${sources})
target_link_libraries(GreeterTests doctest::doctest Greeter::Greeter)
set_target_properties(GreeterTests PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD})
set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17)
# enable compiler warnings
if(NOT TEST_INSTALLED_VERSION)
if(CMAKE_CXX_COMPILER_ID MATCHES "(Apple)?[Cc]lang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_compile_options(Greeter PUBLIC -Wall -Wextra -Werror)
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_compile_options(Greeter PUBLIC -Wall -Wpedantic -Wextra -Werror)
elseif(MSVC)
target_compile_options(Greeter PUBLIC /W4 /WX)
target_compile_definitions(GreeterTests PUBLIC DOCTEST_CONFIG_USE_STD_HEADERS)
@ -61,7 +58,11 @@ endif()
enable_testing()
add_test(NAME greeterTests COMMAND GreeterTests -s false)
# Note: doctest and similar testing frameworks can automatically configure CMake tests. For other
# testing frameworks add the tests target instead: add_test(NAME greeterTests COMMAND GreeterTests)
include(${doctest_SOURCE_DIR}/scripts/cmake/doctest.cmake)
doctest_discover_tests(GreeterTests)
# ---- code coverage ----

9
test/source/greeter.cpp
View file

@ -14,11 +14,6 @@ TEST_CASE("Greeter") {
}
TEST_CASE("Greeter version") {
#if (__cpp_lib_starts_ends_with)
static_assert(std::string_view(GREETER_VERSION).starts_with("1")); // TBD C++20 only
CHECK(std::string(GREETER_VERSION).starts_with("1")); // SameMajorVersion
#else
static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0.1"));
CHECK(std::string(GREETER_VERSION) == std::string("1.0.1"));
#endif
static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0"));
CHECK(std::string(GREETER_VERSION) == std::string("1.0"));
}