From 899554bff2ba64afa7a20e1796b85d396cbbfd8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 30 Dec 2021 20:20:22 +0100 Subject: [PATCH] Add test for handling of reporter's assertion preferences --- tests/ExtraTests/CMakeLists.txt | 26 ++++++++++ .../X25-ListenerCanAskForCapturedStdout.cpp | 4 +- ...erencesForPassingAssertionsIsRespected.cpp | 51 +++++++++++++++++++ 3 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 tests/ExtraTests/X26-ReporterPreferencesForPassingAssertionsIsRespected.cpp diff --git a/tests/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt index b503ca44..1ac08445 100644 --- a/tests/ExtraTests/CMakeLists.txt +++ b/tests/ExtraTests/CMakeLists.txt @@ -300,6 +300,32 @@ set_tests_properties( FAIL_REGULAR_EXPRESSION "X25 - ERROR" ) +add_executable(ReporterPreferencesForPassingAssertionsIsRespected ${TESTS_DIR}/X26-ReporterPreferencesForPassingAssertionsIsRespected.cpp) +target_link_libraries(ReporterPreferencesForPassingAssertionsIsRespected PRIVATE Catch2::Catch2WithMain) +add_test( + NAME Reporters::PreferencesForPassingAssertionsIsRespected + COMMAND ReporterPreferencesForPassingAssertionsIsRespected + --reporter test-reporter +) +set_tests_properties( + Reporters::PreferencesForPassingAssertionsIsRespected + PROPERTIES + PASS_REGULAR_EXPRESSION "X26 - TestReporter constructed" + FAIL_REGULAR_EXPRESSION "X26 - assertionEnded" +) +add_test( + NAME MultiReporter::PreferencesForPassingAssertionsIsRespected + COMMAND ReporterPreferencesForPassingAssertionsIsRespected + --reporter test-reporter + --reporter console::${_NullFile} +) +set_tests_properties( + MultiReporter::PreferencesForPassingAssertionsIsRespected + PROPERTIES + PASS_REGULAR_EXPRESSION "X26 - TestReporter constructed" + FAIL_REGULAR_EXPRESSION "X26 - assertionEnded" +) + add_executable(DuplicatedTestCases-SameNameAndTags ${TESTS_DIR}/X31-DuplicatedTestCases.cpp) target_link_libraries(DuplicatedTestCases-SameNameAndTags PRIVATE Catch2::Catch2WithMain) diff --git a/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp b/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp index e831abca..b36a307a 100644 --- a/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp +++ b/tests/ExtraTests/X25-ListenerCanAskForCapturedStdout.cpp @@ -32,11 +32,11 @@ namespace { } void - testCaseEnded(Catch::TestCaseStats const& testCaseStats) override { + testCaseEnded( Catch::TestCaseStats const& testCaseStats ) override { if ( testCaseStats.stdOut.empty() ) { std::cerr << "X25 - ERROR: empty stdout\n"; } - } + } }; } diff --git a/tests/ExtraTests/X26-ReporterPreferencesForPassingAssertionsIsRespected.cpp b/tests/ExtraTests/X26-ReporterPreferencesForPassingAssertionsIsRespected.cpp new file mode 100644 index 00000000..af3a3202 --- /dev/null +++ b/tests/ExtraTests/X26-ReporterPreferencesForPassingAssertionsIsRespected.cpp @@ -0,0 +1,51 @@ + +// 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 reporter is not passed passing assertions when it + * doesn't ask for it. + */ + +#include +#include +#include + +#include + +namespace { + + class TestReporter : public Catch::StreamingReporterBase { + public: + TestReporter(Catch::ReporterConfig const& _config): + StreamingReporterBase(_config) { + m_preferences.shouldReportAllAssertions = false; + std::cout << "X26 - TestReporter constructed\n"; + } + + static std::string getDescription() { + return "X26 - test reporter that opts out of passing assertions"; + } + + void + assertionEnded( Catch::AssertionStats const& ) override { + std::cerr << "X26 - assertionEnded\n"; + } + + ~TestReporter() override; + }; + + TestReporter::~TestReporter() = default; + +} + +CATCH_REGISTER_REPORTER("test-reporter", TestReporter) + +TEST_CASE( "Test with only passing assertions" ) { + REQUIRE( 1 == 1 ); + REQUIRE( 2 == 2 ); +}