catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Refactored new Session class to make it more friendly for custom client code
- Commit
a7e657fd9b9f505212cb9a7f55d5794b127ac3eb- Author
- Phil Nash ·
- Parents
c1196b6245f1
Changes
include/catch_runner.hpp | 92 +++++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 36 deletions(-) diff --git a/include/catch_runner.hpp b/include/catch_runner.hpp index 6d6c9f47..e856774e 100644 --- a/include/catch_runner.hpp +++ b/include/catch_runner.hpp @@ -126,7 +126,11 @@ namespace Catch { static bool alreadyInstantiated; public: - Session() { + + struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; }; + + Session() + : cli( makeCommandLineParser() ) { if( alreadyInstantiated ) { std::string msg = "Only one instance of Catch::Session can ever be used"; std::cerr << msg << std::endl; @@ -137,63 +141,79 @@ namespace Catch { ~Session() { Catch::cleanUp(); } - - int run( Ptr<Config> const& config ) { - try - { - Runner runner( config ); - // Handle list request - if( list( config ) ) - return 0; - - return static_cast<int>( runner.runTests().assertions.failed ); + int applyCommandLine( int argc, char* const argv[], OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) { + try { + unusedTokens = cli.parseInto( argc, argv, configData ); + if( unusedOptionBehaviour == OnUnusedOptions::Fail ) + enforceNoUsedTokens(); + if( configData.showHelp ) + showHelp( configData.processName ); + config.reset(); } catch( std::exception& ex ) { - std::cerr << ex.what() << std::endl; + std::cerr << "\nError in input:\n" + << " " << ex.what() << "\n\n"; + cli.usage( std::cout, configData.processName ); return (std::numeric_limits<int>::max)(); } + return 0; } - - Ptr<Config> processConfig( int argc, char* const argv[], ConfigData& configData ) { - Clara::CommandLine<ConfigData> cli = makeCommandLineParser(); - std::vector<Clara::Parser::Token> unused = cli.parseInto( argc, argv, configData ); - if( !unused.empty() ) { + + void useConfigData( ConfigData const& _configData ) { + configData = _configData; + config.reset(); + } + + void enforceNoUsedTokens() const { + if( !unusedTokens.empty() ) { std::vector<Clara::Parser::Token>::const_iterator - it = unused.begin(), - itEnd = unused.end(); + it = unusedTokens.begin(), + itEnd = unusedTokens.end(); std::string msg; for(; it != itEnd; ++it ) msg += " unrecognised option: " + it->data + "\n"; throw std::runtime_error( msg.substr( 0, msg.size()-1 ) ); } - Ptr<Config> config = new Config( configData ); - return config; } - Ptr<Config> processConfig( int argc, char* const argv[] ) { - ConfigData configData; - return processConfig( argc, argv, configData ); - } - int run( int argc, char* const argv[], ConfigData configData = ConfigData() ) { + + int run( int argc, char* const argv[] ) { - Ptr<Config> config; + int returnCode = applyCommandLine( argc, argv ); + if( returnCode == 0 ) + returnCode = run(); + return returnCode; + } - try { - config = processConfig( argc, argv, configData ); - if( config->showHelp() ) { - showHelp( config->getProcessName() ); + int run() { + if( configData.showHelp ) + return 0; + + try + { + if( !config ) + config = new Config( configData ); + Runner runner( config ); + + // Handle list request + if( list( config ) ) return 0; - } + + return static_cast<int>( runner.runTests().assertions.failed ); } catch( std::exception& ex ) { - std::cerr << "\nError in input:\n" - << " " << ex.what() << "\n\n"; - makeCommandLineParser().usage( std::cout, configData.processName ); + std::cerr << ex.what() << std::endl; return (std::numeric_limits<int>::max)(); } - return run( config ); } + + private: + Clara::CommandLine<ConfigData> cli; + std::vector<Clara::Parser::Token> unusedTokens; + ConfigData configData; + Ptr<Config> config; }; + bool Session::alreadyInstantiated = false; } // end namespace Catch