catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Remove catch.hpp
- Commit
151dccbd3161715be284ddd68be6f20dbae29f1d- Author
- Martin Hořeňovský ·
- Parents
4d63c3640222
Changes
examples/010-TestCase.cpp | 2 +- examples/020-TestCase-1.cpp | 2 +- examples/020-TestCase-2.cpp | 2 +- examples/030-Asn-Require-Check.cpp | 2 +- examples/120-Bdd-ScenarioGivenWhenThen.cpp | 2 +- src/CMakeLists.txt | 1 - src/catch2/catch.hpp | 56 ---------------------- tests/SelfTest/UsageTests/ToStringVector.tests.cpp | 2 +- 8 files changed, 6 insertions(+), 63 deletions(-) diff --git a/examples/010-TestCase.cpp b/examples/010-TestCase.cpp index 9c676f82..8eaa1c0e 100644 --- a/examples/010-TestCase.cpp +++ b/examples/010-TestCase.cpp @@ -4,7 +4,7 @@ #include <catch2/catch_default_main.hpp> // And write tests in the same file: -#include <catch2/catch.hpp> +#include <catch2/catch_test_macros.hpp> static int Factorial( int number ) { return number <= 1 ? number : Factorial( number - 1 ) * number; // fail diff --git a/examples/020-TestCase-1.cpp b/examples/020-TestCase-1.cpp index 76e25dad..c734d029 100644 --- a/examples/020-TestCase-1.cpp +++ b/examples/020-TestCase-1.cpp @@ -6,7 +6,7 @@ // Let Catch provide main(): #include <catch2/catch_default_main.hpp> -#include <catch2/catch.hpp> +#include <catch2/catch_test_macros.hpp> TEST_CASE( "1: All test cases reside in other .cpp files (empty)", "[multi-file:1]" ) { } diff --git a/examples/020-TestCase-2.cpp b/examples/020-TestCase-2.cpp index 43c0aee0..3f5767b3 100644 --- a/examples/020-TestCase-2.cpp +++ b/examples/020-TestCase-2.cpp @@ -2,7 +2,7 @@ // main() provided by Catch in file 020-TestCase-1.cpp. -#include <catch2/catch.hpp> +#include <catch2/catch_test_macros.hpp> static int Factorial( int number ) { return number <= 1 ? number : Factorial( number - 1 ) * number; // fail diff --git a/examples/030-Asn-Require-Check.cpp b/examples/030-Asn-Require-Check.cpp index 84935bbc..f638afae 100644 --- a/examples/030-Asn-Require-Check.cpp +++ b/examples/030-Asn-Require-Check.cpp @@ -10,7 +10,7 @@ // main() provided in 000-CatchMain.cpp -#include <catch2/catch.hpp> +#include <catch2/catch_test_macros.hpp> static std::string one() { return "1"; diff --git a/examples/120-Bdd-ScenarioGivenWhenThen.cpp b/examples/120-Bdd-ScenarioGivenWhenThen.cpp index d1b9ce55..97336a70 100644 --- a/examples/120-Bdd-ScenarioGivenWhenThen.cpp +++ b/examples/120-Bdd-ScenarioGivenWhenThen.cpp @@ -2,7 +2,7 @@ // main() provided in 000-CatchMain.cpp -#include <catch2/catch.hpp> +#include <catch2/catch_test_macros.hpp> SCENARIO( "vectors can be sized and resized", "[vector]" ) { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 27a6b58a..d9205d65 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,7 +35,6 @@ SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES}) set(INTERNAL_HEADERS ${SOURCES_DIR}/internal/catch_capture_matchers.h ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp - ${SOURCES_DIR}/catch.hpp ${SOURCES_DIR}/catch_approx.h ${SOURCES_DIR}/catch_assertionhandler.h ${SOURCES_DIR}/catch_assertioninfo.h diff --git a/src/catch2/catch.hpp b/src/catch2/catch.hpp deleted file mode 100644 index 352eae25..00000000 --- a/src/catch2/catch.hpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Created by Phil on 22/10/2010. - * Copyright 2010 Two Blue Cubes Ltd - * - * Distributed under the Boost Software License, Version 1.0. (See accompanying - * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - */ - -#ifndef TWOBLUECUBES_CATCH_HPP_INCLUDED -#define TWOBLUECUBES_CATCH_HPP_INCLUDED - -#include <catch2/catch_version_macros.hpp> - -#include <catch2/catch_suppress_warnings.h> - -#if !defined(CATCH_CONFIG_IMPL_ONLY) -#include <catch2/catch_platform.h> - -#include <catch2/catch_user_interfaces.h> -#include <catch2/catch_tag_alias_autoregistrar.h> -#include <catch2/catch_test_registry.h> -#include <catch2/catch_capture.hpp> -#include <catch2/catch_section.h> -#include <catch2/catch_interfaces_exception.h> -#include <catch2/catch_approx.h> -#include <catch2/catch_compiler_capabilities.h> -#include <catch2/catch_string_manip.h> - -#include <catch2/catch_generators.hpp> -#include <catch2/catch_generators_generic.hpp> -#include <catch2/catch_generators_specific.hpp> - -// These files are included here so the single_include script doesn't put them -// in the conditionally compiled sections -#include <catch2/catch_test_case_info.h> -#include <catch2/catch_interfaces_runner.h> - -#ifdef __OBJC__ -#include <catch2/catch_objc.hpp> -#endif - -#endif // ! CATCH_CONFIG_IMPL_ONLY - -#if !defined(CATCH_CONFIG_IMPL_ONLY) - -#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED -# undef CLARA_CONFIG_MAIN -#endif - -#include <catch2/catch_test_macros.hpp> - -#endif // ! CATCH_CONFIG_IMPL_ONLY - -#include <catch2/catch_reenable_warnings.h> - -#endif // TWOBLUECUBES_CATCH_HPP_INCLUDED diff --git a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp index 5ce2ff75..96c67672 100644 --- a/tests/SelfTest/UsageTests/ToStringVector.tests.cpp +++ b/tests/SelfTest/UsageTests/ToStringVector.tests.cpp @@ -1,4 +1,4 @@ -#include <catch2/catch.hpp> +#include <catch2/catch_test_macros.hpp> #include <vector> #include <array>