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

Refactored new Session class to make it more friendly for custom client code

Browse Source
This commit is contained in:
Phil Nash 2013-06-06 18:51:24 +01:00
parent c1196b6245
commit a7e657fd9b
1 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
include/catch_runner.hpp
View File

@ -126,7 +126,11 @@ namespace Catch {
static bool alreadyInstantiated; static bool alreadyInstantiated;
public: public:
Session() {
struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; };
Session()
: cli( makeCommandLineParser() ) {
if( alreadyInstantiated ) { if( alreadyInstantiated ) {
std::string msg = "Only one instance of Catch::Session can ever be used"; std::string msg = "Only one instance of Catch::Session can ever be used";
std::cerr << msg << std::endl; std::cerr << msg << std::endl;
@ -138,9 +142,57 @@ namespace Catch {
Catch::cleanUp(); Catch::cleanUp();
} }
int run( Ptr<Config> const& config ) { 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 << "\nError in input:\n"
<< " " << ex.what() << "\n\n";
cli.usage( std::cout, configData.processName );
return (std::numeric_limits<int>::max)();
}
return 0;
}
void useConfigData( ConfigData const& _configData ) {
configData = _configData;
config.reset();
}
void enforceNoUsedTokens() const {
if( !unusedTokens.empty() ) {
std::vector<Clara::Parser::Token>::const_iterator
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 ) );
}
}
int run( int argc, char* const argv[] ) {
int returnCode = applyCommandLine( argc, argv );
if( returnCode == 0 )
returnCode = run();
return returnCode;
}
int run() {
if( configData.showHelp )
return 0;
try try
{ {
if( !config )
config = new Config( configData );
Runner runner( config ); Runner runner( config );
// Handle list request // Handle list request
@ -155,45 +207,13 @@ namespace Catch {
} }
} }
Ptr<Config> processConfig( int argc, char* const argv[], ConfigData& configData ) { private:
Clara::CommandLine<ConfigData> cli = makeCommandLineParser(); Clara::CommandLine<ConfigData> cli;
std::vector<Clara::Parser::Token> unused = cli.parseInto( argc, argv, configData ); std::vector<Clara::Parser::Token> unusedTokens;
if( !unused.empty() ) {
std::vector<Clara::Parser::Token>::const_iterator
it = unused.begin(),
itEnd = unused.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; ConfigData configData;
return processConfig( argc, argv, configData );
}
int run( int argc, char* const argv[], ConfigData configData = ConfigData() ) {
Ptr<Config> config; Ptr<Config> config;
try {
config = processConfig( argc, argv, configData );
if( config->showHelp() ) {
showHelp( config->getProcessName() );
return 0;
}
}
catch( std::exception& ex ) {
std::cerr << "\nError in input:\n"
<< " " << ex.what() << "\n\n";
makeCommandLineParser().usage( std::cout, configData.processName );
return (std::numeric_limits<int>::max)();
}
return run( config );
}
}; };
bool Session::alreadyInstantiated = false; bool Session::alreadyInstantiated = false;
} // end namespace Catch } // end namespace Catch