3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-08 23:29:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Regen single include

Browse Source
This commit is contained in:
Phil Nash 2012-06-05 20:16:58 +01:00
parent 5824b56a5e
commit e20b252b5a
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
single_include/catch.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Generated: 2012-06-02 23:25:57.372770 * Generated: 2012-06-05 20:16:42.543387
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -3358,12 +3358,12 @@ namespace Catch {
namespace Catch { namespace Catch {
namespace { namespace {
Context* currentHub = NULL; Context* currentContext = NULL;
} }
IMutableContext& getCurrentMutableContext() { IMutableContext& getCurrentMutableContext() {
if( !currentHub ) if( !currentContext )
currentHub = new Context(); currentContext = new Context();
return *currentHub; return *currentContext;
} }
IContext& getCurrentContext() { IContext& getCurrentContext() {
return getCurrentMutableContext(); return getCurrentMutableContext();
@ -3376,8 +3376,8 @@ namespace Catch {
{} {}
void Context::cleanUp() { void Context::cleanUp() {
delete currentHub; delete currentContext;
currentHub = NULL; currentContext = NULL;
} }
void Context::setRunner( IRunner* runner ) { void Context::setRunner( IRunner* runner ) {
@ -3532,7 +3532,7 @@ namespace Catch {
try { try {
if( Command cmd = parser.find( "-l", "--list" ) ) { if( Command cmd = parser.find( "-l", "--list" ) ) {
if( cmd.argsCount() > 2 ) if( cmd.argsCount() > 2 )
throw std::domain_error( cmd.name() + " expected upto 2 arguments but recieved: " ); cmd.raiseError( "Expected upto 2 arguments" );
List::What listSpec = List::All; List::What listSpec = List::All;
if( cmd.argsCount() >= 1 ) { if( cmd.argsCount() >= 1 ) {
@ -3541,7 +3541,7 @@ namespace Catch {
else if( cmd[0] == "reporters" ) else if( cmd[0] == "reporters" )
listSpec = List::Reports; listSpec = List::Reports;
else else
throw std::domain_error( cmd.name() + " expected [tests] or [reporters] but recieved: : " ); cmd.raiseError( "Expected [tests] or [reporters]" );
} }
if( cmd.argsCount() >= 2 ) { if( cmd.argsCount() >= 2 ) {
if( cmd[1] == "xml" ) if( cmd[1] == "xml" )
@ -3549,14 +3549,14 @@ namespace Catch {
else if( cmd[1] == "text" ) else if( cmd[1] == "text" )
listSpec = static_cast<List::What>( listSpec | List::AsText ); listSpec = static_cast<List::What>( listSpec | List::AsText );
else else
throw std::domain_error( cmd.name() + " expected [xml] or [text] but recieved: " ); cmd.raiseError( "Expected [xml] or [text]" );
} }
config.setListSpec( static_cast<List::What>( config.getListSpec() | listSpec ) ); config.setListSpec( static_cast<List::What>( config.getListSpec() | listSpec ) );
} }
if( Command cmd = parser.find( "-t", "--test" ) ) { if( Command cmd = parser.find( "-t", "--test" ) ) {
if( cmd.argsCount() == 0 ) if( cmd.argsCount() == 0 )
throw std::domain_error( cmd.name() + " expected at least 1 argument but recieved none" ); cmd.raiseError( "Expected at least one argument" );
for( std::size_t i = 0; i < cmd.argsCount(); ++i ) for( std::size_t i = 0; i < cmd.argsCount(); ++i )
config.addTestSpec( cmd[i] ); config.addTestSpec( cmd[i] );
} }
@ -3569,7 +3569,7 @@ namespace Catch {
if( Command cmd = parser.find( "-o", "--out" ) ) { if( Command cmd = parser.find( "-o", "--out" ) ) {
if( cmd.argsCount() == 0 ) if( cmd.argsCount() == 0 )
throw std::domain_error( cmd.name() + " expected filename" ); cmd.raiseError( "Expected filename" );
if( cmd[0][0] == '%' ) if( cmd[0][0] == '%' )
config.useStream( cmd[0].substr( 1 ) ); config.useStream( cmd[0].substr( 1 ) );
else else
@ -3578,31 +3578,31 @@ namespace Catch {
if( Command cmd = parser.find( "-s", "--success" ) ) { if( Command cmd = parser.find( "-s", "--success" ) ) {
if( cmd.argsCount() != 0 ) if( cmd.argsCount() != 0 )
throw std::domain_error( cmd.name() + " does not accept arguments" ); cmd.raiseError( "Does not accept arguments" );
config.setIncludeWhichResults( Include::SuccessfulResults ); config.setIncludeWhichResults( Include::SuccessfulResults );
} }
if( Command cmd = parser.find( "-b", "--break" ) ) { if( Command cmd = parser.find( "-b", "--break" ) ) {
if( cmd.argsCount() != 0 ) if( cmd.argsCount() != 0 )
throw std::domain_error( cmd.name() + " does not accept arguments" ); cmd.raiseError( "Does not accept arguments" );
config.setShouldDebugBreak( true ); config.setShouldDebugBreak( true );
} }
if( Command cmd = parser.find( "-n", "--name" ) ) { if( Command cmd = parser.find( "-n", "--name" ) ) {
if( cmd.argsCount() != 1 ) if( cmd.argsCount() != 1 )
throw std::domain_error( cmd.name() + " requires exactly one argument (a name)" ); cmd.raiseError( "Expected a name" );
config.setName( cmd[0] ); config.setName( cmd[0] );
} }
if( Command cmd = parser.find( "-h", "-?", "--help" ) ) { if( Command cmd = parser.find( "-h", "-?", "--help" ) ) {
if( cmd.argsCount() != 0 ) if( cmd.argsCount() != 0 )
throw std::domain_error( cmd.name() + " does not accept arguments" ); cmd.raiseError( "Does not accept arguments" );
config.setShowHelp( true ); config.setShowHelp( true );
} }
if( Command cmd = parser.find( "-a", "--abort" ) ) { if( Command cmd = parser.find( "-a", "--abort" ) ) {
if( cmd.argsCount() > 1 ) if( cmd.argsCount() > 1 )
throw std::domain_error( cmd.name() + " only accepts 0-1 arguments" ); cmd.raiseError( "Only accepts 0-1 arguments" );
int threshold = 1; int threshold = 1;
if( cmd.argsCount() == 1 ) if( cmd.argsCount() == 1 )
{ {