catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Push includes for TestCaseInfo down into reporter TUs
- Commit
4e0af77e2975d58e0b90edcc82a437429d2b1bc3- Author
- Martin Hořeňovský ·
- Parents
eaf7113fd3c9
Changes
examples/210-Evt-EventListeners.cpp | 6 +----- src/catch2/catch_registry_hub.cpp | 1 + src/catch2/interfaces/catch_interfaces_reporter.cpp | 1 + src/catch2/interfaces/catch_interfaces_reporter.hpp | 2 +- src/catch2/internal/catch_list.cpp | 1 + src/catch2/reporters/catch_reporter_automake.cpp | 1 + src/catch2/reporters/catch_reporter_console.cpp | 1 + src/catch2/reporters/catch_reporter_junit.cpp | 1 + src/catch2/reporters/catch_reporter_sonarqube.cpp | 1 + src/catch2/reporters/catch_reporter_tap.cpp | 1 + src/catch2/reporters/catch_reporter_teamcity.cpp | 1 + src/catch2/reporters/catch_reporter_xml.cpp | 1 + 12 files changed, 12 insertions(+), 6 deletions(-) diff --git a/examples/210-Evt-EventListeners.cpp b/examples/210-Evt-EventListeners.cpp index e3395828..c69d507c 100644 --- a/examples/210-Evt-EventListeners.cpp +++ b/examples/210-Evt-EventListeners.cpp @@ -5,14 +5,10 @@ // 2. My listener and registration // 3. Test cases -// main() provided in 000-CatchMain.cpp - -// Let Catch provide the required interfaces: -#define CATCH_CONFIG_EXTERNAL_INTERFACES - #include <catch2/catch_test_macros.hpp> #include <catch2/reporters/catch_reporter_bases.hpp> #include <catch2/catch_reporter_registrars.hpp> +#include <catch2/catch_test_case_info.hpp> #include <iostream> // ----------------------------------------------------------------------- diff --git a/src/catch2/catch_registry_hub.cpp b/src/catch2/catch_registry_hub.cpp index a8860e3a..af4db897 100644 --- a/src/catch2/catch_registry_hub.cpp +++ b/src/catch2/catch_registry_hub.cpp @@ -17,6 +17,7 @@ #include <catch2/internal/catch_startup_exception_registry.hpp> #include <catch2/internal/catch_singletons.hpp> #include <catch2/internal/catch_enum_values_registry.hpp> +#include <catch2/catch_test_case_info.hpp> namespace Catch { diff --git a/src/catch2/interfaces/catch_interfaces_reporter.cpp b/src/catch2/interfaces/catch_interfaces_reporter.cpp index 29bbb200..fb1d6d18 100644 --- a/src/catch2/interfaces/catch_interfaces_reporter.cpp +++ b/src/catch2/interfaces/catch_interfaces_reporter.cpp @@ -11,6 +11,7 @@ #include <catch2/internal/catch_list.hpp> #include <catch2/internal/catch_text.hpp> #include <catch2/internal/catch_string_manip.hpp> +#include <catch2/catch_test_case_info.hpp> #include <algorithm> #include <iomanip> diff --git a/src/catch2/interfaces/catch_interfaces_reporter.hpp b/src/catch2/interfaces/catch_interfaces_reporter.hpp index a411b897..83e3ecdf 100644 --- a/src/catch2/interfaces/catch_interfaces_reporter.hpp +++ b/src/catch2/interfaces/catch_interfaces_reporter.hpp @@ -12,7 +12,6 @@ #include <catch2/internal/catch_common.hpp> #include <catch2/catch_config.hpp> #include <catch2/catch_totals.hpp> -#include <catch2/catch_test_case_info.hpp> #include <catch2/catch_assertion_result.hpp> #include <catch2/internal/catch_message_info.hpp> #include <catch2/internal/catch_option.hpp> @@ -32,6 +31,7 @@ namespace Catch { struct ReporterDescription; struct TagInfo; + struct TestCaseInfo; struct ReporterConfig { explicit ReporterConfig( IConfig const* _fullConfig ); diff --git a/src/catch2/internal/catch_list.cpp b/src/catch2/internal/catch_list.cpp index b654c4c1..47590ee5 100644 --- a/src/catch2/internal/catch_list.cpp +++ b/src/catch2/internal/catch_list.cpp @@ -19,6 +19,7 @@ #include <catch2/internal/catch_test_spec_parser.hpp> #include <catch2/catch_tostring.hpp> #include <catch2/internal/catch_string_manip.hpp> +#include <catch2/catch_test_case_info.hpp> #include <limits> #include <algorithm> diff --git a/src/catch2/reporters/catch_reporter_automake.cpp b/src/catch2/reporters/catch_reporter_automake.cpp index 56e3b3d2..57cfdb29 100644 --- a/src/catch2/reporters/catch_reporter_automake.cpp +++ b/src/catch2/reporters/catch_reporter_automake.cpp @@ -4,6 +4,7 @@ */ #include <catch2/reporters/catch_reporter_automake.hpp> +#include <catch2/catch_test_case_info.hpp> #include <ostream> diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp index 5dd258b4..f7eabde8 100644 --- a/src/catch2/reporters/catch_reporter_console.cpp +++ b/src/catch2/reporters/catch_reporter_console.cpp @@ -15,6 +15,7 @@ #include <catch2/internal/catch_text.hpp> #include <catch2/internal/catch_stream.hpp> #include <catch2/internal/catch_stringref.hpp> +#include <catch2/catch_test_case_info.hpp> #include <cfloat> #include <cstdio> diff --git a/src/catch2/reporters/catch_reporter_junit.cpp b/src/catch2/reporters/catch_reporter_junit.cpp index fb826088..55f2e0aa 100644 --- a/src/catch2/reporters/catch_reporter_junit.cpp +++ b/src/catch2/reporters/catch_reporter_junit.cpp @@ -14,6 +14,7 @@ #include <catch2/internal/catch_string_manip.hpp> #include <catch2/catch_reporter_registrars.hpp> #include <catch2/internal/catch_text.hpp> +#include <catch2/catch_test_case_info.hpp> #include <cassert> #include <ctime> diff --git a/src/catch2/reporters/catch_reporter_sonarqube.cpp b/src/catch2/reporters/catch_reporter_sonarqube.cpp index b459b999..99f2d550 100644 --- a/src/catch2/reporters/catch_reporter_sonarqube.cpp +++ b/src/catch2/reporters/catch_reporter_sonarqube.cpp @@ -6,6 +6,7 @@ #include <catch2/reporters/catch_reporter_sonarqube.hpp> #include <catch2/internal/catch_string_manip.hpp> +#include <catch2/catch_test_case_info.hpp> #include <map> diff --git a/src/catch2/reporters/catch_reporter_tap.cpp b/src/catch2/reporters/catch_reporter_tap.cpp index 93da1c17..94595361 100644 --- a/src/catch2/reporters/catch_reporter_tap.cpp +++ b/src/catch2/reporters/catch_reporter_tap.cpp @@ -6,6 +6,7 @@ #include <catch2/reporters/catch_reporter_tap.hpp> #include <catch2/internal/catch_console_colour.hpp> #include <catch2/internal/catch_string_manip.hpp> +#include <catch2/catch_test_case_info.hpp> #include <algorithm> #include <ostream> diff --git a/src/catch2/reporters/catch_reporter_teamcity.cpp b/src/catch2/reporters/catch_reporter_teamcity.cpp index bab27bef..2cb51bed 100644 --- a/src/catch2/reporters/catch_reporter_teamcity.cpp +++ b/src/catch2/reporters/catch_reporter_teamcity.cpp @@ -8,6 +8,7 @@ #include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_enforce.hpp> #include <catch2/internal/catch_text.hpp> +#include <catch2/catch_test_case_info.hpp> namespace Catch { diff --git a/src/catch2/reporters/catch_reporter_xml.cpp b/src/catch2/reporters/catch_reporter_xml.cpp index 137efc66..e0004d36 100644 --- a/src/catch2/reporters/catch_reporter_xml.cpp +++ b/src/catch2/reporters/catch_reporter_xml.cpp @@ -10,6 +10,7 @@ #include <catch2/internal/catch_string_manip.hpp> #include <catch2/internal/catch_list.hpp> +#include <catch2/catch_test_case_info.hpp> #if defined(_MSC_VER) #pragma warning(push)