diff options
| author | Martin Hořeňovský | 2019-12-02 12:23:10 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-12-02 12:23:10 +0100 |
| commit | 90e2549cecc2e886d563b7a88e752c9b4104f798 (patch) | |
| tree | ab51f444b8faaa6d7d360daf1e2c22b763379ec4 /projects | |
| parent | 82cc5bc034bfc54f7c5c34fffccc112f5e1892f7 (diff) | |
| download | catch3-90e2549cecc2e886d563b7a88e752c9b4104f798.tar.gz | |
Rewrite includes in tests to use library's include paths
Diffstat (limited to 'projects')
45 files changed, 67 insertions, 69 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index a662c124..4c22f047 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -88,8 +88,6 @@ include(CTest) add_executable(SelfTest ${TEST_SOURCES}) target_link_libraries(SelfTest PRIVATE Catch2) -# Fixme! -target_include_directories(SelfTest PRIVATE ${SOURCES_DIR}) # It took CMake until 3.8 to abandon the doomed approach of enumerating # required features so we just list bunch of C++11 and C++14 features. diff --git a/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp b/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp index 3154782e..fe3b95c9 100644 --- a/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp @@ -6,11 +6,11 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" -#include "catch_test_spec_parser.h" -#include "catch_test_case_info.h" -#include "catch_config.hpp" -#include "catch_commandline.h" +#include <catch2/catch.hpp> +#include <catch2/catch_test_spec_parser.h> +#include <catch2/catch_test_case_info.h> +#include <catch2/catch_config.hpp> +#include <catch2/catch_commandline.h> #ifdef __clang__ # pragma clang diagnostic ignored "-Wc++98-compat" diff --git a/projects/SelfTest/IntrospectiveTests/Details.tests.cpp b/projects/SelfTest/IntrospectiveTests/Details.tests.cpp index 75054fb3..77503fe9 100644 --- a/projects/SelfTest/IntrospectiveTests/Details.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/Details.tests.cpp @@ -3,7 +3,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> #if defined(_MSC_VER) #pragma warning(push) diff --git a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp index d9cbc5ac..a8aaf967 100644 --- a/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp @@ -1,4 +1,4 @@ -#include "catch.hpp" +#include <catch2/catch.hpp> // Tests of generator implementation details TEST_CASE("Generators internals", "[generators][internals]") { diff --git a/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp b/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp index d17998d8..415ce71c 100644 --- a/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp @@ -6,7 +6,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING) namespace { struct manual_clock { diff --git a/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp b/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp index d0ef5875..d244bf91 100644 --- a/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp @@ -5,10 +5,10 @@ * 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) */ -#include "catch_suppress_warnings.h" -#include "catch_test_case_tracker.h" +#include <catch2/catch_suppress_warnings.h> +#include <catch2/catch_test_case_tracker.h> -#include "catch.hpp" +#include <catch2/catch.hpp> using namespace Catch; diff --git a/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp b/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp index 8227fd4d..b226e6d9 100644 --- a/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp @@ -5,9 +5,9 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> -#include "catch_random_number_generator.h" +#include <catch2/catch_random_number_generator.h> TEST_CASE("Our PCG implementation provides expected results for known seeds", "[rng]") { Catch::SimplePcg32 rng; diff --git a/projects/SelfTest/IntrospectiveTests/String.tests.cpp b/projects/SelfTest/IntrospectiveTests/String.tests.cpp index 6781106e..427dfe6a 100644 --- a/projects/SelfTest/IntrospectiveTests/String.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/String.tests.cpp @@ -1,6 +1,6 @@ -#include "catch_stringref.h" +#include <catch2/catch_stringref.h> -#include "catch.hpp" +#include <catch2/catch.hpp> #include <cstring> diff --git a/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp b/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp index 3157d27e..54a57bb1 100644 --- a/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp @@ -1,6 +1,6 @@ -#include "catch_string_manip.h" +#include <catch2/catch_string_manip.h> -#include "catch.hpp" +#include <catch2/catch.hpp> static const char * const no_whitespace = "There is no extra whitespace here"; static const char * const leading_whitespace = " \r \t\n There is no extra whitespace here"; diff --git a/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp b/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp index 6e063973..e5ba3570 100644 --- a/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp @@ -6,8 +6,8 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" -#include "catch_tag_alias_registry.h" +#include <catch2/catch.hpp> +#include <catch2/catch_tag_alias_registry.h> TEST_CASE( "Tag alias can be registered against tag patterns" ) { diff --git a/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp b/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp index 7d5e488c..85e2c658 100644 --- a/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp @@ -1,6 +1,6 @@ -#include "catch.hpp" +#include <catch2/catch.hpp> -#include "catch_enum_values_registry.h" +#include <catch2/catch_enum_values_registry.h> enum class EnumClass3 { Value1, Value2, Value3, Value4 }; diff --git a/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp b/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp index 6880e5b4..0f162b81 100644 --- a/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp @@ -1,5 +1,5 @@ -#include "catch.hpp" -#include "catch_xmlwriter.h" +#include <catch2/catch.hpp> +#include <catch2/catch_xmlwriter.h> #include <sstream> diff --git a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp index 7bc87509..44e5dc58 100644 --- a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "catch_suppress_warnings.h" -#include "catch_console_colour.h" +#include <catch2/catch_suppress_warnings.h> +#include <catch2/catch_console_colour.h> diff --git a/projects/SelfTest/SurrogateCpps/catch_debugger.cpp b/projects/SelfTest/SurrogateCpps/catch_debugger.cpp index 33f76ae6..68a65e47 100644 --- a/projects/SelfTest/SurrogateCpps/catch_debugger.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_debugger.cpp @@ -1,2 +1,2 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "catch_debugger.h" +#include <catch2/catch_debugger.h> diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp index 544f9d0f..cfcfd889 100644 --- a/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp @@ -1,2 +1,2 @@ -#include "catch_suppress_warnings.h" -#include "catch_interfaces_reporter.h" +#include <catch2/catch_suppress_warnings.h> +#include <catch2/catch_interfaces_reporter.h> diff --git a/projects/SelfTest/SurrogateCpps/catch_option.cpp b/projects/SelfTest/SurrogateCpps/catch_option.cpp index 35e32829..4dfbd525 100644 --- a/projects/SelfTest/SurrogateCpps/catch_option.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_option.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "catch_suppress_warnings.h" -#include "catch_option.hpp" +#include <catch2/catch_suppress_warnings.h> +#include <catch2/catch_option.hpp> diff --git a/projects/SelfTest/SurrogateCpps/catch_stream.cpp b/projects/SelfTest/SurrogateCpps/catch_stream.cpp index 7aaffa1e..63df987e 100644 --- a/projects/SelfTest/SurrogateCpps/catch_stream.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_stream.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "catch_suppress_warnings.h" -#include "catch_stream.h" +#include <catch2/catch_suppress_warnings.h> +#include <catch2/catch_stream.h> diff --git a/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp b/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp index 09fda590..c8418c8e 100644 --- a/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp @@ -1,2 +1,2 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "catch_test_case_tracker.h" +#include <catch2/catch_test_case_tracker.h> diff --git a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp index ac9993b6..0188cf34 100644 --- a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "catch_suppress_warnings.h" -#include "catch_test_spec.h" +#include <catch2/catch_suppress_warnings.h> +#include <catch2/catch_test_spec.h> diff --git a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp index 520e159d..cb442a42 100644 --- a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp @@ -1,4 +1,4 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "catch_suppress_warnings.h" -#include "catch_xmlwriter.h" -#include "catch_reenable_warnings.h" +#include <catch2/catch_suppress_warnings.h> +#include <catch2/catch_xmlwriter.h> +#include <catch2/catch_reenable_warnings.h> diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp index a16f0c22..4bb6d7aa 100644 --- a/projects/SelfTest/TestMain.cpp +++ b/projects/SelfTest/TestMain.cpp @@ -7,13 +7,13 @@ */ #define CATCH_CONFIG_MAIN -#include "catch.hpp" +#include <catch2/catch.hpp> // These reporters are not included in the single include, so must be included separately in the main file -#include "reporters/catch_reporter_teamcity.hpp" -#include "reporters/catch_reporter_tap.hpp" -#include "reporters/catch_reporter_automake.hpp" -#include "reporters/catch_reporter_sonarqube.hpp" +#include <catch2/reporters/catch_reporter_teamcity.hpp> +#include <catch2/reporters/catch_reporter_tap.hpp> +#include <catch2/reporters/catch_reporter_automake.hpp> +#include <catch2/reporters/catch_reporter_sonarqube.hpp> // Some example tag aliases diff --git a/projects/SelfTest/UsageTests/Approx.tests.cpp b/projects/SelfTest/UsageTests/Approx.tests.cpp index 4029223a..ff32e841 100644 --- a/projects/SelfTest/UsageTests/Approx.tests.cpp +++ b/projects/SelfTest/UsageTests/Approx.tests.cpp @@ -6,7 +6,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> #include <cmath> diff --git a/projects/SelfTest/UsageTests/BDD.tests.cpp b/projects/SelfTest/UsageTests/BDD.tests.cpp index d0d3e038..84c4614c 100644 --- a/projects/SelfTest/UsageTests/BDD.tests.cpp +++ b/projects/SelfTest/UsageTests/BDD.tests.cpp @@ -6,7 +6,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> namespace { namespace BDDTests { diff --git a/projects/SelfTest/UsageTests/Benchmark.tests.cpp b/projects/SelfTest/UsageTests/Benchmark.tests.cpp index 24fda013..b353db49 100644 --- a/projects/SelfTest/UsageTests/Benchmark.tests.cpp +++ b/projects/SelfTest/UsageTests/Benchmark.tests.cpp @@ -1,4 +1,4 @@ -#include "catch.hpp" +#include <catch2/catch.hpp> #include <map> diff --git a/projects/SelfTest/UsageTests/Class.tests.cpp b/projects/SelfTest/UsageTests/Class.tests.cpp index f658fc19..8f1bbb0f 100644 --- a/projects/SelfTest/UsageTests/Class.tests.cpp +++ b/projects/SelfTest/UsageTests/Class.tests.cpp @@ -6,7 +6,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> #include <array> namespace{ namespace ClassTests { diff --git a/projects/SelfTest/UsageTests/Compilation.tests.cpp b/projects/SelfTest/UsageTests/Compilation.tests.cpp index aaba69c4..4df3ea5a 100644 --- a/projects/SelfTest/UsageTests/Compilation.tests.cpp +++ b/projects/SelfTest/UsageTests/Compilation.tests.cpp @@ -30,7 +30,7 @@ std::ostream& operator<<(std::ostream& out, foo::helper_1403 const&) { } /////////////////////////////// -#include "catch.hpp" +#include <catch2/catch.hpp> #include <cstring> diff --git a/projects/SelfTest/UsageTests/Condition.tests.cpp b/projects/SelfTest/UsageTests/Condition.tests.cpp index 9aed5e2c..153eaf7a 100644 --- a/projects/SelfTest/UsageTests/Condition.tests.cpp +++ b/projects/SelfTest/UsageTests/Condition.tests.cpp @@ -14,7 +14,7 @@ # endif #endif -#include "catch.hpp" +#include <catch2/catch.hpp> #include <string> #include <limits> diff --git a/projects/SelfTest/UsageTests/Decomposition.tests.cpp b/projects/SelfTest/UsageTests/Decomposition.tests.cpp index 5bb19cd6..5309bd60 100644 --- a/projects/SelfTest/UsageTests/Decomposition.tests.cpp +++ b/projects/SelfTest/UsageTests/Decomposition.tests.cpp @@ -26,7 +26,7 @@ std::ostream& operator<<(std::ostream& o, truthy) { } // end anonymous namespace -#include "catch.hpp" +#include <catch2/catch.hpp> TEST_CASE( "Reconstruction should be based on stringification: #914" , "[Decomposition][failing][.]") { CHECK(truthy(false)); diff --git a/projects/SelfTest/UsageTests/EnumToString.tests.cpp b/projects/SelfTest/UsageTests/EnumToString.tests.cpp index 7f27916e..02e90305 100644 --- a/projects/SelfTest/UsageTests/EnumToString.tests.cpp +++ b/projects/SelfTest/UsageTests/EnumToString.tests.cpp @@ -1,4 +1,4 @@ -#include "catch.hpp" +#include <catch2/catch.hpp> namespace { diff --git a/projects/SelfTest/UsageTests/Exception.tests.cpp b/projects/SelfTest/UsageTests/Exception.tests.cpp index 9c198dfb..d0f135b7 100644 --- a/projects/SelfTest/UsageTests/Exception.tests.cpp +++ b/projects/SelfTest/UsageTests/Exception.tests.cpp @@ -6,7 +6,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> #include <string> #include <stdexcept> diff --git a/projects/SelfTest/UsageTests/Generators.tests.cpp b/projects/SelfTest/UsageTests/Generators.tests.cpp index 0e39bd5c..59a1baef 100644 --- a/projects/SelfTest/UsageTests/Generators.tests.cpp +++ b/projects/SelfTest/UsageTests/Generators.tests.cpp @@ -1,4 +1,4 @@ -#include "catch.hpp" +#include <catch2/catch.hpp> #include <cstring> diff --git a/projects/SelfTest/UsageTests/Matchers.tests.cpp b/projects/SelfTest/UsageTests/Matchers.tests.cpp index 80e0420f..130b51b2 100644 --- a/projects/SelfTest/UsageTests/Matchers.tests.cpp +++ b/projects/SelfTest/UsageTests/Matchers.tests.cpp @@ -6,7 +6,7 @@ * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "catch.hpp" +#include <catch2/catch.hpp> #include <sstream> #include <algorithm> diff --g |