Refactored CLI tests and converted main one into a scenario

This commit is contained in:
Phil Nash 2013-05-17 08:00:57 +01:00
parent 8d1100daa6
commit 6574f639a3

View File

@ -375,6 +375,13 @@ namespace Clara {
} // end namespace Clara
// Helper to deduce size from array literals and pass on to parser
template<size_t size, typename ConfigT>
std::vector<Clara::Parser::Token> parseInto( Clara::CommandLine<ConfigT>& cli, char const* (&argv)[size], ConfigT& config ) {
return cli.parseInto( size, argv, config );
}
struct TestOpt {
TestOpt() : number( 0 ), index( 0 ), flag( false ) {}
@ -408,26 +415,26 @@ TEST_CASE( "cmdline" ) {
SECTION( "plain filename" ) {
const char* argv[] = { "test", "-o filename.ext" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
CHECK( config.fileName == "filename.ext" );
}
SECTION( "plain filename with colon" ) {
const char* argv[] = { "test", "-o:filename.ext" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
CHECK( config.fileName == "filename.ext" );
}
SECTION( "plain filename with =" ) {
const char* argv[] = { "test", "-o=filename.ext" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
CHECK( config.fileName == "filename.ext" );
}
SECTION( "long opt" ) {
const char* argv[] = { "test", "--output %stdout" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
CHECK( config.fileName == "%stdout" );
}
@ -437,14 +444,14 @@ TEST_CASE( "cmdline" ) {
SECTION( "a number" ) {
const char* argv[] = { "test", "-n 42" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
CHECK( config.number == 42 );
}
SECTION( "not a number" ) {
const char* argv[] = { "test", "-n forty-two" };
CHECK_THROWS( parseInto( cli, argv, config ) );
CHECK_THROWS( cli.parseInto( sizeof(argv)/sizeof(char*), argv, config ) );
CHECK( config.number == 0 );
}
@ -461,8 +468,8 @@ TEST_CASE( "cmdline" ) {
.argName( "<some text>" );
const char* argv[] = { "test", "-n 42", "-d some text" };
std::vector<Clara::Parser::Token> unusedTokens = parseInto( cli, argv, config1 );
std::vector<Clara::Parser::Token> unusedTokens = cli.parseInto( sizeof(argv)/sizeof(char*), argv, config1 );
CHECK( config1.number == 42 );
REQUIRE_FALSE( unusedTokens.empty() );
@ -478,14 +485,14 @@ TEST_CASE( "cmdline" ) {
SECTION( "in range" ) {
const char* argv[] = { "test", "-i 3" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
REQUIRE( config.index == 3 );
}
SECTION( "out of range" ) {
const char* argv[] = { "test", "-i 42" };
REQUIRE_THROWS( cli.parseInto( sizeof(argv)/sizeof(char*), argv, config ) );
REQUIRE_THROWS( parseInto( cli, argv, config ) );
}
}
@ -496,14 +503,14 @@ TEST_CASE( "cmdline" ) {
SECTION( "set" ) {
const char* argv[] = { "test", "-f" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
REQUIRE( config.flag );
}
SECTION( "not set" ) {
const char* argv[] = { "test" };
parseInto( cli, argv, config );
cli.parseInto( sizeof(argv)/sizeof(char*), argv, config );
REQUIRE( config.flag == false );
}
}
@ -542,7 +549,9 @@ struct Config {
};
TEST_CASE( "growing new Catch cli" ) {
SCENARIO( "New Catch commandline interface", "[cli]" ) {
GIVEN( "A built cli parser for Catch" ) {
Clara::CommandLine<Config> cli;
cli.bind( &Config::showHelp )
@ -615,22 +624,29 @@ TEST_CASE( "growing new Catch cli" ) {
.describe( "which test or tests to use" )
.argName( "test name, pattern or tags" );
WHEN( "It is streamed" )
THEN( "It prints the usage strings" )
std::cout << cli << std::endl;
Config config;
WHEN( "Multiple flags are combined" ) {
CHECK_FALSE( config.showPassingTests );
CHECK_FALSE( config.noThrow );
CHECK_FALSE( config.breakIntoDebugger );
const char* argv[] = { "test", "-peb" };
int argc = sizeof(argv)/sizeof(char*);
cli.parseInto( argc, argv, config );
parseInto( cli, argv, config );
THEN( "All the flags are set" ) {
CHECK( config.showPassingTests );
CHECK( config.noThrow );
CHECK( config.breakIntoDebugger );
}
}
//
// REQUIRE_THROWS( cli.parseInto( sizeof(argv)/sizeof(char*), argv, config ) );
}
}
// !TBD still support this?