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

list options return number listed

Browse Source
This commit is contained in:
Phil Nash 2013-06-06 22:54:42 +01:00
parent e035e2835d
commit f438e04b5d
3 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/catch_runner.hpp
View File

@ -194,8 +194,8 @@ namespace Catch {
Runner runner( config );
// Handle list request
if( list( config ) )
return 0;
if( Option<std::size_t> listed = list( config ) )
return static_cast<int>( *listed );
return static_cast<int>( runner.runTests().assertions.failed );
}

37
include/internal/catch_list.hpp
View File

@ -25,7 +25,7 @@ namespace Catch {
return true;
}
inline void listTests( Ptr<Config> const& config ) {
inline std::size_t listTests( Ptr<Config> const& config ) {
if( config->filters().empty() )
std::cout << "All available test cases:\n";
else
@ -98,9 +98,10 @@ namespace Catch {
std::cout << pluralise( matchedTests, "test case" ) << std::endl;
else
std::cout << pluralise( matchedTests, "matching test case" ) << std::endl;
return matchedTests;
}
inline void listTags( Ptr<Config> const& config ) {
inline std::size_t listTags( Ptr<Config> const& config ) {
if( config->filters().empty() )
std::cout << "All available tags:\n";
else
@ -150,34 +151,28 @@ namespace Catch {
<< "\n";
}
std::cout << pluralise( tagCounts.size(), "tag" ) << std::endl;
return tagCounts.size();
}
inline void listReporters( Ptr<Config> const& /*config*/ ) {
inline std::size_t listReporters( Ptr<Config> const& /*config*/ ) {
std::cout << "Available reports:\n";
IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
IReporterRegistry::FactoryMap::const_iterator it = factories.begin(), itEnd = factories.end();
for(; it != itEnd; ++it ) {
// !TBD: consider listAs()
for(; it != itEnd; ++it )
std::cout << "\t" << it->first << "\n\t\t'" << it->second->getDescription() << "'\n";
}
std::cout << std::endl;
return factories.size();
}
inline bool list( Ptr<Config> const& config ) {
bool listed = false;
if( config->listTests() ) {
listTests( config );
listed = true;
}
if( config->listTags() ) {
listTags( config );
listed = true;
}
if( config->listReporters() ) {
listReporters( config );
listed = true;
}
return listed;
inline Option<std::size_t> list( Ptr<Config> const& config ) {
Option<std::size_t> listedCount;
if( config->listTests() )
listedCount = listedCount.valueOr(0) + listTests( config );
if( config->listTags() )
listedCount = listedCount.valueOr(0) + listTags( config );
if( config->listReporters() )
listedCount = listedCount.valueOr(0) + listReporters( config );
return listedCount;
}
} // end namespace Catch

5
include/internal/catch_option.hpp
View File

@ -45,6 +45,10 @@ namespace Catch {
T* operator->() { return nullableValue; }
const T* operator->() const { return nullableValue; }
T valueOr( T const& defaultValue ) const {
return nullableValue ? *nullableValue : defaultValue;
}
bool some() const { return nullableValue != NULL; }
bool none() const { return nullableValue == NULL; }
@ -58,7 +62,6 @@ namespace Catch {
char storage[sizeof(T)];
};
} // end namespace Catch
#endif // TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED