mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 04:07:10 +01:00 
			
		
		
		
	ConsoleReporter: minor formatting fix
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
					Jozef Grajciar
				
			
				
					committed by
					
						 Martin Hořeňovský
						Martin Hořeňovský
					
				
			
			
				
	
			
			
			 Martin Hořeňovský
						Martin Hořeňovský
					
				
			
						parent
						
							eccbffec0f
						
					
				
				
					commit
					489a41012e
				
			| @@ -392,8 +392,7 @@ Message.tests.cpp:<line number>: FAILED: | ||||
| explicitly with message: | ||||
|   This is a failure | ||||
|  | ||||
| Message.tests.cpp:<line number>: | ||||
| warning: | ||||
| Message.tests.cpp:<line number>: warning: | ||||
|   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>: | ||||
| warning: | ||||
| Message.tests.cpp:<line number>: warning: | ||||
|   this is a warning | ||||
|  | ||||
| ------------------------------------------------------------------------------- | ||||
| @@ -528,8 +526,7 @@ Nice descriptive name | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| warning: | ||||
| Misc.tests.cpp:<line number>: warning: | ||||
|   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>: | ||||
| warning: | ||||
| Tricky.tests.cpp:<line number>: warning: | ||||
|   Uncomment the code in this test to check that it gives a sensible compiler | ||||
|   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>: | ||||
| warning: | ||||
| Tricky.tests.cpp:<line number>: warning: | ||||
|   Uncomment the code in this test to check that it gives a sensible compiler | ||||
|   error | ||||
|  | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -11,8 +11,7 @@ Randomness seeded to: 1 | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
| with message: | ||||
|   yay | ||||
|  | ||||
| @@ -23,14 +22,12 @@ with message: | ||||
| Decomposition.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Decomposition.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Decomposition.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( fptr == 0 ) | ||||
| with expansion: | ||||
|   0 == 0 | ||||
|  | ||||
| Decomposition.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Decomposition.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( fptr == 0l ) | ||||
| with expansion: | ||||
|   0 == 0 | ||||
| @@ -41,14 +38,12 @@ with expansion: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( y.v == 0 ) | ||||
| with expansion: | ||||
|   0 == 0 | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( 0 == y.v ) | ||||
| with expansion: | ||||
|   0 == 0 | ||||
| @@ -59,38 +54,32 @@ with expansion: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( t1 == t2 ) | ||||
| with expansion: | ||||
|   {?} == {?} | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( t1 != t2 ) | ||||
| with expansion: | ||||
|   {?} != {?} | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( t1 < t2 ) | ||||
| with expansion: | ||||
|   {?} < {?} | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( t1 > t2 ) | ||||
| with expansion: | ||||
|   {?} > {?} | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( t1 <= t2 ) | ||||
| with expansion: | ||||
|   {?} <= {?} | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( t1 >= t2 ) | ||||
| with expansion: | ||||
|   {?} >= {?} | ||||
| @@ -101,8 +90,7 @@ with expansion: | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
|  | ||||
| ------------------------------------------------------------------------------- | ||||
| #1238 | ||||
| @@ -110,8 +98,7 @@ PASSED: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( std::memcmp(uarr, "123", sizeof(uarr)) == 0 ) | ||||
| with expansion: | ||||
|   0 == 0 | ||||
| @@ -119,8 +106,7 @@ with messages: | ||||
|   uarr := "123" | ||||
|   sarr := "456" | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( std::memcmp(sarr, "456", sizeof(sarr)) == 0 ) | ||||
| with expansion: | ||||
|   0 == 0 | ||||
| @@ -134,8 +120,7 @@ with messages: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|  | ||||
| ------------------------------------------------------------------------------- | ||||
| #1403 | ||||
| @@ -143,8 +128,7 @@ PASSED: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( h1 == h2 ) | ||||
| with expansion: | ||||
|   [1403 helper] == [1403 helper] | ||||
| @@ -181,8 +165,7 @@ due to unexpected exception with messages: | ||||
| Exception.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Exception.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Exception.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE_THROWS( thisThrows() ) | ||||
| with message: | ||||
|   answer := 42 | ||||
| @@ -193,8 +176,7 @@ with message: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( 42 == f ) | ||||
| with expansion: | ||||
|   42 == {?} | ||||
| @@ -205,38 +187,31 @@ with expansion: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( a == t ) | ||||
| with expansion: | ||||
|   3 == 3 | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   CHECK( a == t ) | ||||
| with expansion: | ||||
|   3 == 3 | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE_THROWS( throws_int(true) ) | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   CHECK_THROWS_AS( throws_int(true), int ) | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE_NOTHROW( throws_int(false) ) | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE_THAT( "aaa", Catch::EndsWith("aaa") ) | ||||
| with expansion: | ||||
|   "aaa" ends with: "aaa" | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( templated_tests<int>(3) ) | ||||
| with expansion: | ||||
|   true | ||||
| @@ -252,8 +227,7 @@ Misc.tests.cpp:<line number>: FAILED: | ||||
| with expansion: | ||||
|   1 == 0 | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( errno == 1 ) | ||||
| with expansion: | ||||
|   1 == 1 | ||||
| @@ -264,8 +238,7 @@ with expansion: | ||||
| Compilation.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Compilation.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Compilation.tests.cpp:<line number>: PASSED: | ||||
|   REQUIRE( x == 4 ) | ||||
| with expansion: | ||||
|   {?} == 4 | ||||
| @@ -279,8 +252,7 @@ with message: | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
| with message: | ||||
|   Everything is OK | ||||
|  | ||||
| @@ -291,8 +263,7 @@ with message: | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
| with message: | ||||
|   Everything is OK | ||||
|  | ||||
| @@ -303,8 +274,7 @@ with message: | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
| with message: | ||||
|   Everything is OK | ||||
|  | ||||
| @@ -315,8 +285,7 @@ with message: | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
| with message: | ||||
|   Everything is OK | ||||
|  | ||||
| @@ -327,8 +296,7 @@ with message: | ||||
| Misc.tests.cpp:<line number> | ||||
| ............................................................................... | ||||
|  | ||||
| Misc.tests.cpp:<line number>: | ||||
| PASSED: | ||||
| Misc.tests.cpp:<line number>: PASSED: | ||||
| with message: | ||||
|   Everything is OK | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user