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

Revert "Removed stray '+'"

Browse Source 
This reverts commit 79a6ae2977.
This commit is contained in:
Martin Moene 2012-07-22 09:13:19 +02:00
parent 79a6ae2977
commit 14f1c094f4
1 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

298
include/catch_runner.hpp
View File

@ -1,149 +1,149 @@
/* /*
* Created by Phil on 31/10/2010. * Created by Phil on 31/10/2010.
* Copyright 2010 Two Blue Cubes Ltd. All rights reserved. * Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
* *
* Distributed under the Boost Software License, Version 1.0. (See accompanying * Distributed under the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
*/ */
#ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED #ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED #define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
#include "internal/catch_context_impl.hpp" #include "internal/catch_context_impl.hpp"
#include "internal/catch_commandline.hpp" #include "internal/catch_commandline.hpp"
#include "internal/catch_list.hpp" #include "internal/catch_list.hpp"
#include "reporters/catch_reporter_basic.hpp" #include "reporters/catch_reporter_basic.hpp"
#include "reporters/catch_reporter_xml.hpp" #include "reporters/catch_reporter_xml.hpp"
#include "reporters/catch_reporter_junit.hpp" #include "reporters/catch_reporter_junit.hpp"
#include <fstream> #include <fstream>
#include <stdlib.h> #include <stdlib.h>
#include <limits> #include <limits>
namespace Catch { namespace Catch {
INTERNAL_CATCH_REGISTER_REPORTER( "basic", BasicReporter ) INTERNAL_CATCH_REGISTER_REPORTER( "basic", BasicReporter )
INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter ) INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter )
INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter ) INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
inline int Main( Config& config ) { inline int Main( Config& config ) {
// Handle list request // Handle list request
if( config.listWhat() != List::None ) if( config.listWhat() != List::None )
return List( config ); return List( config );
// Open output file, if specified // Open output file, if specified
std::ofstream ofs; std::ofstream ofs;
if( !config.getFilename().empty() ) { if( !config.getFilename().empty() ) {
ofs.open( config.getFilename().c_str() ); ofs.open( config.getFilename().c_str() );
if( ofs.fail() ) { if( ofs.fail() ) {
std::cerr << "Unable to open file: '" << config.getFilename() << "'" << std::endl; std::cerr << "Unable to open file: '" << config.getFilename() << "'" << std::endl;
return (std::numeric_limits<int>::max)(); return (std::numeric_limits<int>::max)();
} }
config.setStreamBuf( ofs.rdbuf() ); config.setStreamBuf( ofs.rdbuf() );
} }
int result = 0; int result = 0;
// Scope here for the Runner so it can use the context before it is cleaned-up // Scope here for the Runner so it can use the context before it is cleaned-up
{ {
Runner runner( config ); Runner runner( config );
// Run test specs specified on the command line - or default to all // Run test specs specified on the command line - or default to all
if( !config.testsSpecified() ) { if( !config.testsSpecified() ) {
config.getReporter()->StartGroup( "" ); config.getReporter()->StartGroup( "" );
runner.runAll(); runner.runAll();
config.getReporter()->EndGroup( "", runner.getTotals() ); config.getReporter()->EndGroup( "", runner.getTotals() );
} }
else { else {
// !TBD We should get all the testcases upfront, report any missing, // !TBD We should get all the testcases upfront, report any missing,
// then just run them // then just run them
std::vector<std::string>::const_iterator it = config.getTestSpecs().begin(); std::vector<std::string>::const_iterator it = config.getTestSpecs().begin();
std::vector<std::string>::const_iterator itEnd = config.getTestSpecs().end(); std::vector<std::string>::const_iterator itEnd = config.getTestSpecs().end();
for(; it != itEnd; ++it ) { for(; it != itEnd; ++it ) {
Totals prevTotals = runner.getTotals(); Totals prevTotals = runner.getTotals();
config.getReporter()->StartGroup( *it ); config.getReporter()->StartGroup( *it );
if( runner.runMatching( *it ) == 0 ) { if( runner.runMatching( *it ) == 0 ) {
// Use reporter? // Use reporter?
// std::cerr << "\n[Unable to match any test cases with: " << *it << "]" << std::endl; // std::cerr << "\n[Unable to match any test cases with: " << *it << "]" << std::endl;
} }
config.getReporter()->EndGroup( *it, runner.getTotals() - prevTotals ); config.getReporter()->EndGroup( *it, runner.getTotals() - prevTotals );
} }
} }
result = static_cast<int>( runner.getTotals().assertions.failed ); result = static_cast<int>( runner.getTotals().assertions.failed );
} }
Catch::Context::cleanUp(); Catch::Context::cleanUp();
return result; return result;
} }
inline void showUsage( std::ostream& os ) { inline void showUsage( std::ostream& os ) {
os << "\t-?, -h, --help\n" os << "\t-?, -h, --help\n"
<< "\t-l, --list <tests | reporters> [xml]\n" << "\t-l, --list <tests | reporters> [xml]\n"
<< "\t-t, --test <testspec> [<testspec>...]\n" << "\t-t, --test <testspec> [<testspec>...]\n"
<< "\t-r, --reporter <reporter name>\n" << "\t-r, --reporter <reporter name>\n"
<< "\t-o, --out <file name>|<%stream name>\n" << "\t-o, --out <file name>|<%stream name>\n"
<< "\t-s, --success\n" << "\t-s, --success\n"
<< "\t-b, --break\n" << "\t-b, --break\n"
<< "\t-n, --name <name>\n" << "\t-n, --name <name>\n"
<< "\t-a, --abort [#]\n\n" << "\t-a, --abort [#]\n\n"
<< "\t-nt, --nothrow\n\n" << "\t-nt, --nothrow\n\n"
<< "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl; << "For more detail usage please see: https://github.com/philsquared/Catch/wiki/Command-line" << std::endl;
} }
inline void showHelp( std::string exeName ) { inline void showHelp( std::string exeName ) {
std::string::size_type pos = exeName.find_last_of( "/\\" ); std::string::size_type pos = exeName.find_last_of( "/\\" );
if( pos != std::string::npos ) { if( pos != std::string::npos ) {
exeName = exeName.substr( pos+1 ); exeName = exeName.substr( pos+1 );
} }
std::cout << exeName << " is a CATCH host application. Options are as follows:\n\n"; std::cout << exeName << " is a CATCH host application. Options are as follows:\n\n";
showUsage( std::cout ); showUsage( std::cout );
} }
inline int Main( int argc, char* const argv[], Config& config ) { inline int Main( int argc, char* const argv[], Config& config ) {
try { try {
CommandParser parser( argc, argv ); CommandParser parser( argc, argv );
if( Command cmd = parser.find( "-h", "-?", "--help" ) ) { if( Command cmd = parser.find( "-h", "-?", "--help" ) ) {
if( cmd.argsCount() != 0 ) if( cmd.argsCount() != 0 )
cmd.raiseError( "Does not accept arguments" ); cmd.raiseError( "Does not accept arguments" );
showHelp( argv[0] ); showHelp( argv[0] );
Catch::Context::cleanUp(); Catch::Context::cleanUp();
return 0; return 0;
} }
parseIntoConfig( parser, config.data() ); parseIntoConfig( parser, config.data() );
// !TBD: wire up (do this lazily?) // !TBD: wire up (do this lazily?)
if( !config.data().reporter.empty() ) if( !config.data().reporter.empty() )
config.setReporter( config.data().reporter ); config.setReporter( config.data().reporter );
if( !config.data().stream.empty() ) { if( !config.data().stream.empty() ) {
if( config.data().stream[0] == '%' ) if( config.data().stream[0] == '%' )
config.useStream( config.data().stream.substr( 1 ) ); config.useStream( config.data().stream.substr( 1 ) );
else else
config.setFilename( config.data().stream ); config.setFilename( config.data().stream );
} }
} }
catch( std::exception& ex ) { catch( std::exception& ex ) {
std::cerr << ex.what() << "\n\nUsage: ...\n\n"; std::cerr << ex.what() << + "\n\nUsage: ...\n\n";
showUsage( std::cerr ); showUsage( std::cerr );
Catch::Context::cleanUp(); Catch::Context::cleanUp();
return (std::numeric_limits<int>::max)(); return (std::numeric_limits<int>::max)();
} }
return Main( config ); return Main( config );
} }
inline int Main( int argc, char* const argv[] ) { inline int Main( int argc, char* const argv[] ) {
Config config; Config config;
// !TBD: This doesn't always work, for some reason // !TBD: This doesn't always work, for some reason
// if( isDebuggerActive() ) // if( isDebuggerActive() )
// config.useStream( "debug" ); // config.useStream( "debug" );
return Main( argc, argv, config ); return Main( argc, argv, config );
} }
} // end namespace Catch } // end namespace Catch
#endif // TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED #endif // TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED