Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/Test/TestMain.cpp
diff options
context:
space:
mode:
authorPhil Nash2011-01-14 16:21:11 +0000
committerPhil Nash2011-01-14 16:21:11 +0000
commit6c010e25d92c98c524aaa0272e4a51a49a5599d8 (patch)
treeb056afb50ceaa0decab0a0b7ebc554e0651b0616 /Test/TestMain.cpp
parent684baf105378fc5a90cbebd9e5c7e8898989983e (diff)
downloadcatch3-6c010e25d92c98c524aaa0272e4a51a49a5599d8.tar.gz
A single embedded runner instance can now be used for multiple nested runs, with results reset between each. Meta test runner looking very clean now.
Diffstat (limited to 'Test/TestMain.cpp')
-rw-r--r--Test/TestMain.cpp53
1 files changed, 7 insertions, 46 deletions
diff --git a/Test/TestMain.cpp b/Test/TestMain.cpp
index 910aa094..0f9706e5 100644
--- a/Test/TestMain.cpp
+++ b/Test/TestMain.cpp
@@ -17,53 +17,14 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results"
{
using namespace Catch;
- {
- EmbeddedRunner runner;
- runner.runMatching( "./succeeding/*" );
- CHECK( runner.getReporter().getSucceeded() == 53 );
- CHECK( runner.getReporter().getFailed() == 0 );
- }
- {
- EmbeddedRunner runner;
- runner.runMatching( "./failing/*" );
-
- CHECK( runner.getReporter().getSucceeded() == 0 );
- CHECK( runner.getReporter().getFailed() == 53 );
- }
-}
+ EmbeddedRunner runner;
-TEST_CASE( "selftest/succeeding", "Runs all Catch self tests that should succeed and checks their results" )
-{
- using namespace Catch;
-
- // Run a nested Runner - we scope it here so it restores our runner
- // at the end of scope
- {
- SelfTestConfig config;
- {
- Runner runner( config );
- runner.runMatching( "./succeeding/*" );
- }
-
- CHECK( config.getReporter().getSucceeded() == 53 );
- CHECK( config.getReporter().getFailed() == 0 );
- }
-}
+ runner.runMatching( "./succeeding/*" );
+ CHECK( runner.getReporter().getSucceeded() == 53 );
+ CHECK( runner.getReporter().getFailed() == 0 );
-TEST_CASE( "selftest/failing", "Runs all Catch self tests that should fail and checks their results" )
-{
- using namespace Catch;
-
- // Run a nested Runner - we scope it here so it restores our runner
- // at the end of scope
- {
- SelfTestConfig config;
- {
- Runner runner( config );
- runner.runMatching( "./failing/*" );
- }
+ runner.runMatching( "./failing/*" );
- CHECK( config.getReporter().getSucceeded() == 0 );
- CHECK( config.getReporter().getFailed() == 53 );
- }
+ CHECK( runner.getReporter().getSucceeded() == 0 );
+ CHECK( runner.getReporter().getFailed() == 53 );
}