Start using piecemeal includes in test files

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()