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

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-05-12 15:40:39 +0200
committerMartin Hořeňovský2020-05-12 23:56:23 +0200
commiteb267b424b4df075b4da12eda2834f9e9ce54311 (patch)
tree2c24207a6169a11019783961824c1912a9de1605 /src/catch2
parent25282473514174bf306dd86657d4aee0609cda3f (diff)
downloadcatch3-eb267b424b4df075b4da12eda2834f9e9ce54311.tar.gz
Tap reporter changes
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/reporters/catch_reporter_tap.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/catch2/reporters/catch_reporter_tap.cpp b/src/catch2/reporters/catch_reporter_tap.cpp
index d0821129..e5b7bae7 100644
--- a/src/catch2/reporters/catch_reporter_tap.cpp
+++ b/src/catch2/reporters/catch_reporter_tap.cpp
@@ -12,9 +12,12 @@
namespace Catch {
namespace {
+ // Yes, this has to be outside the class and namespaced by naming.
+ // Making older compiler happy is hard.
+ static constexpr StringRef tapFailedString = "not ok"_sr;
+ static constexpr StringRef tapPassedString = "ok"_sr;
+
class TapAssertionPrinter {
- static constexpr StringRef failedString = "not ok"_sr;
- static constexpr StringRef passedString = "ok"_sr;
public:
TapAssertionPrinter& operator= (TapAssertionPrinter const&) = delete;
TapAssertionPrinter(TapAssertionPrinter const&) = delete;
@@ -31,7 +34,7 @@ namespace Catch {
switch (result.getResultType()) {
case ResultWas::Ok:
- printResultType(passedString);
+ printResultType(tapPassedString);
printOriginalExpression();
printReconstructedExpression();
if (!result.hasExpression())
@@ -41,9 +44,9 @@ namespace Catch {
break;
case ResultWas::ExpressionFailed:
if (result.isOk()) {
- printResultType(passedString);
+ printResultType(tapPassedString);
} else {
- printResultType(failedString);
+ printResultType(tapFailedString);
}
printOriginalExpression();
printReconstructedExpression();
@@ -53,21 +56,21 @@ namespace Catch {
printRemainingMessages();
break;
case ResultWas::ThrewException:
- printResultType(failedString);
+ printResultType(tapFailedString);
printIssue("unexpected exception with message:"_sr);
printMessage();
printExpressionWas();
printRemainingMessages();
break;
case ResultWas::FatalErrorCondition:
- printResultType(failedString);
+ printResultType(tapFailedString);
printIssue("fatal error condition with message:"_sr);
printMessage();
printExpressionWas();
printRemainingMessages();
break;
case ResultWas::DidntThrowException:
- printResultType(failedString);
+ printResultType(tapFailedString);
printIssue("expected exception, got none"_sr);
printExpressionWas();
printRemainingMessages();
@@ -83,7 +86,7 @@ namespace Catch {
printRemainingMessages();
break;
case ResultWas::ExplicitFailure:
- printResultType(failedString);
+ printResultType(tapFailedString);
printIssue("explicitly"_sr);
printRemainingMessages(Colour::None);
break;
@@ -185,9 +188,6 @@ namespace Catch {
std::size_t counter;
};
- constexpr StringRef TapAssertionPrinter::failedString;
- constexpr StringRef TapAssertionPrinter::passedString;
-
} // End anonymous namespace
TAPReporter::~TAPReporter() {}