mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 13:26:10 +01:00
Implement warning for unmatched test specs
This commit is contained in:
parent
9f2dca5384
commit
840acedf62
@ -212,14 +212,22 @@ This option transforms tabs and newline characters into ```\t``` and ```\n``` re
|
|||||||
## Warnings
|
## Warnings
|
||||||
<pre>-w, --warn <warning name></pre>
|
<pre>-w, --warn <warning name></pre>
|
||||||
|
|
||||||
Enables reporting of suspicious test runs. There is currently only one
|
You can think of Catch2's warnings as the equivalent of `-Werror` (`/WX`)
|
||||||
available warning.
|
flag for C++ compilers. It turns some suspicious occurences, like a section
|
||||||
|
without assertions, into errors. Because these might be intended, warnings
|
||||||
|
are not enabled by default, but user can opt in.
|
||||||
|
|
||||||
|
There are currently two warnings implemented:
|
||||||
|
|
||||||
```
|
```
|
||||||
NoAssertions // Fail test case / leaf section if no assertions
|
NoAssertions // Fail test case / leaf section if no assertions
|
||||||
// (e.g. `REQUIRE`) is encountered.
|
// (e.g. `REQUIRE`) is encountered.
|
||||||
|
UnmatchedTestSpec // Fail test run if any of the CLI test specs did
|
||||||
|
// not match any tests.
|
||||||
```
|
```
|
||||||
|
|
||||||
|
> `UnmatchedTestSpec` was introduced in Catch2 X.Y.Z.
|
||||||
|
|
||||||
|
|
||||||
<a id="reporting-timings"></a>
|
<a id="reporting-timings"></a>
|
||||||
## Reporting timings
|
## Reporting timings
|
||||||
|
@ -173,6 +173,7 @@ new design.
|
|||||||
* When deferred tu runtime, it behaves like `CHECK`, and not like `REQUIRE`.
|
* When deferred tu runtime, it behaves like `CHECK`, and not like `REQUIRE`.
|
||||||
* You can have multiple tests with the same name, as long as other parts of the test identity differ (#1915, #1999, #2175)
|
* You can have multiple tests with the same name, as long as other parts of the test identity differ (#1915, #1999, #2175)
|
||||||
* Test identity includes test's name, test's tags and and test's class name if applicable.
|
* Test identity includes test's name, test's tags and and test's class name if applicable.
|
||||||
|
* Added new warning, `UnmatchedTestSpec`, to error on test specs with no matching tests
|
||||||
|
|
||||||
|
|
||||||
### Fixes
|
### Fixes
|
||||||
|
@ -70,6 +70,9 @@ namespace Catch {
|
|||||||
bool Config::warnAboutMissingAssertions() const {
|
bool Config::warnAboutMissingAssertions() const {
|
||||||
return !!( m_data.warnings & WarnAbout::NoAssertions );
|
return !!( m_data.warnings & WarnAbout::NoAssertions );
|
||||||
}
|
}
|
||||||
|
bool Config::warnAboutUnmatchedTestSpecs() const {
|
||||||
|
return !!( m_data.warnings & WarnAbout::UnmatchedTestSpec );
|
||||||
|
}
|
||||||
bool Config::zeroTestsCountAsSuccess() const { return m_data.allowZeroTests; }
|
bool Config::zeroTestsCountAsSuccess() const { return m_data.allowZeroTests; }
|
||||||
ShowDurations Config::showDurations() const { return m_data.showDurations; }
|
ShowDurations Config::showDurations() const { return m_data.showDurations; }
|
||||||
double Config::minDuration() const { return m_data.minDuration; }
|
double Config::minDuration() const { return m_data.minDuration; }
|
||||||
|
@ -98,6 +98,7 @@ namespace Catch {
|
|||||||
StringRef name() const override;
|
StringRef name() const override;
|
||||||
bool includeSuccessfulResults() const override;
|
bool includeSuccessfulResults() const override;
|
||||||
bool warnAboutMissingAssertions() const override;
|
bool warnAboutMissingAssertions() const override;
|
||||||
|
bool warnAboutUnmatchedTestSpecs() const override;
|
||||||
bool zeroTestsCountAsSuccess() const override;
|
bool zeroTestsCountAsSuccess() const override;
|
||||||
ShowDurations showDurations() const override;
|
ShowDurations showDurations() const override;
|
||||||
double minDuration() const override;
|
double minDuration() const override;
|
||||||
|
@ -96,20 +96,26 @@ namespace Catch {
|
|||||||
|
|
||||||
for (auto const& match : m_matches) {
|
for (auto const& match : m_matches) {
|
||||||
if (match.tests.empty()) {
|
if (match.tests.empty()) {
|
||||||
m_reporter->noMatchingTestCases(match.name);
|
m_unmatchedTestSpecs = true;
|
||||||
totals.error = -1;
|
m_reporter->noMatchingTestCases( match.name );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return totals;
|
return totals;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool hadUnmatchedTestSpecs() const {
|
||||||
|
return m_unmatchedTestSpecs;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
IStreamingReporter* m_reporter;
|
IStreamingReporter* m_reporter;
|
||||||
Config const* m_config;
|
Config const* m_config;
|
||||||
RunContext m_context;
|
RunContext m_context;
|
||||||
std::set<TestCaseHandle const*> m_tests;
|
std::set<TestCaseHandle const*> m_tests;
|
||||||
TestSpec::Matches m_matches;
|
TestSpec::Matches m_matches;
|
||||||
|
bool m_unmatchedTestSpecs = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
void applyFilenamesAsTags() {
|
void applyFilenamesAsTags() {
|
||||||
@ -301,6 +307,11 @@ namespace Catch {
|
|||||||
TestGroup tests { CATCH_MOVE(reporter), m_config.get() };
|
TestGroup tests { CATCH_MOVE(reporter), m_config.get() };
|
||||||
auto const totals = tests.execute();
|
auto const totals = tests.execute();
|
||||||
|
|
||||||
|
if ( tests.hadUnmatchedTestSpecs()
|
||||||
|
&& m_config->warnAboutUnmatchedTestSpecs() ) {
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
if ( totals.testCases.total() == 0
|
if ( totals.testCases.total() == 0
|
||||||
&& !m_config->zeroTestsCountAsSuccess() ) {
|
&& !m_config->zeroTestsCountAsSuccess() ) {
|
||||||
return 2;
|
return 2;
|
||||||
|
@ -26,7 +26,10 @@ namespace Catch {
|
|||||||
|
|
||||||
struct WarnAbout { enum What {
|
struct WarnAbout { enum What {
|
||||||
Nothing = 0x00,
|
Nothing = 0x00,
|
||||||
|
//! A test case or leaf section did not run any assertions
|
||||||
NoAssertions = 0x01,
|
NoAssertions = 0x01,
|
||||||
|
//! A command line test spec matched no test cases
|
||||||
|
UnmatchedTestSpec = 0x02,
|
||||||
}; };
|
}; };
|
||||||
|
|
||||||
enum class ShowDurations {
|
enum class ShowDurations {
|
||||||
@ -63,6 +66,7 @@ namespace Catch {
|
|||||||
virtual bool includeSuccessfulResults() const = 0;
|
virtual bool includeSuccessfulResults() const = 0;
|
||||||
virtual bool shouldDebugBreak() const = 0;
|
virtual bool shouldDebugBreak() const = 0;
|
||||||
virtual bool warnAboutMissingAssertions() const = 0;
|
virtual bool warnAboutMissingAssertions() const = 0;
|
||||||
|
virtual bool warnAboutUnmatchedTestSpecs() const = 0;
|
||||||
virtual bool zeroTestsCountAsSuccess() const = 0;
|
virtual bool zeroTestsCountAsSuccess() const = 0;
|
||||||
virtual int abortAfter() const = 0;
|
virtual int abortAfter() const = 0;
|
||||||
virtual bool showInvisibles() const = 0;
|
virtual bool showInvisibles() const = 0;
|
||||||
|
@ -27,6 +27,9 @@ namespace Catch {
|
|||||||
if ( warning == "NoAssertions" ) {
|
if ( warning == "NoAssertions" ) {
|
||||||
config.warnings = WarnAbout::NoAssertions;
|
config.warnings = WarnAbout::NoAssertions;
|
||||||
return ParserResult::ok( ParseResultType::Matched );
|
return ParserResult::ok( ParseResultType::Matched );
|
||||||
|
} else if ( warning == "UnmatchedTestSpec" ) {
|
||||||
|
config.warnings = WarnAbout::UnmatchedTestSpec;
|
||||||
|
return ParserResult::ok( ParseResultType::Matched );
|
||||||
}
|
}
|
||||||
|
|
||||||
return ParserResult ::runtimeError(
|
return ParserResult ::runtimeError(
|
||||||
|
@ -229,6 +229,23 @@ add_test(NAME TestSpecs::OverrideFailureWithNoMatchedTests
|
|||||||
COMMAND $<TARGET_FILE:SelfTest> "___nonexistent_test___" --allow-running-no-tests
|
COMMAND $<TARGET_FILE:SelfTest> "___nonexistent_test___" --allow-running-no-tests
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_test(NAME Warnings::UnmatchedTestSpecIsAccepted
|
||||||
|
COMMAND $<TARGET_FILE:SelfTest> Tracker --warn UnmatchedTestSpec
|
||||||
|
)
|
||||||
|
set_tests_properties(Warnings::UnmatchedTestSpecIsAccepted
|
||||||
|
PROPERTIES
|
||||||
|
FAIL_REGULAR_EXPRESSION "Unrecognised warning option: "
|
||||||
|
)
|
||||||
|
|
||||||
|
add_test(NAME TestSpecs::WarnUnmatchedTestSpecFailsWithUnmatchedTestSpec
|
||||||
|
COMMAND
|
||||||
|
$<TARGET_FILE:SelfTest> Tracker, "___nonexistent_test___" --warn UnmatchedTestSpec
|
||||||
|
)
|
||||||
|
set_tests_properties(TestSpecs::WarnUnmatchedTestSpecFailsWithUnmatchedTestSpec
|
||||||
|
PROPERTIES
|
||||||
|
WILL_FAIL ON
|
||||||
|
)
|
||||||
|
|
||||||
add_test(NAME UnmatchedOutputFilter COMMAND $<TARGET_FILE:SelfTest> [this-tag-does-not-exist])
|
add_test(NAME UnmatchedOutputFilter COMMAND $<TARGET_FILE:SelfTest> [this-tag-does-not-exist])
|
||||||
set_tests_properties(UnmatchedOutputFilter
|
set_tests_properties(UnmatchedOutputFilter
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
|
Loading…
Reference in New Issue
Block a user