3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clara: formatting and code tweaks

This commit is contained in:
Phil Nash 2013-05-23 19:01:10 +01:00
parent b7632659f5
commit ab6dd55fcf
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
projects/SelfTest/CmdLineTests.cpp
View File

@ -422,14 +422,11 @@ namespace Clara {
void usage( std::ostream& os, std::string const& procName ) const { void usage( std::ostream& os, std::string const& procName ) const {
os << "usage:\n"; os << "usage:\n " << procName << " ";
os << " " << procName << " ";
argSynopsis( os ); argSynopsis( os );
if( !m_options.empty() ) { if( !m_options.empty() ) {
os << " [options]\n\n"; os << " [options]\n\nwhere options are: \n";
os << "where options are: \n"; optUsage( os, 2 );
optUsage( os, 2 );
} }
os << "\n"; os << "\n";
} }
@ -561,19 +558,19 @@ TEST_CASE( "cmdline" ) {
.longOpt( "output" ) .longOpt( "output" )
.argName( "filename" ); .argName( "filename" );
SECTION( "plain filename" ) { SECTION( "arg separated by spaces" ) {
const char* argv[] = { "test", "-o filename.ext" }; const char* argv[] = { "test", "-o filename.ext" };
parseInto( cli, argv, config ); parseInto( cli, argv, config );
CHECK( config.fileName == "filename.ext" ); CHECK( config.fileName == "filename.ext" );
} }
SECTION( "plain filename with colon" ) { SECTION( "arg separated by colon" ) {
const char* argv[] = { "test", "-o:filename.ext" }; const char* argv[] = { "test", "-o:filename.ext" };
parseInto( cli, argv, config ); parseInto( cli, argv, config );
CHECK( config.fileName == "filename.ext" ); CHECK( config.fileName == "filename.ext" );
} }
SECTION( "plain filename with =" ) { SECTION( "arg separated by =" ) {
const char* argv[] = { "test", "-o=filename.ext" }; const char* argv[] = { "test", "-o=filename.ext" };
parseInto( cli, argv, config ); parseInto( cli, argv, config );
@ -765,7 +762,7 @@ SCENARIO( "New Catch commandline interface", "[cli]" ) {
.describe( "reporter to use - defaults to console" ) .describe( "reporter to use - defaults to console" )
.shortOpt( "r") .shortOpt( "r")
.longOpt( "reporter" ) .longOpt( "reporter" )
.argName( "reporter name[:filename]" ); .argName( "name[:filename]" );
cli.bind( &Config::suiteName ) cli.bind( &Config::suiteName )
.describe( "suite name" ) .describe( "suite name" )
@ -843,25 +840,6 @@ SCENARIO( "New Catch commandline interface", "[cli]" ) {
REQUIRE( config.testsOrTags[0] == "[hello]" ); REQUIRE( config.testsOrTags[0] == "[hello]" );
} }
} }
} }
// !TBD: print positional args in usage
} }
// !TBD still support this?
// Clara::Parser<Config>
// ( "-h, --help display usage information", &Config::showHelp )
// ( "-l, --list list all (or matching) test cases", &Config::listTests )
// ( "-t, --tags list all (or matching) tags", &Config::listTags )
// ( "-p, --passing show passing test output", &Config::showPassingTests )
// ( "-b, --break break into debugger on failure", &Config::breakIntoDebugger )
// ( "-e, --nothrow Skip exception tests", &Config::noThrow )
// ( "-o, --out <file name> output filename", &Config::fileName )
// ( "-n, --name <name> suite name", &Config::suiteName )
// ( "-a, --abort abort at first failure", &Config::abortAfterFirst )
// ( "-x, --abortx <number of failures> abort after x failures", &Config::abortAfterX )
// ( "-w, --warn <warning name> enables warnings", &Config::addWarning );
// .parseInto( argc, argv, config );
#endif #endif