Remove catch.hpp

This was an old "include all" header, that we no longer want to be
usable, to make the include differences in new versions explicit.

We will introduce new "include all" headers later, in the form of
`catch_all.hpp`, `catch_matchers_all.hpp` and so on...
This commit is contained in:
Martin Hořeňovský 2020-03-29 16:41:58 +02:00
parent 4d63c36402
commit 151dccbd31
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
8 changed files with 6 additions and 63 deletions

View File

@ -4,7 +4,7 @@
#include <catch2/catch_default_main.hpp> #include <catch2/catch_default_main.hpp>
// And write tests in the same file: // And write tests in the same file:
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
static int Factorial( int number ) { static int Factorial( int number ) {
return number <= 1 ? number : Factorial( number - 1 ) * number; // fail return number <= 1 ? number : Factorial( number - 1 ) * number; // fail

View File

@ -6,7 +6,7 @@
// Let Catch provide main(): // Let Catch provide main():
#include <catch2/catch_default_main.hpp> #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]" ) { TEST_CASE( "1: All test cases reside in other .cpp files (empty)", "[multi-file:1]" ) {
} }

View File

@ -2,7 +2,7 @@
// main() provided by Catch in file 020-TestCase-1.cpp. // 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 ) { static int Factorial( int number ) {
return number <= 1 ? number : Factorial( number - 1 ) * number; // fail return number <= 1 ? number : Factorial( number - 1 ) * number; // fail

View File

@ -10,7 +10,7 @@
// main() provided in 000-CatchMain.cpp // main() provided in 000-CatchMain.cpp
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
static std::string one() { static std::string one() {
return "1"; return "1";

View File

@ -2,7 +2,7 @@
// main() provided in 000-CatchMain.cpp // main() provided in 000-CatchMain.cpp
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
SCENARIO( "vectors can be sized and resized", "[vector]" ) { SCENARIO( "vectors can be sized and resized", "[vector]" ) {

View File

@ -35,7 +35,6 @@ SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
set(INTERNAL_HEADERS set(INTERNAL_HEADERS
${SOURCES_DIR}/internal/catch_capture_matchers.h ${SOURCES_DIR}/internal/catch_capture_matchers.h
${SOURCES_DIR}/internal/catch_container_nonmembers.hpp ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
${SOURCES_DIR}/catch.hpp
${SOURCES_DIR}/catch_approx.h ${SOURCES_DIR}/catch_approx.h
${SOURCES_DIR}/catch_assertionhandler.h ${SOURCES_DIR}/catch_assertionhandler.h
${SOURCES_DIR}/catch_assertioninfo.h ${SOURCES_DIR}/catch_assertioninfo.h

View File

@ -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

View File

@ -1,4 +1,4 @@
#include <catch2/catch.hpp> #include <catch2/catch_test_macros.hpp>
#include <vector> #include <vector>
#include <array> #include <array>