yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autotests: Fix testXwaylandInput in Qt 6 build

Browse source 
The test fails because of type mismatches between QPoint and QPointF, Qt
5 is not so strict about this.
This commit is contained in:
Vlad Zahorodnii 2022-10-22 23:30:49 +03:00
parent 7c74b7de4a
commit 774426d2ad
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
autotests/integration/xwayland_input_test.cpp
View file

@ -174,12 +174,12 @@ void XWaylandInputTest::testPointerEnterLeaveSsd()
Cursors::self()->mouse()->setPos(window->frameGeometry().center());
QCOMPARE(waylandServer()->seat()->focusedPointerSurface(), window->surface());
QVERIFY(enteredSpy.wait());
QCOMPARE(enteredSpy.last().first(), window->frameGeometry().center() - window->clientPos());
QCOMPARE(enteredSpy.last().first().toPoint(), (window->frameGeometry().center() - window->clientPos()).toPoint());
// move out of window
Cursors::self()->mouse()->setPos(window->frameGeometry().bottomRight() + QPoint(10, 10));
Cursors::self()->mouse()->setPos(window->frameGeometry().bottomRight() + QPointF(10, 10));
QVERIFY(leftSpy.wait());
QCOMPARE(leftSpy.last().first(), window->frameGeometry().center() - window->clientPos());
QCOMPARE(leftSpy.last().first().toPoint(), (window->frameGeometry().center() - window->clientPos()).toPoint());
// destroy window again
QSignalSpy windowClosedSpy(window, &X11Window::windowClosed);
@ -246,8 +246,8 @@ void XWaylandInputTest::testPointerEventLeaveCsd()
QVERIFY(window);
QVERIFY(!window->isDecorated());
QVERIFY(window->isClientSideDecorated());
QCOMPARE(window->bufferGeometry(), QRect(0, 0, 120, 225));
QCOMPARE(window->frameGeometry(), QRect(10, 5, 100, 200));
QCOMPARE(window->bufferGeometry(), QRectF(0, 0, 120, 225));
QCOMPARE(window->frameGeometry(), QRectF(10, 5, 100, 200));
QMetaObject::invokeMethod(window, "setReadyForPainting");
QVERIFY(window->readyForPainting());
@ -259,13 +259,13 @@ void XWaylandInputTest::testPointerEventLeaveCsd()
Cursors::self()->mouse()->setPos(window->frameGeometry().center());
QCOMPARE(waylandServer()->seat()->focusedPointerSurface(), window->surface());
QVERIFY(enteredSpy.wait());
QCOMPARE(enteredSpy.last().first(), QPointF(60, 105));
QCOMPARE(enteredSpy.last().first().toPoint(), QPoint(60, 105));
// Move out of the window, should trigger a leave.
QVERIFY(leftSpy.isEmpty());
Cursors::self()->mouse()->setPos(window->frameGeometry().bottomRight() + QPoint(100, 100));
QVERIFY(leftSpy.wait());
QCOMPARE(leftSpy.last().first(), QPointF(60, 105));
QCOMPARE(leftSpy.last().first().toPoint(), QPoint(60, 105));
// Destroy the window.
QSignalSpy windowClosedSpy(window, &X11Window::windowClosed);