3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to the self test

Browse Source
This commit is contained in:
Phil Nash 2010-12-28 14:41:57 +00:00
parent 1b96cec8f2
commit 36ff7ba720
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/ClassTests.cpp
View File

@ -51,7 +51,7 @@ TEST_CASE_METHOD( Fixture, "succeeding/Fixture/succeedingCase", "A method based
REQUIRE( m_a == 1 ); REQUIRE( m_a == 1 );
} }
TEST_CASE_METHOD( Fixture, "succeeding/Fixture/failingCase", "A method based test run that fails" ) TEST_CASE_METHOD( Fixture, "failing/Fixture/failingCase", "A method based test run that fails" )
{ {
REQUIRE( m_a == 2 ); REQUIRE( m_a == 2 );
} }

2
Test/MessageTests.cpp
View File

@ -26,7 +26,7 @@ TEST_CASE( "failing/message/info/1", "INFO gets logged on failure" )
REQUIRE( a == 1 ); REQUIRE( a == 1 );
} }
TEST_CASE( "failing/message/info/2", "INFO gets logged on failure" ) TEST_CASE( "mixed/message/info/2", "INFO gets logged on failure" )
{ {
INFO( "this message should be logged" ); INFO( "this message should be logged" );
int a = 2; int a = 2;

28
Test/MiscTests.cpp
View File

@ -36,7 +36,7 @@ TEST_CASE( "succeeding/Misc/Sections/nested", "nested SECTION tests" )
SECTION( "s1", "doesn't equal" ) SECTION( "s1", "doesn't equal" )
{ {
REQUIRE( a != b ); REQUIRE( a != b ) "a should not equal b";
REQUIRE( b != a ); REQUIRE( b != a );
SECTION( "s2", "not equal" ) SECTION( "s2", "not equal" )
@ -46,6 +46,32 @@ TEST_CASE( "succeeding/Misc/Sections/nested", "nested SECTION tests" )
} }
} }
TEST_CASE( "mixed/Misc/Sections/loops", "looped SECTION tests" )
{
int a = 1;
for( int b = 0; b < 10; ++b )
{
std::ostringstream oss;
oss << "b is currently: " << b;
SECTION( "s1", oss.str() )
{
CHECK( b > a );
}
}
}
TEST_CASE( "mixed/Misc/loops", "looped tests" )
{
static const int fib[] = { 1, 1, 2, 3, 5, 8, 13, 21 };
for( size_t i=0; i < sizeof(fib)/sizeof(int); ++i )
{
INFO( "Testing if fib[" << i << "] (" << fib[i] << ") is even" );
CHECK( ( fib[i] % 2 ) == 0 );
}
}
TEST_CASE( "succeeding/Misc/stdout,stderr", "Sends stuff to stdout and stderr" ) TEST_CASE( "succeeding/Misc/stdout,stderr", "Sends stuff to stdout and stderr" )
{ {
std::cout << "Some information"; std::cout << "Some information";

11
Test/TestMain.cpp
View File

@ -26,10 +26,11 @@ int main (int argc, char * const argv[])
std::ostringstream ossSucceeding; std::ostringstream ossSucceeding;
std::ostringstream ossFailing; std::ostringstream ossFailing;
ReporterConfig reporterConfig( ReporterConfig::Include::SuccessfulResults ); RunnerConfig config;
BasicReporter reporter (reporterConfig ); ReporterConfig& reporterConfig = config.getReporterConfig();
config.setReporter( new BasicReporter(reporterConfig ) );
Runner runner( &reporter ); reporterConfig.setIncludeWhat( ReporterConfig::Include::SuccessfulResults );
Runner runner( config );
reporterConfig.setStreamBuf( ossSucceeding.rdbuf() ); reporterConfig.setStreamBuf( ossSucceeding.rdbuf() );
runner.runMatching( "succeeding/*" ); runner.runMatching( "succeeding/*" );
@ -61,7 +62,7 @@ int main (int argc, char * const argv[])
if( result == 0 ) if( result == 0 )
{ {
const size_t expectedTestCaseCount = 102; // !TBD factor this out const size_t expectedTestCaseCount = 106; // !TBD factor this out
size_t testCaseCount = runner.getSuccessCount() + runner.getFailureCount(); size_t testCaseCount = runner.getSuccessCount() + runner.getFailureCount();
std::cout << "All " << testCaseCount << " tests completed successfully" << std::endl; std::cout << "All " << testCaseCount << " tests completed successfully" << std::endl;
if( testCaseCount != expectedTestCaseCount ) if( testCaseCount != expectedTestCaseCount )