3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-03 05:45:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Error out early if invalid test specs are provided

Browse Source
This commit is contained in:
Martin Hořeňovský
2021-12-12 15:18:50 +01:00
parent 3bfe900bbc
commit 08939cc8bb
3 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/catch2/catch_session.cpp
View File

@@ -25,6 +25,7 @@
#include <catch2/internal/catch_move_and_forward.hpp>
#include <algorithm>
#include <cassert>
#include <iomanip>
#include <set>
@@ -61,24 +62,30 @@ namespace Catch {
m_config{config},
m_context{config, CATCH_MOVE(reporter)} {
auto const& allTestCases = getAllTestCasesSorted(*m_config);
m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
assert( m_config->testSpec().getInvalidArgs().empty() &&
"Invalid test specs should be handled before running tests" );
if (m_matches.empty() && invalidArgs.empty()) {
for (auto const& test : allTestCases)
if (!test.getTestCaseInfo().isHidden())
m_tests.emplace(&test);
auto const& allTestCases = getAllTestCasesSorted(*m_config);
auto const& testSpec = m_config->testSpec();
if ( !testSpec.hasFilters() ) {
for ( auto const& test : allTestCases ) {
if ( !test.getTestCaseInfo().isHidden() ) {
m_tests.emplace( &test );
}
}
} else {
for (auto const& match : m_matches)
m_tests.insert(match.tests.begin(), match.tests.end());
m_matches =
testSpec.matchesByFilter( allTestCases, *m_config );
for ( auto const& match : m_matches ) {
m_tests.insert( match.tests.begin(),
match.tests.end() );
}
}
m_tests = createShard(m_tests, m_config->shardCount(), m_config->shardIndex());
}
Totals execute() {
auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
Totals totals;
for (auto const& testCase : m_tests) {
if (!m_context.aborting())
@@ -94,11 +101,6 @@ namespace Catch {
}
}
if (!invalidArgs.empty()) {
for (auto const& invalidArg: invalidArgs)
m_reporter->reportInvalidArguments(invalidArg);
}
return totals;
}
@@ -284,6 +286,15 @@ namespace Catch {
// Create reporter(s) so we can route listings through them
auto reporter = makeReporter(m_config.get());
auto const& invalidSpecs = m_config->testSpec().getInvalidArgs();
if ( !invalidSpecs.empty() ) {
for ( auto const& spec : invalidSpecs ) {
reporter->reportInvalidArguments( spec );
}
return 1;
}
// Handle list request
if (list(*reporter, *m_config)) {
return 0;