cheng/Catch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trim paths in approval tests down to filenames

Browse Source
This commit is contained in:
Phil Nash 2013-09-30 07:39:06 +01:00
parent 2f7a296897
commit 1e74938538
5 changed files with 1325 additions and 1323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,10 @@ Run with -? for options
-------------------------------------------------------------------------------
./failing/TestClass/failingCase
-------------------------------------------------------------------------------
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
...............................................................................
ClassTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
REQUIRE( s == "world" )
with expansion:
"hello" == "world"
@ -17,10 +17,10 @@ with expansion:
-------------------------------------------------------------------------------
./failing/Fixture/failingCase
-------------------------------------------------------------------------------
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
...............................................................................
ClassTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
REQUIRE( m_a == 2 )
with expansion:
1 == 2
@ -28,70 +28,70 @@ with expansion:
-------------------------------------------------------------------------------
./failing/conditions/equality
-------------------------------------------------------------------------------
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
...............................................................................
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven == 6 )
with expansion:
7 == 6
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven == 8 )
with expansion:
7 == 8
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven == 0 )
with expansion:
7 == 0
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one == Approx( 9.11f ) )
with expansion:
9.1 == Approx( 9.11 )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one == Approx( 9.0f ) )
with expansion:
9.1 == Approx( 9 )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one == Approx( 1 ) )
with expansion:
9.1 == Approx( 1 )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one == Approx( 0 ) )
with expansion:
9.1 == Approx( 0 )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.double_pi == Approx( 3.1415 ) )
with expansion:
3.1415926535 == Approx( 3.1415 )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello == "goodbye" )
with expansion:
"hello" == "goodbye"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello == "hell" )
with expansion:
"hello" == "hell"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello == "hello1" )
with expansion:
"hello" == "hello1"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello.size() == 6 )
with expansion:
5 == 6
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( x == Approx( 1.301 ) )
with expansion:
1.3 == Approx( 1.301 )
@ -99,30 +99,30 @@ with expansion:
-------------------------------------------------------------------------------
./failing/conditions/inequality
-------------------------------------------------------------------------------
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
...............................................................................
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven != 7 )
with expansion:
7 != 7
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one != Approx( 9.1f ) )
with expansion:
9.1 != Approx( 9.1 )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.double_pi != Approx( 3.1415926535 ) )
with expansion:
3.1415926535 != Approx( 3.14159 )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello != "hello" )
with expansion:
"hello" != "hello"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello.size() != 5 )
with expansion:
5 != 5
@ -130,100 +130,100 @@ with expansion:
-------------------------------------------------------------------------------
./failing/conditions/ordered
-------------------------------------------------------------------------------
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
...............................................................................
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven > 7 )
with expansion:
7 > 7
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven < 7 )
with expansion:
7 < 7
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven > 8 )
with expansion:
7 > 8
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven < 6 )
with expansion:
7 < 6
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven < 0 )
with expansion:
7 < 0
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven < -1 )
with expansion:
7 < -1
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven >= 8 )
with expansion:
7 >= 8
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven <= 6 )
with expansion:
7 <= 6
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one < 9 )
with expansion:
9.1 < 9
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one > 10 )
with expansion:
9.1 > 10
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.float_nine_point_one > 9.2 )
with expansion:
9.1 > 9.2
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello > "hello" )
with expansion:
"hello" > "hello"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello < "hello" )
with expansion:
"hello" < "hello"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello > "hellp" )
with expansion:
"hello" > "hellp"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello > "z" )
with expansion:
"hello" > "z"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello < "hellm" )
with expansion:
"hello" < "hellm"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello < "a" )
with expansion:
"hello" < "a"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello >= "z" )
with expansion:
"hello" >= "z"
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.str_hello <= "a" )
with expansion:
"hello" <= "a"
@ -231,39 +231,39 @@ with expansion:
-------------------------------------------------------------------------------
./failing/conditions/not
-------------------------------------------------------------------------------
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
...............................................................................
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( false != false )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( true != true )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( !true )
with expansion:
false
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK_FALSE( true )
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( !trueValue )
with expansion:
false
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK_FALSE( trueValue )
with expansion:
!true
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( !(1 == 1) )
with expansion:
false
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK_FALSE( 1 == 1 )
with expansion:
!(1 == 1)
@ -271,19 +271,19 @@ with expansion:
-------------------------------------------------------------------------------
./failing/exceptions/explicit
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
CHECK_THROWS_AS( thisThrows() )
due to unexpected exception with message:
expected exception
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
CHECK_THROWS_AS( thisDoesntThrow() )
because no exception was thrown where one was expected:
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
CHECK_NOTHROW( thisThrows() )
due to unexpected exception with message:
expected exception
@ -291,20 +291,20 @@ due to unexpected exception with message:
-------------------------------------------------------------------------------
./failing/exceptions/implicit
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
due to unexpected exception with message:
unexpected exception
-------------------------------------------------------------------------------
./failing/exceptions/implicit/2
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
{Unknown expression after the reported line}
due to unexpected exception with message:
unexpected exception
@ -313,20 +313,20 @@ due to unexpected exception with message:
./failing/exceptions/implicit/3
section name
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
due to unexpected exception with message:
unexpected exception
-------------------------------------------------------------------------------
./failing/exceptions/implicit/4
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
CHECK( thisThrows() == 0 )
due to unexpected exception with message:
expected exception
@ -334,20 +334,20 @@ due to unexpected exception with message:
-------------------------------------------------------------------------------
./failing/exceptions/custom
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
due to unexpected exception with message:
custom exception
-------------------------------------------------------------------------------
./failing/exceptions/custom/nothrow
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
REQUIRE_NOTHROW( throwCustom() )
due to unexpected exception with message:
custom exception - not std
@ -355,10 +355,10 @@ due to unexpected exception with message:
-------------------------------------------------------------------------------
./failing/exceptions/custom/throw
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
REQUIRE_THROWS_AS( throwCustom() )
due to unexpected exception with message:
custom exception - not std
@ -366,20 +366,20 @@ due to unexpected exception with message:
-------------------------------------------------------------------------------
./failing/exceptions/custom/double
-------------------------------------------------------------------------------
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
...............................................................................
ExceptionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
due to unexpected exception with message:
3.14
-------------------------------------------------------------------------------
./failing/message/info/1
-------------------------------------------------------------------------------
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
...............................................................................
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
REQUIRE( a == 1 )
with expansion:
2 == 1
@ -390,10 +390,10 @@ with messages:
-------------------------------------------------------------------------------
./mixed/message/info/2
-------------------------------------------------------------------------------
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
...............................................................................
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
CHECK( a == 1 )
with expansion:
2 == 1
@ -401,7 +401,7 @@ with messages:
this message may be logged later
this message should be logged
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
CHECK( a == 0 )
with expansion:
2 == 0
@ -411,10 +411,10 @@ with message:
-------------------------------------------------------------------------------
./failing/message/fail
-------------------------------------------------------------------------------
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
...............................................................................
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
explicitly with message:
This is a failure
@ -422,10 +422,10 @@ explicitly with message:
./failing/message/sections
one
-------------------------------------------------------------------------------
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
...............................................................................
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
explicitly with message:
Message from section one
@ -433,10 +433,10 @@ explicitly with message:
./failing/message/sections
two
-------------------------------------------------------------------------------
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
...............................................................................
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
explicitly with message:
Message from section two
@ -445,10 +445,10 @@ Message from section two
-------------------------------------------------------------------------------
./mixed/message/scoped
-------------------------------------------------------------------------------
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
...............................................................................
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
REQUIRE( i < 10 )
with expansion:
10 < 10
@ -459,10 +459,10 @@ with messages:
-------------------------------------------------------------------------------
just failure
-------------------------------------------------------------------------------
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
...............................................................................
MessageTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
explicitly with message:
Previous info should not be seen
@ -471,10 +471,10 @@ explicitly with message:
s1
s2
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
REQUIRE( a == b )
with expansion:
1 == 2
@ -483,10 +483,10 @@ with expansion:
./mixed/Misc/Sections/loops
s1
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK( b > a )
with expansion:
0 > 1
@ -494,45 +494,45 @@ with expansion:
-------------------------------------------------------------------------------
./mixed/Misc/loops
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
with message:
Testing if fib[0] (1) is even
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
with message:
Testing if fib[1] (1) is even
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
with message:
Testing if fib[3] (3) is even
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
with message:
Testing if fib[4] (5) is even
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
with message:
Testing if fib[6] (13) is even
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK( ( fib[i] % 2 ) == 0 )
with expansion:
1 == 0
@ -544,10 +544,10 @@ An error
-------------------------------------------------------------------------------
./failing/info
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
REQUIRE( false )
with messages:
hi
@ -556,15 +556,15 @@ with messages:
-------------------------------------------------------------------------------
./failing/checkedif
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECKED_IF( flag )
with expansion:
false
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
REQUIRE( testCheckedIf( false ) )
with expansion:
false
@ -572,15 +572,15 @@ with expansion:
-------------------------------------------------------------------------------
./failing/checkedelse
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECKED_ELSE( flag )
with expansion:
false
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
REQUIRE( testCheckedElse( false ) )
with expansion:
false
@ -588,10 +588,10 @@ with expansion:
-------------------------------------------------------------------------------
./manual/onechar
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
REQUIRE( false )
with message:
3
@ -599,10 +599,10 @@ with message:
-------------------------------------------------------------------------------
./failing/matchers/Contains
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK_THAT( testStringForMatching() Contains( "not there" ) )
with expansion:
"this string contains 'abc' as a substring" contains: "not there"
@ -610,10 +610,10 @@ with expansion:
-------------------------------------------------------------------------------
./failing/matchers/StartsWith
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
with expansion:
"this string contains 'abc' as a substring" starts with: "string"
@ -621,10 +621,10 @@ with expansion:
-------------------------------------------------------------------------------
./failing/matchers/EndsWith
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
with expansion:
"this string contains 'abc' as a substring" ends with: "this"
@ -632,10 +632,10 @@ with expansion:
-------------------------------------------------------------------------------
./failing/matchers/Equals
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
CHECK_THAT( testStringForMatching() Equals( "something else" ) )
with expansion:
"this string contains 'abc' as a substring" equals: "something else"
@ -643,30 +643,30 @@ with expansion:
-------------------------------------------------------------------------------
./failing/CatchSectionInfiniteLoop
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
explicitly with message:
to infinity and beyond
-------------------------------------------------------------------------------
./failing/CatchSectionInfiniteLoop
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
explicitly with message:
to infinity and beyond
-------------------------------------------------------------------------------
./failing/CatchSectionInfiniteLoop
-------------------------------------------------------------------------------
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
...............................................................................
MiscTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
explicitly with message:
to infinity and beyond
@ -683,15 +683,15 @@ hello
-------------------------------------------------------------------------------
./failing/Tricky/non streamable type
-------------------------------------------------------------------------------
TrickyTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
...............................................................................
TrickyTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
CHECK( &o1 == &o2 )
with expansion:
0x<hex digits> == 0x<hex digits>
TrickyTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
CHECK( o1 == o2 )
with expansion:
{?} == {?}
@ -699,10 +699,10 @@ with expansion:
-------------------------------------------------------------------------------
./failing/string literals
-------------------------------------------------------------------------------
TrickyTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
...............................................................................
TrickyTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
REQUIRE( std::string( "first" ) == "second" )
with expansion:
"first" == "second"

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

