1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: fix link to QTest::failOnWarning

Browse Source 
Also fix incorrect failOnWarning*s* elsewhere in comments.

Change-Id: I0bbc5e71060348153876f3d9a7c77c67f3c2e00d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 9e31631557ea3f99506377ff91a1e15e942f9e88)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2023-03-01 17:02:31 +01:00 committed by Qt Cherry-pick Bot
parent 908b5ebdc9
commit 2e1233d3ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/doc/src/qttest-best-practices.qdoc
View File

@ -383,12 +383,12 @@
only tell you whether \e{the test} was built in debug mode, and that does only tell you whether \e{the test} was built in debug mode, and that does
not guarantee that the \e{Qt libraries} were also built in debug mode. not guarantee that the \e{Qt libraries} were also built in debug mode.
Your tests can (since Qt 6.3) verify that they do not trigger calls to \l Your tests can (since Qt 6.3) verify that they do not trigger calls to
qWarning() by calling \l QTest::failOnWarnings(). This takes the warning \l qWarning() by calling \l QTest::failOnWarning(). This takes the warning
message to test for or a \l QRegularExpression to match against warnings; if message to test for or a \l QRegularExpression to match against warnings; if
a matching warning is produced, it will be reported and cause the test to a matching warning is produced, it will be reported and cause the test to
fail. For example, a test that should produce no warnings at all can fail. For example, a test that should produce no warnings at all can
\c{QTest::failOnWarnings(QRegularExpression(u".*"_s))}, which will match any \c{QTest::failOnWarning(QRegularExpression(u".*"_s))}, which will match any
warning at all. warning at all.
You can also set the environment variable \c QT_FATAL_WARNINGS to cause You can also set the environment variable \c QT_FATAL_WARNINGS to cause

2
src/testlib/qtestlog.cpp
View File

@ -179,7 +179,7 @@ namespace QTest {
static bool handleFailOnWarning(const QMessageLogContext &context, const QString &message) static bool handleFailOnWarning(const QMessageLogContext &context, const QString &message)
{ {
// failOnWarnings can be called multiple times per test function, so let // failOnWarning can be called multiple times per test function, so let
// each call cause a failure if required. // each call cause a failure if required.
for (const auto &pattern : failOnWarningList) { for (const auto &pattern : failOnWarningList) {
if (pattern.metaType() == QMetaType::fromType<QString>()) { if (pattern.metaType() == QMetaType::fromType<QString>()) {

2
tests/auto/testlib/selftests/warnings/tst_warnings.cpp
View File

@ -115,7 +115,7 @@ void tst_Warnings::testMissingWarningsWithData()
void tst_Warnings::testFailOnWarnings() void tst_Warnings::testFailOnWarnings()
{ {
// failOnWarnings() wasn't called yet; shouldn't fail; // failOnWarning() wasn't called yet; shouldn't fail;
qWarning("Ran out of space!"); qWarning("Ran out of space!");
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)