Rewrite includes in tests to use library's include paths

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.

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 <catch2/catch.hpp>
-#include "catch_test_spec_parser.h"
+#include <catch2/catch_test_spec_parser.h>
-#include "catch_test_case_info.h"
+#include <catch2/catch_test_case_info.h>
-#include "catch_config.hpp"
+#include <catch2/catch_config.hpp>
-#include "catch_commandline.h"
+#include <catch2/catch_commandline.h>
 
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wc++98-compat"

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)

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]") {

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 {

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 <catch2/catch_suppress_warnings.h>
-#include "catch_test_case_tracker.h"
+#include <catch2/catch_test_case_tracker.h>
 
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 using namespace Catch;
 

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;

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>
 

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";

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 <catch2/catch.hpp>
-#include "catch_tag_alias_registry.h"
+#include <catch2/catch_tag_alias_registry.h>
 
 TEST_CASE( "Tag alias can be registered against tag patterns" ) {
 

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 };
 

projects/SelfTest/IntrospectiveTests/Xml.tests.cpp

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

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 <catch2/catch_suppress_warnings.h>
-#include "catch_console_colour.h"
+#include <catch2/catch_console_colour.h>

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>

projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp

@@ -1,2 +1,2 @@
-#include "catch_suppress_warnings.h"
+#include <catch2/catch_suppress_warnings.h>
-#include "catch_interfaces_reporter.h"
+#include <catch2/catch_interfaces_reporter.h>

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 <catch2/catch_suppress_warnings.h>
-#include "catch_option.hpp"
+#include <catch2/catch_option.hpp>

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 <catch2/catch_suppress_warnings.h>
-#include "catch_stream.h"
+#include <catch2/catch_stream.h>

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>

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 <catch2/catch_suppress_warnings.h>
-#include "catch_test_spec.h"
+#include <catch2/catch_test_spec.h>

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 <catch2/catch_suppress_warnings.h>
-#include "catch_xmlwriter.h"
+#include <catch2/catch_xmlwriter.h>
-#include "catch_reenable_warnings.h"
+#include <catch2/catch_reenable_warnings.h>

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 <catch2/reporters/catch_reporter_teamcity.hpp>
-#include "reporters/catch_reporter_tap.hpp"
+#include <catch2/reporters/catch_reporter_tap.hpp>
-#include "reporters/catch_reporter_automake.hpp"
+#include <catch2/reporters/catch_reporter_automake.hpp>
-#include "reporters/catch_reporter_sonarqube.hpp"
+#include <catch2/reporters/catch_reporter_sonarqube.hpp>
 
 
 // Some example tag aliases

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>
 

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 {
 

projects/SelfTest/UsageTests/Benchmark.tests.cpp

@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 #include <map>
 

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 {

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>
 

projects/SelfTest/UsageTests/Condition.tests.cpp

@@ -14,7 +14,7 @@
 #   endif    
 #endif
 
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 #include <string>
 #include <limits>

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

projects/SelfTest/UsageTests/EnumToString.tests.cpp

@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 
 namespace {

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>

projects/SelfTest/UsageTests/Generators.tests.cpp

@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 #include <cstring>
 

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>

projects/SelfTest/UsageTests/Message.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 <iostream>
 
 TEST_CASE( "INFO and WARN do not abort tests", "[messages][.]" ) {

projects/SelfTest/UsageTests/Misc.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>
 
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wc++98-compat"

projects/SelfTest/UsageTests/ToStringByte.tests.cpp

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

projects/SelfTest/UsageTests/ToStringChrono.tests.cpp

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

projects/SelfTest/UsageTests/ToStringGeneral.tests.cpp

@@ -6,7 +6,7 @@
  */
 
 #define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 #include <map>
 #include <set>

projects/SelfTest/UsageTests/ToStringOptional.tests.cpp

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

projects/SelfTest/UsageTests/ToStringPair.tests.cpp

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

projects/SelfTest/UsageTests/ToStringTuple.tests.cpp

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

projects/SelfTest/UsageTests/ToStringVariant.tests.cpp

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

projects/SelfTest/UsageTests/ToStringVector.tests.cpp

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

projects/SelfTest/UsageTests/ToStringWhich.tests.cpp

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

projects/SelfTest/UsageTests/Tricky.tests.cpp

@@ -15,7 +15,7 @@
                                  // that is triggered when compiling as Win32|Release
 #endif
 
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 #include <stdio.h>
 #include <sstream>

projects/SelfTest/UsageTests/VariadicMacros.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>
 
 
 TEST_CASE()