Merge ../../Catch

This commit is contained in:
Phil Nash
2011-09-19 18:20:11 +01:00
3 changed files with 10 additions and 6 deletions

View File

@@ -241,6 +241,8 @@ TEST_CASE( "./succeeding/conditions/not",
{
bool falseValue = false;
REQUIRE( false == false );
REQUIRE( true == true );
REQUIRE( !false );
REQUIRE_FALSE( false );
@@ -256,6 +258,8 @@ TEST_CASE( "./failing/conditions/not",
{
bool trueValue = true;
CHECK( false != false );
CHECK( true != true );
CHECK( !true );
CHECK_FALSE( true );

View File

@@ -47,7 +47,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
"Number of 'succeeding' tests is fixed" )
{
runner.runMatching( "./succeeding/*" );
CHECK( runner.getSuccessCount() == 257 );
CHECK( runner.getSuccessCount() == 259 );
CHECK( runner.getFailureCount() == 0 );
}
@@ -56,7 +56,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
{
runner.runMatching( "./failing/*" );
CHECK( runner.getSuccessCount() == 0 );
CHECK( runner.getFailureCount() == 60 );
CHECK( runner.getFailureCount() == 62 );
}
}
}