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

Fix test to not rely on event processing

Browse Source 
QTest's simulation of mouse move events currently uses QCursor::setPos
and then processes events. This is unreliable across platforms.

This test relies on the event processing and either way has inverted
logic in the paint event; the painted region needs to at least include
the tab's rect, not the other way around. Also, the mouse move wasn't
needed here at all, and some styles don't have a different style for
pressed tabs anyway.

Pick-to: 6.2
Change-Id: Ib8f6f7be017ff87458e96ec419edcd065dd75b15
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2021-10-25 12:30:32 +02:00
parent 5ffc744b79
commit 05532a0968
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
View File

@ -842,9 +842,10 @@ void tst_QTabBar::mouseReleaseOutsideTabBar()
QRect rectToBeRepainted; QRect rectToBeRepainted;
bool eventFilter(QObject *, QEvent *event) override bool eventFilter(QObject *, QEvent *event) override
{ {
if (event->type() == QEvent::Paint if (event->type() == QEvent::Paint &&
&& rectToBeRepainted.contains(static_cast<QPaintEvent *>(event)->rect())) static_cast<QPaintEvent *>(event)->rect().contains(rectToBeRepainted)) {
repainted = true; repainted = true;
}
return false; return false;
} }
} repaintChecker; } repaintChecker;
@ -859,14 +860,15 @@ void tst_QTabBar::mouseReleaseOutsideTabBar()
QRect tabRect = tabBar.tabRect(1); QRect tabRect = tabBar.tabRect(1);
QPoint tabCenter = tabRect.center(); QPoint tabCenter = tabRect.center();
QTest::mousePress(&tabBar, Qt::LeftButton, {}, tabCenter);
QTest::mouseEvent(QTest::MouseMove, &tabBar, Qt::LeftButton, {}, tabCenter + QPoint(tabCenter.x(), tabCenter.y() + tabRect.height()));
// make sure the holding tab is repainted after releasing the mouse
repaintChecker.repainted = false;
repaintChecker.rectToBeRepainted = tabRect; repaintChecker.rectToBeRepainted = tabRect;
// if a press repaints the tab...
QTest::mousePress(&tabBar, Qt::LeftButton, {}, tabCenter);
const bool pressRepainted = QTest::qWaitFor([&]{ return repaintChecker.repainted; }, 250);
// ... then releasing the mouse outside the tabbar should repaint it as well
repaintChecker.repainted = false;
QTest::mouseRelease(&tabBar, Qt::LeftButton, {}, tabCenter + QPoint(tabCenter.x(), tabCenter.y() + tabRect.height())); QTest::mouseRelease(&tabBar, Qt::LeftButton, {}, tabCenter + QPoint(tabCenter.x(), tabCenter.y() + tabRect.height()));
QTRY_VERIFY(repaintChecker.repainted); QTRY_COMPARE(repaintChecker.repainted, pressRepainted);
} }
void tst_QTabBar::checkPositions(const TabBar &tabbar, const QList<int> &positions) void tst_QTabBar::checkPositions(const TabBar &tabbar, const QList<int> &positions)