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

--list-test-names-and-sources Fixed tabs/spaces

Browse Source
This commit is contained in:
Cyberboss 2016-06-05 15:56:50 -04:00
parent 8fd23466ba
commit d0bd13dc17
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/internal/catch_commandline.hpp
View File

@ -174,9 +174,9 @@ namespace Catch {
.bind( &ConfigData::filenamesAsTags );
// Less common commands which don't have a short form
cli["--list-test-names-and-sources"]
.describe("list all/matching test cases names along with their source files")
.bind(&ConfigData::listTestNamesAndSources);
cli["--list-test-names-and-sources"]
.describe("list all/matching test cases names along with their source files")
.bind(&ConfigData::listTestNamesAndSources);
cli["--list-test-names-only"]
.describe( "list all/matching test cases names only" )

8
include/internal/catch_config.hpp
View File

@ -31,7 +31,7 @@ namespace Catch {
: listTests( false ),
listTags( false ),
listReporters( false ),
listTestNamesAndSources( false ),
listTestNamesAndSources( false ),
listTestNamesOnly( false ),
showSuccessfulTests( false ),
shouldDebugBreak( false ),
@ -51,8 +51,8 @@ namespace Catch {
bool listTests;
bool listTags;
bool listReporters;
bool listTestNamesAndSources;
bool listTestNamesOnly;
bool listTestNamesAndSources;
bool listTestNamesOnly;
bool showSuccessfulTests;
bool shouldDebugBreak;
@ -109,7 +109,7 @@ namespace Catch {
}
bool listTests() const { return m_data.listTests; }
bool listTestNamesAndSources() const { return m_data.listTestNamesAndSources; }
bool listTestNamesAndSources() const { return m_data.listTestNamesAndSources; }
bool listTestNamesOnly() const { return m_data.listTestNamesOnly; }
bool listTags() const { return m_data.listTags; }
bool listReporters() const { return m_data.listReporters; }

38
include/internal/catch_list.hpp
View File

@ -57,23 +57,23 @@ namespace Catch {
return matchedTests;
}
inline std::size_t listTestsNames( Config const& config , const bool includeSources ) {
TestSpec testSpec = config.testSpec();
if( !config.testSpec().hasFilters() )
testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
std::size_t matchedTests = 0;
std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
it != itEnd;
++it ) {
matchedTests++;
TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
Catch::cout() << testCaseInfo.name << std::endl;
if( includeSources )
Catch::cout() << testCaseInfo.lineInfo << std::endl;
}
return matchedTests;
}
inline std::size_t listTestsNames( Config const& config , const bool includeSources ) {
TestSpec testSpec = config.testSpec();
if( !config.testSpec().hasFilters() )
testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
std::size_t matchedTests = 0;
std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
it != itEnd;
++it ) {
matchedTests++;
TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
Catch::cout() << testCaseInfo.name << std::endl;
if( includeSources )
Catch::cout() << testCaseInfo.lineInfo << std::endl;
}
return matchedTests;
}
struct TagInfo {
TagInfo() : count ( 0 ) {}
@ -164,10 +164,10 @@ namespace Catch {
Option<std::size_t> listedCount;
if( config.listTests() )
listedCount = listedCount.valueOr(0) + listTests( config );
if( config.listTestNamesAndSources() )
listedCount = listedCount.valueOr(0) + listTestsNames(config, true);
if( config.listTestNamesOnly() )
listedCount = listedCount.valueOr(0) + listTestsNames( config , false );
if( config.listTestNamesAndSources() )
listedCount = listedCount.valueOr(0) + listTestsNames( config , true );
if( config.listTags() )
listedCount = listedCount.valueOr(0) + listTags( config );
if( config.listReporters() )