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

Modernise tst_QWidget::widgetAt()

Browse Source 
- use QTRY_COMPARE instead of QTRY_VERIFY(a == b)
- compare pointers, instead of object names
- compare results directly, instead of storing them in temp variables

Task-number: QTBUG-130811
Change-Id: I0e1f9b596a0624c351d374d089a2f194468f1a8d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Axel Spoerl 2024-11-07 12:42:59 +01:00
parent 90be6609bd
commit 6ac399b8f0
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -4628,29 +4628,26 @@ void tst_QWidget::widgetAt()
w1->showNormal(); w1->showNormal();
QVERIFY(QTest::qWaitForWindowExposed(w1.data())); QVERIFY(QTest::qWaitForWindowExposed(w1.data()));
const QPoint testPos = referencePos + QPoint(100, 100); const QPoint testPos = referencePos + QPoint(100, 100);
QWidget *wr; QTRY_COMPARE(QApplication::widgetAt((testPos)), w1.data());
QTRY_VERIFY((wr = QApplication::widgetAt((testPos))));
QCOMPARE(wr->objectName(), QString("w1"));
w2->showNormal(); w2->showNormal();
QVERIFY(QTest::qWaitForWindowExposed(w2.data())); QVERIFY(QTest::qWaitForWindowExposed(w2.data()));
QTRY_VERIFY((wr = QApplication::widgetAt(testPos))); QTRY_COMPARE(QApplication::widgetAt(testPos), w2.data());
QCOMPARE(wr->objectName(), QString("w2"));
w2->lower(); w2->lower();
QTRY_VERIFY((wr = QApplication::widgetAt(testPos)) && wr->objectName() == QString("w1")); QTRY_COMPARE(QApplication::widgetAt(testPos), w1.data());
w2->raise(); w2->raise();
QTRY_VERIFY((wr = QApplication::widgetAt(testPos)) && wr->objectName() == QString("w2")); QTRY_COMPARE(QApplication::widgetAt(testPos), w2.data());
QWidget *w3 = new QWidget(w2.data()); QWidget *w3 = new QWidget(w2.data());
w3->setGeometry(10,10,50,50); w3->setGeometry(10,10,50,50);
w3->setObjectName("w3"); w3->setObjectName("w3");
w3->showNormal(); w3->showNormal();
QTRY_VERIFY((wr = QApplication::widgetAt(testPos)) && wr->objectName() == QString("w3")); QTRY_COMPARE(QApplication::widgetAt(testPos), w3);
w3->setAttribute(Qt::WA_TransparentForMouseEvents); w3->setAttribute(Qt::WA_TransparentForMouseEvents);
QTRY_VERIFY((wr = QApplication::widgetAt(testPos)) && wr->objectName() == QString("w2")); QTRY_COMPARE(QApplication::widgetAt(testPos), w2.data());
if (!QGuiApplicationPrivate::platformIntegration() if (!QGuiApplicationPrivate::platformIntegration()
->hasCapability(QPlatformIntegration::WindowMasks)) { ->hasCapability(QPlatformIntegration::WindowMasks)) {
@ -4662,10 +4659,8 @@ void tst_QWidget::widgetAt()
rgn -= QRect(point, QSize(1,1)); rgn -= QRect(point, QSize(1,1));
w2->setMask(rgn); w2->setMask(rgn);
QTRY_VERIFY((wr = QApplication::widgetAt(testPos))); QTRY_COMPARE(QApplication::widgetAt(testPos), w1.data());
QTRY_COMPARE(wr->objectName(), w1->objectName()); QTRY_COMPARE(QApplication::widgetAt(testPos + QPoint(1, 1)), w2.data());
QTRY_VERIFY((wr = QApplication::widgetAt(testPos + QPoint(1, 1))));
QTRY_COMPARE(wr->objectName(), w2->objectName());
QBitmap bitmap(w2->size()); QBitmap bitmap(w2->size());
QPainter p(&bitmap); QPainter p(&bitmap);
@ -4675,7 +4670,7 @@ void tst_QWidget::widgetAt()
p.end(); p.end();
w2->setMask(bitmap); w2->setMask(bitmap);
QTRY_COMPARE(QApplication::widgetAt(testPos), w1.data()); QTRY_COMPARE(QApplication::widgetAt(testPos), w1.data());
QTRY_VERIFY(QApplication::widgetAt(testPos + QPoint(1, 1)) == w2.data()); QTRY_COMPARE(QApplication::widgetAt(testPos + QPoint(1, 1)), w2.data());
} }
void tst_QWidget::task110173() void tst_QWidget::task110173()