File diff suppressed because it is too large Load Diff

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

@ -6,40 +6,40 @@ Run with -? for options
-------------------------------------------------------------------------------
./succeeding/Approx/simple
-------------------------------------------------------------------------------
ApproxTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
...............................................................................
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d == Approx( 1.23 ) )
with expansion:
1.23 == Approx( 1.23 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d != Approx( 1.22 ) )
with expansion:
1.23 != Approx( 1.22 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d != Approx( 1.24 ) )
with expansion:
1.23 != Approx( 1.24 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( Approx( d ) == 1.23 )
with expansion:
Approx( 1.23 ) == 1.23
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( Approx( d ) != 1.22 )
with expansion:
Approx( 1.23 ) != 1.22
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( Approx( d ) != 1.24 )
with expansion:
@ -48,16 +48,16 @@ with expansion:
-------------------------------------------------------------------------------
./succeeding/Approx/epsilon
-------------------------------------------------------------------------------
ApproxTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
...............................................................................
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d != Approx( 1.231 ) )
with expansion:
1.23 != Approx( 1.231 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
with expansion:
@ -66,16 +66,16 @@ with expansion:
-------------------------------------------------------------------------------
./succeeding/Approx/float
-------------------------------------------------------------------------------
ApproxTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
...............................................................................
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 1.23f == Approx( 1.23f ) )
with expansion:
1.23 == Approx( 1.23 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 0.0f == Approx( 0.0f ) )
with expansion:
@ -84,48 +84,48 @@ with expansion:
-------------------------------------------------------------------------------
./succeeding/Approx/int
-------------------------------------------------------------------------------
ApproxTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
...............................................................................
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 1 == Approx( 1 ) )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 0 == Approx( 0 ) )
-------------------------------------------------------------------------------
./succeeding/Approx/mixed
-------------------------------------------------------------------------------
ApproxTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
...............................................................................
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 1.0f == Approx( 1 ) )
with expansion:
1 == Approx( 1 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 0 == Approx( dZero) )
with expansion:
0 == Approx( 0 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
with expansion:
0 == Approx( 1e-05 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( 1.234f == Approx( dMedium ) )
with expansion:
1.234 == Approx( 1.234 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( dMedium == Approx( 1.234f ) )
with expansion:
@ -134,52 +134,52 @@ with expansion:
-------------------------------------------------------------------------------
./succeeding/Approx/custom
-------------------------------------------------------------------------------
ApproxTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
...............................................................................
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d == approx( 1.23 ) )
with expansion:
1.23 == Approx( 1.23 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d == approx( 1.22 ) )
with expansion:
1.23 == Approx( 1.22 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d == approx( 1.24 ) )
with expansion:
1.23 == Approx( 1.24 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( d != approx( 1.25 ) )
with expansion:
1.23 != Approx( 1.25 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( approx( d ) == 1.23 )
with expansion:
Approx( 1.23 ) == 1.23
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( approx( d ) == 1.22 )
with expansion:
Approx( 1.23 ) == 1.22
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( approx( d ) == 1.24 )
with expansion:
Approx( 1.23 ) == 1.24
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( approx( d ) != 1.25 )
with expansion:
@ -188,16 +188,16 @@ with expansion:
-------------------------------------------------------------------------------
Approximate PI
-------------------------------------------------------------------------------
ApproxTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
...............................................................................
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) )
with expansion:
3.1428571429 == Approx( 3.141 )
ApproxTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
PASSED:
REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
with expansion:
@ -206,10 +206,10 @@ with expansion:
-------------------------------------------------------------------------------
./succeeding/TestClass/succeedingCase
-------------------------------------------------------------------------------
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
...............................................................................
ClassTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp:
PASSED:
REQUIRE( s == "hello" )
with expansion:
@ -218,10 +218,10 @@ with expansion:
-------------------------------------------------------------------------------
./failing/TestClass/failingCase
-------------------------------------------------------------------------------
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
...............................................................................
ClassTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
REQUIRE( s == "world" )
with expansion:
"hello" == "world"
@ -229,10 +229,10 @@ with expansion:
-------------------------------------------------------------------------------
./succeeding/Fixture/succeedingCase
-------------------------------------------------------------------------------
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
...............................................................................
ClassTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp:
PASSED:
REQUIRE( m_a == 1 )
with expansion:
@ -241,10 +241,10 @@ with expansion:
-------------------------------------------------------------------------------
./failing/Fixture/failingCase
-------------------------------------------------------------------------------
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
...............................................................................
ClassTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
REQUIRE( m_a == 2 )
with expansion:
1 == 2
@ -252,46 +252,46 @@ with expansion:
-------------------------------------------------------------------------------
./succeeding/conditions/equality
-------------------------------------------------------------------------------
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
...............................................................................
ConditionTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
PASSED:
REQUIRE( data.int_seven == 7 )
with expansion:
7 == 7
ConditionTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
PASSED:
REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
with expansion:
9.1 == Approx( 9.1 )
ConditionTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
PASSED:
REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
with expansion:
3.1415926535 == Approx( 3.14159 )
ConditionTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
PASSED:
REQUIRE( data.str_hello == "hello" )
with expansion:
"hello" == "hello"
ConditionTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
PASSED:
REQUIRE( "hello" == data.str_hello )
with expansion:
"hello" == "hello"
ConditionTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
PASSED:
REQUIRE( data.str_hello.size() == 5 )
with expansion:
5 == 5
ConditionTests.cpp:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
PASSED:
REQUIRE( x == Approx( 1.3 ) )
with expansion:
@ -300,15 +300,15 @@ with expansion:
-------------------------------------------------------------------------------
./failing/conditions/equality
-------------------------------------------------------------------------------
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
...............................................................................
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven == 6 )
with expansion:
7 == 6
ConditionTests.cpp: FAILED:
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
CHECK( data.int_seven == 8 )
with expansion:
7 == 8

180
projects/SelfTest/Baselines/junit.sw.approved.txt
View File

@ -10,133 +10,133 @@
<testcase classname="TestClass" name="./succeeding/TestClass/succeedingCase" time="{duration}"/>
<testcase classname="TestClass" name="./failing/TestClass/failingCase" time="{duration}">
<failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
</failure>
</testcase>
<testcase classname="Fixture" name="./succeeding/Fixture/succeedingCase" time="{duration}"/>
<testcase classname="Fixture" name="./failing/Fixture/failingCase" time="{duration}">
<failure message="1 == 2" type="REQUIRE">
ClassTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/conditions/equality" time="{duration}"/>
<testcase classname="global" name="./failing/conditions/equality" time="{duration}">
<failure message="7 == 6" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 == 8" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 == 0" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 == Approx( 9.11 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 == Approx( 9 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 == Approx( 1 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 == Approx( 0 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="3.1415926535 == Approx( 3.1415 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; == &quot;goodbye&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; == &quot;hell&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; == &quot;hello1&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="5 == 6" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="1.3 == Approx( 1.301 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/conditions/inequality" time="{duration}"/>
<testcase classname="global" name="./failing/conditions/inequality" time="{duration}">
<failure message="7 != 7" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 != Approx( 9.1 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="3.1415926535 != Approx( 3.14159 )" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; != &quot;hello&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="5 != 5" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/conditions/ordered" time="{duration}"/>
<testcase classname="global" name="./failing/conditions/ordered" time="{duration}">
<failure message="7 > 7" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 &lt; 7" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 > 8" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 &lt; 6" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 &lt; 0" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 &lt; -1" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 >= 8" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="7 &lt;= 6" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 &lt; 9" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 > 10" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="9.1 > 9.2" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; > &quot;hello&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; &lt; &quot;hello&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; > &quot;hellp&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; > &quot;z&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; &lt; &quot;hellm&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; &lt; &quot;a&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; >= &quot;z&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="&quot;hello&quot; &lt;= &quot;a&quot;" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/conditions/int literals" time="{duration}"/>
@ -148,90 +148,90 @@ ConditionTests.cpp
<testcase classname="global" name="./succeeding/conditions/not" time="{duration}"/>
<testcase classname="global" name="./failing/conditions/not" time="{duration}">
<failure message="false != false" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="true != true" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="false" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="!true" type="CHECK_FALSE">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="false" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="!true" type="CHECK_FALSE">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="false" type="CHECK">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
<failure message="!(1 == 1)" type="CHECK_FALSE">
ConditionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/exceptions/explicit" time="{duration}"/>
<testcase classname="global" name="./failing/exceptions/explicit" time="{duration}">
<error message="thisThrows()" type="CHECK_THROWS_AS">
expected exception
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
<failure message="thisDoesntThrow()" type="CHECK_THROWS_AS">
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</failure>
<error message="thisThrows()" type="CHECK_NOTHROW">
expected exception
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./failing/exceptions/implicit" time="{duration}">
<error type="TEST_CASE">
unexpected exception
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./failing/exceptions/implicit/2" time="{duration}">
<error message="{Unknown expression after the reported line}">
unexpected exception
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="./failing/exceptions/implicit/3" name="section name" time="{duration}">
<error type="TEST_CASE">
unexpected exception
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./failing/exceptions/implicit/4" time="{duration}">
<error message="thisThrows() == 0" type="CHECK">
expected exception
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./failing/exceptions/custom" time="{duration}">
<error type="TEST_CASE">
custom exception
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./failing/exceptions/custom/nothrow" time="{duration}">
<error message="throwCustom()" type="REQUIRE_NOTHROW">
custom exception - not std
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./failing/exceptions/custom/throw" time="{duration}">
<error message="throwCustom()" type="REQUIRE_THROWS_AS">
custom exception - not std
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./failing/exceptions/custom/double" time="{duration}">
<error type="TEST_CASE">
3.14
ExceptionTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
</error>
</testcase>
<testcase classname="global" name="./succeeding/exceptions/notimplemented" time="{duration}"/>
@ -243,35 +243,35 @@ ExceptionTests.cpp
<failure message="2 == 1" type="REQUIRE">
this message should be logged
so should this
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./mixed/message/info/2" time="{duration}">
<failure message="2 == 1" type="CHECK">
this message should be logged
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
<failure message="2 == 0" type="CHECK">
and this, but later
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./failing/message/fail" time="{duration}">
<failure type="FAIL">
This is a failure
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
</testcase>
<testcase classname="./failing/message/sections" name="one" time="{duration}">
<failure type="FAIL">
Message from section one
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
</testcase>
<testcase classname="./failing/message/sections" name="two" time="{duration}">
<failure type="FAIL">
Message from section two
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
</testcase>
<testcase classname="./succeeding/message/sections/stdout" name="two" time="{duration}">
@ -284,14 +284,14 @@ Message from section two
<failure message="10 &lt; 10" type="REQUIRE">
current counter 10
i := 10
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/nofail" time="{duration}"/>
<testcase classname="global" name="just failure" time="{duration}">
<failure type="FAIL">
Previous info should not be seen
MessageTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
</failure>
</testcase>
<testcase classname="./succeeding/Misc/Sections" name="s1" time="{duration}"/>
@ -300,40 +300,40 @@ MessageTests.cpp
<testcase classname="./succeeding/Misc/Sections/nested" name="s1/s2" time="{duration}"/>
<testcase classname="./mixed/Misc/Sections/nested2" name="s1/s2" time="{duration}">
<failure message="1 == 2" type="REQUIRE">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="./mixed/Misc/Sections/nested2" name="s1/s3" time="{duration}"/>
<testcase classname="./mixed/Misc/Sections/nested2" name="s1/s4" time="{duration}"/>
<testcase classname="./mixed/Misc/Sections/loops" name="s1" time="{duration}">
<failure message="0 > 1" type="CHECK">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./mixed/Misc/loops" time="{duration}">
<failure message="1 == 0" type="CHECK">
Testing if fib[0] (1) is even
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure message="1 == 0" type="CHECK">
Testing if fib[1] (1) is even
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure message="1 == 0" type="CHECK">
Testing if fib[3] (3) is even
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure message="1 == 0" type="CHECK">
Testing if fib[4] (5) is even
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure message="1 == 0" type="CHECK">
Testing if fib[6] (13) is even
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure message="1 == 0" type="CHECK">
Testing if fib[7] (21) is even
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/Misc/stdout,stderr" time="{duration}">
@ -349,53 +349,53 @@ An error
<failure message="false" type="REQUIRE">
hi
i := 7
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/checkedif" time="{duration}"/>
<testcase classname="global" name="./failing/checkedif" time="{duration}">
<failure message="false" type="CHECKED_IF">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure message="false" type="REQUIRE">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/checkedelse" time="{duration}"/>
<testcase classname="global" name="./failing/checkedelse" time="{duration}">
<failure message="false" type="CHECKED_ELSE">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure message="false" type="REQUIRE">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./manual/onechar" time="{duration}">
<failure message="false" type="REQUIRE">
3
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/atomic if" time="{duration}"/>
<testcase classname="global" name="./succeeding/matchers" time="{duration}"/>
<testcase classname="global" name="./failing/matchers/Contains" time="{duration}">
<failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;" type="CHECK_THAT">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./failing/matchers/StartsWith" time="{duration}">
<failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;" type="CHECK_THAT">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./failing/matchers/EndsWith" time="{duration}">
<failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;" type="CHECK_THAT">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./failing/matchers/Equals" time="{duration}">
<failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;" type="CHECK_THAT">
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="global" name="string" time="{duration}"/>
@ -413,15 +413,15 @@ MiscTests.cpp
<testcase classname="./failing/CatchSectionInfiniteLoop" name="root" time="{duration}">
<failure type="FAIL">
to infinity and beyond
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure type="FAIL">
to infinity and beyond
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
<failure type="FAIL">
to infinity and beyond
MiscTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
</failure>
</testcase>
<testcase classname="./failing/CatchSectionInfiniteLoop" name="Outer/Inner" time="{duration}"/>
@ -496,15 +496,15 @@ hello
<testcase classname="global" name="./inprogress/failing/Tricky/compound lhs" time="{duration}"/>
<testcase classname="global" name="./failing/Tricky/non streamable type" time="{duration}">
<failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
TrickyTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
</failure>
<failure message="{?} == {?}" type="CHECK">
TrickyTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./failing/string literals" time="{duration}">
<failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
TrickyTests.cpp
Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
</failure>
</testcase>
<testcase classname="global" name="./succeeding/side-effects" time="{duration}"/>

10
scripts/approvalTests.py
View File

@ -5,7 +5,9 @@ import re
from scriptCommon import catchPath
filenameParser = re.compile( r'\s*.*/(.*\..pp):([0-9]*)(.*)' )
rootPath = os.path.join( catchPath, 'projects/SelfTest/Baselines' )
filenameParser = re.compile( r'.*?/(.*\..pp):([0-9]*)(.*)' )
lineNumberParser = re.compile( r'(.*)line="[0-9]*"(.*)' )
hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
durationsParser = re.compile( r'(.*)time="[0-9]*\.[0-9]*"(.*)' )
@ -40,9 +42,9 @@ def filterLine( line ):
def approve( baseName, args ):
global overallResult
args[0:0] = [cmdPath]
baselinesPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/{0}.approved.txt'.format( baseName ) )
rawResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/_{0}.tmp'.format( baseName ) )
filteredResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/{0}.unapproved.txt'.format( baseName ) )
baselinesPath = os.path.join( rootPath, '{0}.approved.txt'.format( baseName ) )
rawResultsPath = os.path.join( rootPath, '_{0}.tmp'.format( baseName ) )
filteredResultsPath = os.path.join( rootPath, '{0}.unapproved.txt'.format( baseName ) )
f = open( rawResultsPath, 'w' )
subprocess.call( args, stdout=f, stderr=f )