Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/tests/ExtraTests
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-04-04 21:07:04 +0200
committerMartin Hořeňovský2022-04-07 12:50:08 +0200
commit423e1d2ebbd75bb92cb486f83f2c5800b4b9689e (patch)
tree3cfff7f75517b1771ab43c7439ba195a77dcec31 /tests/ExtraTests
parent3c06bcb374aaebf91ad1d63aba655dee66cf7b91 (diff)
downloadcatch3-423e1d2ebbd75bb92cb486f83f2c5800b4b9689e.tar.gz
Integrate the new reporter specs into Catch2
This means that the CLI interface now uses the new key-value oriented reporter spec, the common reporter base creates the colour implementation based on the reporter-specific configuration, and it also stores the custom configuration options for each reporter instance. Closes #339 as it allows per-reporter forcing of ansi colour codes.
Diffstat (limited to 'tests/ExtraTests')
-rw-r--r--tests/ExtraTests/CMakeLists.txt24
-rw-r--r--tests/ExtraTests/X29-CustomArgumentsForReporters.cpp59
2 files changed, 78 insertions, 5 deletions
diff --git a/tests/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt
index 8e6b3094..1a400454 100644
--- a/tests/ExtraTests/CMakeLists.txt
+++ b/tests/ExtraTests/CMakeLists.txt
@@ -272,8 +272,8 @@ if (NOT MEMORYCHECK_COMMAND)
add_test(
NAME MultiReporter::NoncapturingListenerDoesntCauseStdoutPassThrough
COMMAND ListenerStdoutCaptureInMultireporter
- --reporter xml::${_NullFile}
- --reporter junit::${_NullFile}
+ --reporter xml::out=${_NullFile}
+ --reporter junit::out=${_NullFile}
)
set_tests_properties(
@@ -290,8 +290,8 @@ target_link_libraries(ListenerCanAskForCapturedStdout PRIVATE Catch2::Catch2With
add_test(
NAME MultiReporter::CapturingListenerCausesStdoutCapture
COMMAND ListenerCanAskForCapturedStdout
- --reporter compact::${_NullFile}
- --reporter console::${_NullFile}
+ --reporter compact::out=${_NullFile}
+ --reporter console::out=${_NullFile}
)
set_tests_properties(
MultiReporter::CapturingListenerCausesStdoutCapture
@@ -317,7 +317,7 @@ add_test(
NAME MultiReporter::PreferencesForPassingAssertionsIsRespected
COMMAND ReporterPreferencesForPassingAssertionsIsRespected
--reporter test-reporter
- --reporter console::${_NullFile}
+ --reporter console::out=${_NullFile}
)
set_tests_properties(
MultiReporter::PreferencesForPassingAssertionsIsRespected
@@ -339,6 +339,20 @@ set_tests_properties(
FAIL_REGULAR_EXPRESSION "X28 - ERROR"
)
+add_executable(CustomArgumentsForReporters ${TESTS_DIR}/X29-CustomArgumentsForReporters.cpp)
+target_link_libraries(CustomArgumentsForReporters PRIVATE Catch2::Catch2WithMain)
+add_test(
+ NAME CustomArgumentsForReporters
+ COMMAND CustomArgumentsForReporters
+ --reporter "test-reporter::Xa b=c 1::Xz:e = 1234"
+)
+set_tests_properties(
+ CustomArgumentsForReporters
+ PROPERTIES
+ PASS_REGULAR_EXPRESSION "Xa b=c 1::Xz:e = 1234"
+)
+
+
add_executable(DuplicatedTestCases-SameNameAndTags ${TESTS_DIR}/X31-DuplicatedTestCases.cpp)
target_link_libraries(DuplicatedTestCases-SameNameAndTags PRIVATE Catch2::Catch2WithMain)
add_test(
diff --git a/tests/ExtraTests/X29-CustomArgumentsForReporters.cpp b/tests/ExtraTests/X29-CustomArgumentsForReporters.cpp
new file mode 100644
index 00000000..9721775d
--- /dev/null
+++ b/tests/ExtraTests/X29-CustomArgumentsForReporters.cpp
@@ -0,0 +1,59 @@
+
+// Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+/**\file
+ * Test that custom options are properly passed down to the reporter.
+ *
+ * We print out the arguments sorted by key, to have a stable expected
+ * output.
+ */
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/reporters/catch_reporter_streaming_base.hpp>
+#include <catch2/reporters/catch_reporter_registrars.hpp>
+
+#include <algorithm>
+#include <iostream>
+#include <string>
+#include <utility>
+#include <vector>
+
+class TestReporter : public Catch::StreamingReporterBase {
+public:
+ TestReporter( Catch::ReporterConfig const& _config ):
+ StreamingReporterBase( _config ) {
+ std::cout << "X29 - TestReporter constructed\n";
+ }
+
+ static std::string getDescription() {
+ return "X29 test reporter";
+ }
+
+ void testRunStarting( Catch::TestRunInfo const& ) override {
+ std::vector<std::pair<std::string, std::string>> options;
+ for ( auto const& kv : m_customOptions ) {
+ options.push_back( kv );
+ }
+ std::sort( options.begin(), options.end() );
+ bool first = true;
+ for ( auto const& kv : options ) {
+ if ( !first ) { std::cout << "::"; }
+ std::cout << kv.first << "=" << kv.second;
+ first = false;
+ }
+ std::cout << '\n';
+ }
+
+ ~TestReporter() override;
+};
+
+TestReporter::~TestReporter() = default;
+
+CATCH_REGISTER_REPORTER( "test-reporter", TestReporter )
+
+TEST_CASE( "Just a test case to run things" ) {}