Start using piecemeal includes in test files

src/catch2/catch.hpp

@@ -11,14 +11,6 @@
 
 #include <catch2/catch_version_macros.hpp>
 
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-
-
 #include <catch2/catch_suppress_warnings.h>
 
 #if !defined(CATCH_CONFIG_IMPL_ONLY)

src/catch2/catch_assertionhandler.cpp

@@ -16,6 +16,7 @@
 #include <catch2/catch_interfaces_registry_hub.h>
 #include <catch2/catch_capture_matchers.h>
 #include <catch2/catch_run_context.h>
+#include <catch2/catch_matchers_string.h>
 
 namespace Catch {
 

src/catch2/catch_capture_matchers.h

@@ -10,11 +10,6 @@
 
 #include <catch2/catch_capture.hpp>
 #include <catch2/catch_matchers.h>
-#include <catch2/catch_matchers_exception.hpp>
-#include <catch2/catch_matchers_floating.h>
-#include <catch2/catch_matchers_generic.hpp>
-#include <catch2/catch_matchers_string.h>
-#include <catch2/catch_matchers_vector.h>
 #include <catch2/catch_stringref.h>
 
 namespace Catch {

src/catch2/catch_decomposer.h

@@ -23,6 +23,14 @@
 #pragma warning(disable:4800) // Forcing result to true or false
 #endif
 
+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wsign-compare"
+#elif defined __GNUC__
+#  pragma GCC diagnostic push
+#  pragma clang diagnostic ignored "-Wsign-compare"
+#endif
+
 namespace Catch {
 
     struct ITransientExpression {
@@ -243,5 +251,10 @@ namespace Catch {
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
+#ifdef __clang__
+#  pragma clang diagnostic pop
+#elif defined __GNUC__
+#  pragma GCC diagnostic pop
+#endif
 
 #endif // TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED

src/catch2/catch_test_macros.hpp

@@ -7,6 +7,10 @@
 #define TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
 
 #include <catch2/catch_capture.hpp>
+#include <catch2/catch_capture_matchers.h>
+#include <catch2/catch_interfaces_exception.h>
+#include <catch2/catch_preprocessor.hpp>
+#include <catch2/catch_section.h>
 #include <catch2/catch_test_registry.h>
 
 #if !defined(CATCH_CONFIG_DISABLE)

src/catch2/catch_tostring.h

@@ -649,6 +649,8 @@ struct ratio_string<std::milli> {
 }
 #endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
 
+#include <catch2/catch_interfaces_registry_hub.h>
+
 #define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
 namespace Catch { \
     template<> struct StringMaker<enumName> { \

tests/ExtraTests/X01-PrefixedMacros.cpp

@@ -4,7 +4,9 @@
 #include <catch2/catch_default_main.hpp>
 // This won't provide full coverage, but it might be worth checking
 // the other branch as well
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_matchers_generic.hpp>
+#include <catch2/catch_matchers_string.h>
 
 #include <type_traits>
 #include <stdexcept>

tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp

@@ -1,12 +1,11 @@
 /*
- *  Created by Phil on 13/5/2013.
- *  Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_approx.h>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_matchers_string.h>
 #include <catch2/catch_test_spec_parser.h>
 #include <catch2/catch_test_case_info.h>
 #include <catch2/catch_config.hpp>

tests/SelfTest/IntrospectiveTests/Details.tests.cpp

@@ -3,7 +3,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_enforce.h>
 
 #if defined(_MSC_VER)
 #pragma warning(push)

tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp

@@ -1,4 +1,7 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_approx.h>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_generators_generic.hpp>
+#include <catch2/catch_generators_specific.hpp>
 
 // Tests of generator implementation details
 TEST_CASE("Generators internals", "[generators][internals]") {
@@ -175,6 +178,7 @@ TEST_CASE("Generators internals", "[generators][internals]") {
             }
 
             SECTION("Floating Point") {
+                using Catch::Detail::Approx;
                 SECTION("Exact") {
                     const auto rangeStart = -1.;
                     const auto rangeEnd = 1.;

tests/SelfTest/IntrospectiveTests/InternalBenchmark.tests.cpp

@@ -391,7 +391,7 @@ TEST_CASE("measure", "[benchmark]") {
 TEST_CASE("run benchmark", "[benchmark]") {
     counting_clock::set_rate(1000);
     auto start = counting_clock::now();
-    
+
     Catch::Benchmark::Benchmark bench{ "Test Benchmark", [](Catch::Benchmark::Chronometer meter) {
         counting_clock::set_rate(100000);
         meter.measure([] { return counting_clock::now(); });

tests/SelfTest/IntrospectiveTests/PartTracker.tests.cpp

@@ -1,14 +1,12 @@
 /*
- *  Created by Phil on 1/10/2015.
- *  Copyright 2015 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)
  */
+
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_suppress_warnings.h>
 #include <catch2/catch_test_case_tracker.h>
 
-#include <catch2/catch.hpp>
 
 using namespace Catch;
 

tests/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp

@@ -1,12 +1,9 @@
 /*
- *  Created by Martin on 06/10/2019.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
-
 #include <catch2/catch_random_number_generator.h>
 
 TEST_CASE("Our PCG implementation provides expected results for known seeds", "[rng]") {

tests/SelfTest/IntrospectiveTests/String.tests.cpp

@@ -1,7 +1,6 @@
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_stringref.h>
 
-#include <catch2/catch.hpp>
-
 #include <cstring>
 
 TEST_CASE( "StringRef", "[Strings][StringRef]" ) {

tests/SelfTest/IntrospectiveTests/StringManip.tests.cpp

@@ -1,7 +1,7 @@
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_matchers_vector.h>
 #include <catch2/catch_string_manip.h>
 
-#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";
 static const char * const trailing_whitespace = "There is no extra whitespace here \t \n \r ";

tests/SelfTest/IntrospectiveTests/Tag.tests.cpp

@@ -1,13 +1,13 @@
 /*
- *  Created by Phil on 27/06/2014.
- *  Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_matchers_string.h>
+#include <catch2/catch_matchers_vector.h>
 #include <catch2/catch_tag_alias_registry.h>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_test_case_info.h>
 
 TEST_CASE( "Tag alias can be registered against tag patterns" ) {
 

tests/SelfTest/IntrospectiveTests/ToString.tests.cpp

@@ -1,6 +1,6 @@
-#include <catch2/catch.hpp>
-
 #include <catch2/catch_enum_values_registry.h>
+#include <catch2/catch_matchers_vector.h>
+#include <catch2/catch_test_macros.hpp>
 
 enum class EnumClass3 { Value1, Value2, Value3, Value4 };
 

tests/SelfTest/IntrospectiveTests/Xml.tests.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_xmlwriter.h>
 
 #include <sstream>

tests/SelfTest/UsageTests/Approx.tests.cpp

@@ -6,10 +6,13 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.h>
 
 #include <cmath>
 
+using Catch::Detail::Approx;
+
 namespace { namespace ApproxTests {
 
 #ifndef APPROX_TEST_HELPERS_INCLUDED // Don't compile this more than once per TU

tests/SelfTest/UsageTests/BDD.tests.cpp

@@ -1,12 +1,9 @@
 /*
- *  Created by Phil on 29/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 namespace { namespace BDDTests {
 

tests/SelfTest/UsageTests/Class.tests.cpp

@@ -1,12 +1,9 @@
 /*
- *  Created by Phil on 09/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <array>
 
 namespace{ namespace ClassTests {

tests/SelfTest/UsageTests/Compilation.tests.cpp

@@ -1,6 +1,4 @@
 /*
- *  Created by Martin on 17/02/2017.
- *
  *  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)
  */
@@ -30,7 +28,8 @@ std::ostream& operator<<(std::ostream& out, foo::helper_1403 const&) {
 }
 ///////////////////////////////
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_matchers_string.h>
 
 #include <cstring>
 
@@ -218,7 +217,7 @@ namespace { namespace CompilationTests {
         REQUIRE( y.v == 0 );
         REQUIRE( 0 == y.v );
     }
-    
+
     TEST_CASE("#1319: Sections can have description (even if it is not saved", "[compilation]") {
         SECTION("SectionName", "This is a long form section description") {
             SUCCEED();

tests/SelfTest/UsageTests/Condition.tests.cpp

@@ -1,7 +1,4 @@
 /*
- *  Created by Phil on 08/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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)
  */
@@ -11,10 +8,13 @@
 // Wdouble-promotion is not supported until 3.8
 #   if (__clang_major__ > 3) || (__clang_major__ == 3 && __clang_minor__ > 7)
 #       pragma clang diagnostic ignored "-Wdouble-promotion"
-#   endif    
+#   endif
 #endif
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_approx.h>
+#include <catch2/catch_test_macros.hpp>
+
+using Catch::Detail::Approx;
 
 #include <string>
 #include <limits>

tests/SelfTest/UsageTests/Decomposition.tests.cpp

@@ -1,7 +1,4 @@
 /*
- *  Created by Martin on 27/5/2017.
- *  Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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)
  */
@@ -26,7 +23,7 @@ std::ostream& operator<<(std::ostream& o, truthy) {
 
 } // end anonymous namespace
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 TEST_CASE( "Reconstruction should be based on stringification: #914" , "[Decomposition][failing][.]") {
     CHECK(truthy(false));

tests/SelfTest/UsageTests/EnumToString.tests.cpp

@@ -1,4 +1,5 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_enum_values_registry.h>
 
 
 namespace {

tests/SelfTest/UsageTests/Exception.tests.cpp

@@ -1,12 +1,10 @@
 /*
- *  Created by Phil on 09/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_matchers_string.h>
 
 #include <string>
 #include <stdexcept>

tests/SelfTest/UsageTests/Generators.tests.cpp

@@ -1,4 +1,6 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_generators_generic.hpp>
+#include <catch2/catch_generators_specific.hpp>
 
 #include <cstring>
 

tests/SelfTest/UsageTests/Matchers.tests.cpp

@@ -1,15 +1,18 @@
 /*
- *  Created by Phil on 21/02/2017.
- *  Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_matchers_exception.hpp>
+#include <catch2/catch_matchers_floating.h>
+#include <catch2/catch_matchers_generic.hpp>
+#include <catch2/catch_matchers_string.h>
+#include <catch2/catch_matchers_vector.h>
 
 #include <sstream>
 #include <algorithm>
+#include <cmath>
 
 #ifdef __clang__
 #pragma clang diagnostic push

tests/SelfTest/UsageTests/Message.tests.cpp

@@ -1,12 +1,9 @@
 /*
- *  Created by Phil on 09/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <iostream>
 
 TEST_CASE( "INFO and WARN do not abort tests", "[messages][.]" ) {

tests/SelfTest/UsageTests/Misc.tests.cpp

@@ -1,12 +1,9 @@
 /*
- *  Created by Phil on 29/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wc++98-compat"

tests/SelfTest/UsageTests/ToStringByte.tests.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #if defined(CATCH_CONFIG_CPP17_BYTE)
 

tests/SelfTest/UsageTests/ToStringChrono.tests.cpp

@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <chrono>
 #include <cstdint>

tests/SelfTest/UsageTests/ToStringGeneral.tests.cpp

@@ -1,12 +1,10 @@
 /*
- *  Created by Martin on 17/02/2017.
- *
  *  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)
  */
 
 #define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <map>
 #include <set>

tests/SelfTest/UsageTests/ToStringOptional.tests.cpp

@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #if defined(CATCH_CONFIG_CPP17_OPTIONAL)
 

tests/SelfTest/UsageTests/ToStringPair.tests.cpp

@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 TEST_CASE( "std::pair<int,std::string> -> toString", "[toString][pair]" ) {
     std::pair<int,std::string> value( 34, "xyzzy" );

tests/SelfTest/UsageTests/ToStringTuple.tests.cpp

@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <tuple>
 

tests/SelfTest/UsageTests/ToStringVariant.tests.cpp

@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #if defined(CATCH_CONFIG_CPP17_VARIANT)
 

tests/SelfTest/UsageTests/ToStringWhich.tests.cpp

@@ -13,7 +13,7 @@ std::string fallbackStringifier(T const&) {
 }
 
 #define CATCH_CONFIG_FALLBACK_STRINGIFIER fallbackStringifier
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 
 

tests/SelfTest/UsageTests/Tricky.tests.cpp

@@ -1,7 +1,4 @@
 /*
- *  Created by Phil on 09/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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)
  */
@@ -15,7 +12,7 @@
                                  // that is triggered when compiling as Win32|Release
 #endif
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <stdio.h>
 #include <sstream>

tests/SelfTest/UsageTests/VariadicMacros.tests.cpp

@@ -1,12 +1,9 @@
 /*
- *  Created by Phil on 15/03/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
  *  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 <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 
 TEST_CASE()