diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index 3f6a4ee..19d2703 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -29,3 +29,4 @@ jobs: uses: coders-school/github-actions/clang-format-check@main with: check_path: homework/schedule + exclude_dir: 'homework/schedule/tests/catch' diff --git a/homework/schedule/CMakeLists.txt b/homework/schedule/CMakeLists.txt index 98f3c55..a50c9e4 100644 --- a/homework/schedule/CMakeLists.txt +++ b/homework/schedule/CMakeLists.txt @@ -8,8 +8,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) include_directories(.) add_executable(${PROJECT_NAME} main.cpp) -add_executable(${PROJECT_NAME}-ut tests/catch_amalgamated.cpp tests/catch_main.cpp tests/tests.cpp) -add_executable(${PROJECT_NAME}-ut-bonus tests/catch_amalgamated.cpp tests/catch_main.cpp tests/tests-bonus.cpp) +add_executable(${PROJECT_NAME}-ut tests/catch/catch_amalgamated.cpp tests/catch/catch_main.cpp tests/tests.cpp) +add_executable(${PROJECT_NAME}-ut-bonus tests/catch/catch_amalgamated.cpp tests/catch/catch_main.cpp tests/tests-bonus.cpp) target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror -Wpedantic) target_compile_options(${PROJECT_NAME}-ut PRIVATE -Wall -Wextra -Werror -Wpedantic) diff --git a/homework/schedule/tests/catch_amalgamated.cpp b/homework/schedule/tests/catch/catch_amalgamated.cpp similarity index 100% rename from homework/schedule/tests/catch_amalgamated.cpp rename to homework/schedule/tests/catch/catch_amalgamated.cpp diff --git a/homework/schedule/tests/catch_amalgamated.hpp b/homework/schedule/tests/catch/catch_amalgamated.hpp similarity index 100% rename from homework/schedule/tests/catch_amalgamated.hpp rename to homework/schedule/tests/catch/catch_amalgamated.hpp diff --git a/homework/schedule/tests/catch_main.cpp b/homework/schedule/tests/catch/catch_main.cpp similarity index 100% rename from homework/schedule/tests/catch_main.cpp rename to homework/schedule/tests/catch/catch_main.cpp diff --git a/homework/schedule/tests/tests-bonus.cpp b/homework/schedule/tests/tests-bonus.cpp index 8d025af..6d0b97b 100644 --- a/homework/schedule/tests/tests-bonus.cpp +++ b/homework/schedule/tests/tests-bonus.cpp @@ -1,6 +1,6 @@ #include #include -#include "catch_amalgamated.hpp" +#include "catch/catch_amalgamated.hpp" #include "schedule.hpp" using namespace std::chrono_literals; @@ -55,4 +55,4 @@ SCENARIO("Testing schedule function with any function", "[schedule][template][va } } } -} \ No newline at end of file +} diff --git a/homework/schedule/tests/tests.cpp b/homework/schedule/tests/tests.cpp index df31fe3..54ae67b 100644 --- a/homework/schedule/tests/tests.cpp +++ b/homework/schedule/tests/tests.cpp @@ -1,6 +1,6 @@ #include #include -#include "catch_amalgamated.hpp" +#include "catch/catch_amalgamated.hpp" #include "schedule.hpp" using namespace std::chrono_literals; @@ -69,4 +69,4 @@ SCENARIO("Testing schedule function with void(std::string, double)", "[schedule] } } } -} \ No newline at end of file +}