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

Prevent takeStandardSnapshots() from stopping on first mismatch

Browse Source 
Force takeStandardSnapshots() to take and log all snapshots before
launching QFAIL. Macros QBASELINE_CHECK_DEFERRED and
QBASELINE_CHECK_DEFERRED_SUM have been added in qbaselinetest.h

Task-number: QTBUG-99790
Pick-to: 6.3
Change-Id: Ia015de808f354e842ac4029c5c84be18c4a4e209
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Axel Spoerl 2022-01-14 09:04:31 +01:00
parent 6ee2664883
commit fd93c298d6
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/baseline/shared/qbaselinetest.h
View File

@ -58,8 +58,21 @@ do {\
}\ }\
} while (0) } while (0)
#define QBASELINE_CHECK_SUM_DEFERRED(image, name, checksum)\
do {\
QByteArray _msg;\
bool _err = false;\
if (!QBaselineTest::checkImage((image), (name), (checksum), &_msg, &_err)) {\
QTest::qFail(_msg.constData(), __FILE__, __LINE__);\
} else if (_err) {\
QSKIP(_msg.constData());\
}\
} while (0)
#define QBASELINE_CHECK(image, name) QBASELINE_CHECK_SUM(image, name, 0) #define QBASELINE_CHECK(image, name) QBASELINE_CHECK_SUM(image, name, 0)
#define QBASELINE_CHECK_DEFERRED(image, name) QBASELINE_CHECK_SUM_DEFERRED(image, name, 0)
#define QBASELINE_TEST(image)\ #define QBASELINE_TEST(image)\
do {\ do {\
QByteArray _msg;\ QByteArray _msg;\

9
tests/baseline/shared/qwidgetbaselinetest.cpp
View File

@ -149,7 +149,7 @@ void QWidgetBaselineTest::takeStandardSnapshots()
bool focusNextPrevChild(bool next) override { return QWidget::focusNextPrevChild(next); } bool focusNextPrevChild(bool next) override { return QWidget::focusNextPrevChild(next); }
}; };
QBASELINE_CHECK(takeSnapshot(), "default"); QBASELINE_CHECK_DEFERRED(takeSnapshot(), "default");
// try hard to set focus // try hard to set focus
static_cast<PublicWidget*>(window)->focusNextPrevChild(true); static_cast<PublicWidget*>(window)->focusNextPrevChild(true);
@ -158,14 +158,15 @@ void QWidgetBaselineTest::takeStandardSnapshots()
if (firstChild) if (firstChild)
firstChild->setFocus(); firstChild->setFocus();
} }
if (testWindow()->focusWidget()) { if (testWindow()->focusWidget()) {
QBASELINE_CHECK(takeSnapshot(), "focused"); QBASELINE_CHECK_DEFERRED(takeSnapshot(), "focused");
testWindow()->focusWidget()->clearFocus(); testWindow()->focusWidget()->clearFocus();
} }
// this disables all children // this disables all children
window->setEnabled(false); window->setEnabled(false);
QBASELINE_CHECK(takeSnapshot(), "disabled"); QBASELINE_CHECK_DEFERRED(takeSnapshot(), "disabled");
window->setEnabled(true); window->setEnabled(true);
// show and activate another window so that our test window becomes inactive // show and activate another window so that our test window becomes inactive
@ -176,7 +177,7 @@ void QWidgetBaselineTest::takeStandardSnapshots()
otherWindow.show(); otherWindow.show();
otherWindow.windowHandle()->requestActivate(); otherWindow.windowHandle()->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(&otherWindow)); QVERIFY(QTest::qWaitForWindowActive(&otherWindow));
QBASELINE_CHECK(takeSnapshot(), "inactive"); QBASELINE_CHECK_DEFERRED(takeSnapshot(), "inactive");
window->windowHandle()->requestActivate(); window->windowHandle()->requestActivate();
QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QTest::qWaitForWindowActive(window));