3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update catch_reporter_tap.hpp

Browse Source 
TAP format requires all results to be reported.
Removed extraneous preferences function (handled by parent)
Incorporated fix from 3d9e7db2e0
Simplified total printing
This commit is contained in:
Gavin S 2020-07-12 01:17:37 -07:00 committed by Martin Hořeňovský
parent 4565b826cf
commit 87d0197cbd
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,10 +209,9 @@ namespace Catch {
} }
void TAPReporter::testRunEnded(TestRunStats const& _testRunStats) { void TAPReporter::testRunEnded(TestRunStats const& _testRunStats) {
stream << "1.." << _testRunStats.totals.assertions.total();
if (_testRunStats.totals.testCases.total() == 0) { if (_testRunStats.totals.testCases.total() == 0) {
stream << "1..0 # Skipped: No tests ran."; stream << " # Skipped: No tests ran.";
} else {
stream << "1.." << counter;
} }
stream << "\n\n" << std::flush; stream << "\n\n" << std::flush;
StreamingReporterBase::testRunEnded(_testRunStats); StreamingReporterBase::testRunEnded(_testRunStats);

10
src/catch2/reporters/catch_reporter_tap.hpp
View File

@ -11,8 +11,10 @@ namespace Catch {
struct TAPReporter : StreamingReporterBase { struct TAPReporter : StreamingReporterBase {
using StreamingReporterBase::StreamingReporterBase; TAPReporter( ReporterConfig const& config ):
StreamingReporterBase( config ) {
m_reporterPrefs.shouldReportAllAssertions = true;
}
~TAPReporter() override; ~TAPReporter() override;
static std::string getDescription() { static std::string getDescription() {
@ -20,10 +22,6 @@ namespace Catch {
return "Reports test results in TAP format, suitable for test harnesses"s; return "Reports test results in TAP format, suitable for test harnesses"s;
} }
ReporterPreferences getPreferences() const override {
return m_reporterPrefs;
}
void noMatchingTestCases(std::string const& spec) override; void noMatchingTestCases(std::string const& spec) override;
void assertionStarting( AssertionInfo const& ) override {} void assertionStarting( AssertionInfo const& ) override {}

2
tests/SelfTest/Baselines/tap.sw.approved.txt
View File

@ -3992,5 +3992,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
ok {test-number} - ok {test-number} -
# xmlentitycheck # xmlentitycheck
ok {test-number} - ok {test-number} -
1..1992 1..2000