diff options
| author | Gavin S | 2020-07-12 01:17:37 -0700 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-07-26 14:00:10 +0200 |
| commit | 87d0197cbdc72a53b2dbbd5fe724ebcaa6fa7500 (patch) | |
| tree | 8a21e87dfa69285f2ab090e9e920f0d493ab06e0 /src/catch2 | |
| parent | 4565b826cff3f8c11325c23d1536ded6acd8fa78 (diff) | |
| download | catch3-87d0197cbdc72a53b2dbbd5fe724ebcaa6fa7500.tar.gz | |
Update catch_reporter_tap.hpp
TAP format requires all results to be reported.
Removed extraneous preferences function (handled by parent)
Incorporated fix from 3d9e7db2e0fff8fc2edcf59d24351f3937e3ac62
Simplified total printing
Diffstat (limited to 'src/catch2')
| -rw-r--r-- | src/catch2/reporters/catch_reporter_tap.cpp | 5 | ||||
| -rw-r--r-- | src/catch2/reporters/catch_reporter_tap.hpp | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/catch2/reporters/catch_reporter_tap.cpp b/src/catch2/reporters/catch_reporter_tap.cpp index fb8993a2..93da1c17 100644 --- a/src/catch2/reporters/catch_reporter_tap.cpp +++ b/src/catch2/reporters/catch_reporter_tap.cpp @@ -209,10 +209,9 @@ namespace Catch { } void TAPReporter::testRunEnded(TestRunStats const& _testRunStats) { + stream << "1.." << _testRunStats.totals.assertions.total(); if (_testRunStats.totals.testCases.total() == 0) { - stream << "1..0 # Skipped: No tests ran."; - } else { - stream << "1.." << counter; + stream << " # Skipped: No tests ran."; } stream << "\n\n" << std::flush; StreamingReporterBase::testRunEnded(_testRunStats); diff --git a/src/catch2/reporters/catch_reporter_tap.hpp b/src/catch2/reporters/catch_reporter_tap.hpp index 1ede76fb..651d2b20 100644 --- a/src/catch2/reporters/catch_reporter_tap.hpp +++ b/src/catch2/reporters/catch_reporter_tap.hpp @@ -11,8 +11,10 @@ namespace Catch { struct TAPReporter : StreamingReporterBase { - using StreamingReporterBase::StreamingReporterBase; - + TAPReporter( ReporterConfig const& config ): + StreamingReporterBase( config ) { + m_reporterPrefs.shouldReportAllAssertions = true; + } ~TAPReporter() override; static std::string getDescription() { @@ -20,10 +22,6 @@ namespace Catch { 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 assertionStarting( AssertionInfo const& ) override {} |