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

Rename reportInvalidArguments -> reportInvalidTestSpec

Browse Source 
This is has been what it actually does for a long time, but it
has not been renamed earlier due to API compatibility.
This commit is contained in:
Martin Hořeňovský 2021-12-12 21:54:00 +01:00
parent 08939cc8bb
commit 602e484f02
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
14 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reporter-events.md
View File

@ -153,14 +153,14 @@ void listTags( std::vector<TagInfo> const& tagInfos );
## Miscellaneous events
```cpp
void reportInvalidArguments( StringRef unmatchedSpec );
void reportInvalidTestSpec( StringRef unmatchedSpec );
void fatalErrorEncountered( StringRef error );
void noMatchingTestCases( StringRef unmatchedSpec );
```
These are one-off events that do not neatly fit into other categories.
`reportInvalidArguments` is sent for each [test specification command line
`reportInvalidTestSpec` is sent for each [test specification command line
argument](command-line.md#specifying-which-tests-to-run) that wasn't
parsed into a valid spec.

6
src/catch2/catch_session.cpp
View File

@ -62,7 +62,7 @@ namespace Catch {
m_config{config},
m_context{config, CATCH_MOVE(reporter)} {
assert( m_config->testSpec().getInvalidArgs().empty() &&
assert( m_config->testSpec().getInvalidSpecs().empty() &&
"Invalid test specs should be handled before running tests" );
auto const& allTestCases = getAllTestCasesSorted(*m_config);
@ -286,10 +286,10 @@ 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();
auto const& invalidSpecs = m_config->testSpec().getInvalidSpecs();
if ( !invalidSpecs.empty() ) {
for ( auto const& spec : invalidSpecs ) {
reporter->reportInvalidArguments( spec );
reporter->reportInvalidTestSpec( spec );
}
return 1;
}

4
src/catch2/catch_test_spec.cpp
View File

@ -98,8 +98,8 @@ namespace Catch {
return matches;
}
const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
return (m_invalidArgs);
const TestSpec::vectorStrings& TestSpec::getInvalidSpecs() const {
return m_invalidSpecs;
}
}

4
src/catch2/catch_test_spec.hpp
View File

@ -72,11 +72,11 @@ namespace Catch {
bool hasFilters() const;
bool matches( TestCaseInfo const& testCase ) const;
Matches matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const;
const vectorStrings & getInvalidArgs() const;
const vectorStrings & getInvalidSpecs() const;
private:
std::vector<Filter> m_filters;
std::vector<std::string> m_invalidArgs;
std::vector<std::string> m_invalidSpecs;
friend class TestSpecParser;
};
}

4
src/catch2/interfaces/catch_interfaces_reporter.hpp
View File

@ -173,8 +173,8 @@ namespace Catch {
//! Called when no test cases match provided test spec
virtual void noMatchingTestCases( StringRef unmatchedSpec ) = 0;
//! Called for all invalid arguments from the cli
virtual void reportInvalidArguments( StringRef invalidArgument ) = 0;
//! Called for all invalid test specs from the cli
virtual void reportInvalidTestSpec( StringRef invalidArgument ) = 0;
/**
* Called once in a testing run before tests are started

2
src/catch2/internal/catch_test_spec_parser.cpp
View File

@ -28,7 +28,7 @@ namespace Catch {
for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
//if visitChar fails
if( !visitChar( m_arg[m_pos] ) ){
m_testSpec.m_invalidArgs.push_back(arg);
m_testSpec.m_invalidSpecs.push_back(arg);
break;
}
endMode();

2
src/catch2/reporters/catch_reporter_combined_tu.cpp
View File

@ -236,7 +236,7 @@ namespace Catch {
void EventListenerBase::listTests( std::vector<TestCaseHandle> const& ) {}
void EventListenerBase::listTags( std::vector<TagInfo> const& ) {}
void EventListenerBase::noMatchingTestCases( StringRef ) {}
void EventListenerBase::reportInvalidArguments( StringRef ) {}
void EventListenerBase::reportInvalidTestSpec( StringRef ) {}
void EventListenerBase::testRunStarting( TestRunInfo const& ) {}
void EventListenerBase::testCaseStarting( TestCaseInfo const& ) {}
void EventListenerBase::testCasePartialStarting(TestCaseInfo const&, uint64_t) {}

2
src/catch2/reporters/catch_reporter_console.cpp
View File

@ -386,7 +386,7 @@ void ConsoleReporter::noMatchingTestCases( StringRef unmatchedSpec ) {
m_stream << "No test cases matched '" << unmatchedSpec << "'\n";
}
void ConsoleReporter::reportInvalidArguments( StringRef arg ) {
void ConsoleReporter::reportInvalidTestSpec( StringRef arg ) {
m_stream << "Invalid Filter: " << arg << '\n';
}

2
src/catch2/reporters/catch_reporter_console.hpp
View File

@ -24,7 +24,7 @@ namespace Catch {
static std::string getDescription();
void noMatchingTestCases( StringRef unmatchedSpec ) override;
void reportInvalidArguments( StringRef arg ) override;
void reportInvalidTestSpec( StringRef arg ) override;
void assertionStarting(AssertionInfo const&) override;

2
src/catch2/reporters/catch_reporter_cumulative_base.hpp
View File

@ -100,7 +100,7 @@ namespace Catch {
void benchmarkFailed( StringRef ) override {}
void noMatchingTestCases( StringRef ) override {}
void reportInvalidArguments( StringRef ) override {}
void reportInvalidTestSpec( StringRef ) override {}
void fatalErrorEncountered( StringRef /*error*/ ) override {}
void testRunStarting( TestRunInfo const& ) override {}

2
src/catch2/reporters/catch_reporter_event_listener.hpp
View File

@ -24,7 +24,7 @@ namespace Catch {
EventListenerBase( ReporterConfig const& config ):
IStreamingReporter( config.fullConfig() ) {}
void reportInvalidArguments( StringRef unmatchedSpec ) override;
void reportInvalidTestSpec( StringRef unmatchedSpec ) override;
void fatalErrorEncountered( StringRef error ) override;
void benchmarkPreparing( StringRef name ) override;

6
src/catch2/reporters/catch_reporter_listening.cpp
View File

@ -36,11 +36,11 @@ namespace Catch {
m_reporter->fatalErrorEncountered( error );
}
void ListeningReporter::reportInvalidArguments( StringRef arg ) {
void ListeningReporter::reportInvalidTestSpec( StringRef arg ) {
for ( auto& listener : m_listeners ) {
listener->reportInvalidArguments( arg );
listener->reportInvalidTestSpec( arg );
}
m_reporter->reportInvalidArguments( arg );
m_reporter->reportInvalidTestSpec( arg );
}
void ListeningReporter::benchmarkPreparing( StringRef name ) {

2
src/catch2/reporters/catch_reporter_listening.hpp
View File

@ -32,7 +32,7 @@ namespace Catch {
void noMatchingTestCases( StringRef unmatchedSpec ) override;
void fatalErrorEncountered( StringRef error ) override;
void reportInvalidArguments( StringRef arg ) override;
void reportInvalidTestSpec( StringRef arg ) override;
void benchmarkPreparing( StringRef name ) override;
void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;

2
src/catch2/reporters/catch_reporter_streaming_base.hpp
View File

@ -32,7 +32,7 @@ namespace Catch {
void fatalErrorEncountered( StringRef /*error*/ ) override {}
void noMatchingTestCases( StringRef /*unmatchedSpec*/ ) override {}
void reportInvalidArguments( StringRef /*invalidArgument*/ ) override {}
void reportInvalidTestSpec( StringRef /*invalidArgument*/ ) override {}
void testRunStarting( TestRunInfo const& _testRunInfo ) override;