diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2084d6b8..a80ddea5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: strategy: matrix: build_config: + - { version: 22 } - { version: 21 } - { version: 20 } - { version: 19 } diff --git a/conanfile.txt b/conanfile.txt index a37f52b2..6bc2c8ff 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -doctest/2.4.11 +doctest/2.4.12 [generators] CMakeToolchain diff --git a/script/ci.sh b/script/ci.sh index a5934ac8..d0943190 100755 --- a/script/ci.sh +++ b/script/ci.sh @@ -28,7 +28,7 @@ fi # Function to install doctest _install_doctest() { cd "$REPO_DIR" - git clone --depth=1 --branch=v2.4.12 https://github.com/doctest/doctest + git clone --depth=1 --branch=v2.5.0 https://github.com/doctest/doctest cd doctest && mkdir -p build && cd build cmake .. -DDOCTEST_WITH_TESTS=OFF -DDOCTEST_WITH_MAIN_IN_STATIC_LIB=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX cmake --build . --config Release --target install diff --git a/test/udemy_course_test.cpp b/test/udemy_course_test.cpp index e75ff66e..4ab3ca02 100644 --- a/test/udemy_course_test.cpp +++ b/test/udemy_course_test.cpp @@ -291,18 +291,18 @@ TEST_CASE("udemy_course_test - Function_composition") } namespace Programming_challenge_an_SQL_analogy { -struct user { +struct User { std::string name; std::string country; std::size_t visits; }; -std::string get_country(const user& u) +std::string get_country(const User& u) { return u.country; } -std::size_t get_visits(const user& u) +std::size_t get_visits(const User& u) { return u.visits; } @@ -312,7 +312,7 @@ TEST_CASE("udemy_course_test - Programming_challenge_an_SQL_analogy") { using namespace Programming_challenge_an_SQL_analogy; - const std::vector users = { + const std::vector users = { { "Nicole", "GER", 2 }, { "Justin", "USA", 1 }, { "Rachel", "USA", 5 }, @@ -320,7 +320,7 @@ TEST_CASE("udemy_course_test - Programming_challenge_an_SQL_analogy") { "Stefan", "GER", 4 } }; - const auto visit_sum = [](const std::vector& xs) -> std::size_t { + const auto visit_sum = [](const std::vector& xs) -> std::size_t { return fplus::fwd::apply(xs, fplus::fwd::transform(get_visits), fplus::fwd::sum()); }; @@ -489,4 +489,4 @@ TEST_CASE("udemy_course_test - OOP_Design_patterns_vanishing") REQUIRE_EQ(a, 16); REQUIRE_EQ(b, 25); -} \ No newline at end of file +}