3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-02 21:35:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change reporters to report filters in round-trippable format

Browse Source
This commit is contained in:
Martin Hořeňovský
2022-10-27 20:43:00 +02:00
parent d2294ad9b6
commit d41da10c54
21 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/catch2/reporters/catch_reporter_compact.cpp
View File

@@ -207,7 +207,7 @@ private:
if ( m_config->testSpec().hasFilters() ) {
m_stream << m_colour->guardColour( Colour::BrightYellow )
<< "Filters: "
<< serializeFilters( m_config->getTestsOrTags() )
<< m_config->testSpec()
<< '\n';
}
m_stream << "RNG seed: " << getSeed() << '\n';

2
src/catch2/reporters/catch_reporter_console.cpp
View File

@@ -499,7 +499,7 @@ void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
StreamingReporterBase::testRunStarting(_testInfo);
if ( m_config->testSpec().hasFilters() ) {
m_stream << m_colour->guardColour( Colour::BrightYellow ) << "Filters: "
<< serializeFilters( m_config->getTestsOrTags() ) << '\n';
<< m_config->testSpec() << '\n';
}
m_stream << "Randomness seeded to: " << getSeed() << '\n';
}

5
src/catch2/reporters/catch_reporter_junit.cpp
View File

@@ -13,6 +13,7 @@
#include <catch2/internal/catch_textflow.hpp>
#include <catch2/interfaces/catch_interfaces_config.hpp>
#include <catch2/catch_test_case_info.hpp>
#include <catch2/catch_test_spec.hpp>
#include <catch2/internal/catch_move_and_forward.hpp>
#include <cassert>
@@ -143,10 +144,10 @@ namespace Catch {
xml.scopedElement("property")
.writeAttribute("name"_sr, "random-seed"_sr)
.writeAttribute("value"_sr, m_config->rngSeed());
if (m_config->hasTestFilters()) {
if (m_config->testSpec().hasFilters()) {
xml.scopedElement("property")
.writeAttribute("name"_sr, "filters"_sr)
.writeAttribute("value"_sr, serializeFilters(m_config->getTestsOrTags()));
.writeAttribute("value"_sr, m_config->testSpec());
}
}

2
src/catch2/reporters/catch_reporter_sonarqube.cpp
View File

@@ -23,7 +23,7 @@ namespace Catch {
ReusableStringStream sstr;
if ( config.testSpec().hasFilters() ) {
sstr << "filters='"
<< serializeFilters( config.getTestsOrTags() )
<< config.testSpec()
<< "' ";
}
sstr << "rng-seed=" << config.rngSeed();

3
src/catch2/reporters/catch_reporter_tap.cpp
View File

@@ -189,8 +189,7 @@ namespace Catch {
void TAPReporter::testRunStarting( TestRunInfo const& ) {
if ( m_config->testSpec().hasFilters() ) {
m_stream << "# filters: "
<< serializeFilters( m_config->getTestsOrTags() ) << '\n';
m_stream << "# filters: " << m_config->testSpec() << '\n';
}
m_stream << "# rng-seed: " << m_config->rngSeed() << '\n';
}

5
src/catch2/reporters/catch_reporter_xml.cpp
View File

@@ -57,8 +57,9 @@ namespace Catch {
.writeAttribute("name"_sr, m_config->name())
.writeAttribute("rng-seed"_sr, m_config->rngSeed())
.writeAttribute("catch2-version"_sr, libraryVersion());
if (m_config->testSpec().hasFilters())
m_xml.writeAttribute( "filters"_sr, serializeFilters( m_config->getTestsOrTags() ) );
if ( m_config->testSpec().hasFilters() ) {
m_xml.writeAttribute( "filters"_sr, m_config->testSpec() );
}
}
void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {