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

ConsoleReporter: minor formatting fix

Browse Source 
PASSED will now appear on the same line as filename and line number,
just like the case with FAILED message formatting
This commit is contained in:
Jozef Grajciar 2018-11-04 20:31:49 +01:00 committed by Martin Hořeňovský
parent eccbffec0f
commit 489a41012e
4 changed files with 1148 additions and 2298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/reporters/catch_reporter_console.cpp
View File

@ -111,8 +111,6 @@ public:
void print() const { void print() const {
printSourceInfo(); printSourceInfo();
if (stats.totals.assertions.total() > 0) { if (stats.totals.assertions.total() > 0) {
if (result.isOk())
stream << '\n';
printResultType(); printResultType();
printOriginalExpression(); printOriginalExpression();
printReconstructedExpression(); printReconstructedExpression();

15
projects/SelfTest/Baselines/console.std.approved.txt
View File

@ -392,8 +392,7 @@ Message.tests.cpp:<line number>: FAILED:
explicitly with message: explicitly with message:
This is a failure This is a failure
Message.tests.cpp:<line number>: Message.tests.cpp:<line number>: warning:
warning:
This message appears in the output This message appears in the output
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -402,8 +401,7 @@ INFO and WARN do not abort tests
Message.tests.cpp:<line number> Message.tests.cpp:<line number>
............................................................................... ...............................................................................
Message.tests.cpp:<line number>: Message.tests.cpp:<line number>: warning:
warning:
this is a warning this is a warning
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -528,8 +526,7 @@ Nice descriptive name
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: warning:
warning:
This one ran This one ran
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
@ -909,8 +906,7 @@ Where the LHS is not a simple value
Tricky.tests.cpp:<line number> Tricky.tests.cpp:<line number>
............................................................................... ...............................................................................
Tricky.tests.cpp:<line number>: Tricky.tests.cpp:<line number>: warning:
warning:
Uncomment the code in this test to check that it gives a sensible compiler Uncomment the code in this test to check that it gives a sensible compiler
error error
@ -920,8 +916,7 @@ Where there is more to the expression after the RHS
Tricky.tests.cpp:<line number> Tricky.tests.cpp:<line number>
............................................................................... ...............................................................................
Tricky.tests.cpp:<line number>: Tricky.tests.cpp:<line number>: warning:
warning:
Uncomment the code in this test to check that it gives a sensible compiler Uncomment the code in this test to check that it gives a sensible compiler
error error

3333
projects/SelfTest/Baselines/console.sw.approved.txt
View File

File diff suppressed because it is too large Load Diff

96
projects/SelfTest/Baselines/console.swa4.approved.txt
View File

@ -11,8 +11,7 @@ Randomness seeded to: 1
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
with message: with message:
yay yay
@ -23,14 +22,12 @@ with message:
Decomposition.tests.cpp:<line number> Decomposition.tests.cpp:<line number>
............................................................................... ...............................................................................
Decomposition.tests.cpp:<line number>: Decomposition.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( fptr == 0 ) REQUIRE( fptr == 0 )
with expansion: with expansion:
0 == 0 0 == 0
Decomposition.tests.cpp:<line number>: Decomposition.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( fptr == 0l ) REQUIRE( fptr == 0l )
with expansion: with expansion:
0 == 0 0 == 0
@ -41,14 +38,12 @@ with expansion:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( y.v == 0 ) REQUIRE( y.v == 0 )
with expansion: with expansion:
0 == 0 0 == 0
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( 0 == y.v ) REQUIRE( 0 == y.v )
with expansion: with expansion:
0 == 0 0 == 0
@ -59,38 +54,32 @@ with expansion:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( t1 == t2 ) REQUIRE( t1 == t2 )
with expansion: with expansion:
{?} == {?} {?} == {?}
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( t1 != t2 ) REQUIRE( t1 != t2 )
with expansion: with expansion:
{?} != {?} {?} != {?}
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( t1 < t2 ) REQUIRE( t1 < t2 )
with expansion: with expansion:
{?} < {?} {?} < {?}
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( t1 > t2 ) REQUIRE( t1 > t2 )
with expansion: with expansion:
{?} > {?} {?} > {?}
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( t1 <= t2 ) REQUIRE( t1 <= t2 )
with expansion: with expansion:
{?} <= {?} {?} <= {?}
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( t1 >= t2 ) REQUIRE( t1 >= t2 )
with expansion: with expansion:
{?} >= {?} {?} >= {?}
@ -101,8 +90,7 @@ with expansion:
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
#1238 #1238
@ -110,8 +98,7 @@ PASSED:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( std::memcmp(uarr, "123", sizeof(uarr)) == 0 ) REQUIRE( std::memcmp(uarr, "123", sizeof(uarr)) == 0 )
with expansion: with expansion:
0 == 0 0 == 0
@ -119,8 +106,7 @@ with messages:
uarr := "123" uarr := "123"
sarr := "456" sarr := "456"
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( std::memcmp(sarr, "456", sizeof(sarr)) == 0 ) REQUIRE( std::memcmp(sarr, "456", sizeof(sarr)) == 0 )
with expansion: with expansion:
0 == 0 0 == 0
@ -134,8 +120,7 @@ with messages:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
#1403 #1403
@ -143,8 +128,7 @@ PASSED:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( h1 == h2 ) REQUIRE( h1 == h2 )
with expansion: with expansion:
[1403 helper] == [1403 helper] [1403 helper] == [1403 helper]
@ -181,8 +165,7 @@ due to unexpected exception with messages:
Exception.tests.cpp:<line number> Exception.tests.cpp:<line number>
............................................................................... ...............................................................................
Exception.tests.cpp:<line number>: Exception.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE_THROWS( thisThrows() ) REQUIRE_THROWS( thisThrows() )
with message: with message:
answer := 42 answer := 42
@ -193,8 +176,7 @@ with message:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( 42 == f ) REQUIRE( 42 == f )
with expansion: with expansion:
42 == {?} 42 == {?}
@ -205,38 +187,31 @@ with expansion:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( a == t ) REQUIRE( a == t )
with expansion: with expansion:
3 == 3 3 == 3
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
CHECK( a == t ) CHECK( a == t )
with expansion: with expansion:
3 == 3 3 == 3
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE_THROWS( throws_int(true) ) REQUIRE_THROWS( throws_int(true) )
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
CHECK_THROWS_AS( throws_int(true), int ) CHECK_THROWS_AS( throws_int(true), int )
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE_NOTHROW( throws_int(false) ) REQUIRE_NOTHROW( throws_int(false) )
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") ) REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") )
with expansion: with expansion:
"aaa" ends with: "aaa" "aaa" ends with: "aaa"
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( templated_tests<int>(3) ) REQUIRE( templated_tests<int>(3) )
with expansion: with expansion:
true true
@ -252,8 +227,7 @@ Misc.tests.cpp:<line number>: FAILED:
with expansion: with expansion:
1 == 0 1 == 0
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( errno == 1 ) REQUIRE( errno == 1 )
with expansion: with expansion:
1 == 1 1 == 1
@ -264,8 +238,7 @@ with expansion:
Compilation.tests.cpp:<line number> Compilation.tests.cpp:<line number>
............................................................................... ...............................................................................
Compilation.tests.cpp:<line number>: Compilation.tests.cpp:<line number>: PASSED:
PASSED:
REQUIRE( x == 4 ) REQUIRE( x == 4 )
with expansion: with expansion:
{?} == 4 {?} == 4
@ -279,8 +252,7 @@ with message:
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
with message: with message:
Everything is OK Everything is OK
@ -291,8 +263,7 @@ with message:
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
with message: with message:
Everything is OK Everything is OK
@ -303,8 +274,7 @@ with message:
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
with message: with message:
Everything is OK Everything is OK
@ -315,8 +285,7 @@ with message:
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
with message: with message:
Everything is OK Everything is OK
@ -327,8 +296,7 @@ with message:
Misc.tests.cpp:<line number> Misc.tests.cpp:<line number>
............................................................................... ...............................................................................
Misc.tests.cpp:<line number>: Misc.tests.cpp:<line number>: PASSED:
PASSED:
with message: with message:
Everything is OK Everything is OK