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

autotests: Use fewer Window::clientPos()

Browse source
This commit is contained in:
Vlad Zahorodnii 2022-11-08 19:40:58 +02:00 committed by David Edmundson
parent 462d5f0642
commit 64a6a70b3e
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
autotests/integration/decoration_input_test.cpp
View file

@ -177,7 +177,7 @@ void DecorationInputTest::testAxis()
QVERIFY(!window->keepBelow());
quint32 timestamp = 1;
MOTION(QPoint(window->frameGeometry().center().x(), window->clientPos().y() / 2));
MOTION(QPoint(window->frameGeometry().center().x(), window->frameMargins().top() / 2.0));
QVERIFY(input()->pointer()->decoration());
QCOMPARE(input()->pointer()->decoration()->decoration()->sectionUnderMouse(), Qt::TitleBarArea);
@ -223,7 +223,7 @@ void KWin::DecorationInputTest::testDoubleClick()
QVERIFY(!window->noBorder());
QVERIFY(!window->isOnAllDesktops());
quint32 timestamp = 1;
MOTION(QPoint(window->frameGeometry().center().x(), window->clientPos().y() / 2));
MOTION(QPoint(window->frameGeometry().center().x(), window->frameMargins().top() / 2.0));
// double click
PRESS;
@ -273,7 +273,7 @@ void KWin::DecorationInputTest::testDoubleTap()
QVERIFY(!window->noBorder());
QVERIFY(!window->isOnAllDesktops());
quint32 timestamp = 1;
const QPoint tapPoint(window->frameGeometry().center().x(), window->clientPos().y() / 2);
const QPoint tapPoint(window->frameGeometry().center().x(), window->frameMargins().top() / 2.0);
// double tap
Test::touchDown(0, tapPoint, timestamp++);
@ -318,7 +318,7 @@ void DecorationInputTest::testHover()
window->move(QPoint(20, 0));
quint32 timestamp = 1;
MOTION(QPoint(window->frameGeometry().center().x(), window->clientPos().y() / 2));
MOTION(QPoint(window->frameGeometry().center().x(), window->frameMargins().top() / 2.0));
QCOMPARE(window->cursor(), CursorShape(Qt::ArrowCursor));
// There is a mismatch of the cursor key positions between windows
@ -377,13 +377,13 @@ void DecorationInputTest::testPressToMove()
QSignalSpy clientFinishUserMovedResizedSpy(window, &Window::clientFinishUserMovedResized);
quint32 timestamp = 1;
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2));
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0));
QCOMPARE(window->cursor(), CursorShape(Qt::ArrowCursor));
PRESS;
QVERIFY(!window->isInteractiveMove());
QFETCH(QPoint, offset);
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2) + offset);
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0) + offset);
const QPointF oldPos = window->pos();
QVERIFY(window->isInteractiveMove());
QCOMPARE(startMoveResizedSpy.count(), 1);
@ -398,11 +398,11 @@ void DecorationInputTest::testPressToMove()
PRESS;
QVERIFY(!window->isInteractiveMove());
QFETCH(QPoint, offset2);
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2) + offset2);
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0) + offset2);
QVERIFY(window->isInteractiveMove());
QCOMPARE(startMoveResizedSpy.count(), 2);
QFETCH(QPoint, offset3);
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2) + offset3);
MOTION(QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0) + offset3);
RELEASE;
QTRY_VERIFY(!window->isInteractiveMove());
@ -434,7 +434,7 @@ void DecorationInputTest::testTapToMove()
QSignalSpy clientFinishUserMovedResizedSpy(window, &Window::clientFinishUserMovedResized);
quint32 timestamp = 1;
QPoint p = QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2);
QPoint p = QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0);
Test::touchDown(0, p, timestamp++);
QVERIFY(!window->isInteractiveMove());
@ -456,11 +456,11 @@ void DecorationInputTest::testTapToMove()
QCOMPARE(input()->touch()->decorationPressId(), 1);
QVERIFY(!window->isInteractiveMove());
QFETCH(QPoint, offset2);
Test::touchMotion(1, QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2) + offset2, timestamp++);
Test::touchMotion(1, QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0) + offset2, timestamp++);
QVERIFY(window->isInteractiveMove());
QCOMPARE(startMoveResizedSpy.count(), 2);
QFETCH(QPoint, offset3);
Test::touchMotion(1, QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2) + offset3, timestamp++);
Test::touchMotion(1, QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0) + offset3, timestamp++);
Test::touchUp(1, timestamp++);
QTRY_VERIFY(!window->isInteractiveMove());
@ -591,7 +591,7 @@ void DecorationInputTest::testModifierClickUnrestrictedMove()
QVERIFY(!window->noBorder());
window->move(workspace()->activeOutput()->geometry().center() - QPoint(window->width() / 2, window->height() / 2));
// move cursor on window
Cursors::self()->mouse()->setPos(QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2));
Cursors::self()->mouse()->setPos(QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0));
// simulate modifier+click
quint32 timestamp = 1;
@ -653,7 +653,7 @@ void DecorationInputTest::testModifierScrollOpacity()
QVERIFY(!window->noBorder());
window->move(workspace()->activeOutput()->geometry().center() - QPoint(window->width() / 2, window->height() / 2));
// move cursor on window
Cursors::self()->mouse()->setPos(QPoint(window->frameGeometry().center().x(), window->y() + window->clientPos().y() / 2));
Cursors::self()->mouse()->setPos(QPoint(window->frameGeometry().center().x(), window->y() + window->frameMargins().top() / 2.0));
// set the opacity to 0.5
window->setOpacity(0.5);
QCOMPARE(window->opacity(), 0.5);
@ -716,7 +716,7 @@ void DecorationInputTest::testTouchEvents()
QSignalSpy hoverLeaveSpy(&helper, &EventHelper::hoverLeave);
quint32 timestamp = 1;
const QPoint tapPoint(window->frameGeometry().center().x(), window->clientPos().y() / 2);
const QPoint tapPoint(window->frameGeometry().center().x(), window->frameMargins().top() / 2.0);
QVERIFY(!input()->touch()->decoration());
Test::touchDown(0, tapPoint, timestamp++);

2
autotests/integration/pointer_input.cpp
View file

@ -1426,7 +1426,7 @@ void PointerInputTest::testDecoCancelsPopup()
QVERIFY(popupWindow != window);
QCOMPARE(window, workspace()->activeWindow());
QCOMPARE(popupWindow->transientFor(), window);
QCOMPARE(popupWindow->pos(), window->pos() + window->clientPos() + QPoint(80, 20));
QCOMPARE(popupWindow->pos(), window->mapFromLocal(QPoint(80, 20)));
QCOMPARE(popupWindow->hasPopupGrab(), true);
// let's move the pointer into the center of the deco

6
autotests/integration/touch_input_test.cpp
View file

@ -163,7 +163,7 @@ void TouchInputTest::testMultipleTouchPoints()
QSignalSpy endedSpy(m_touch, &KWayland::Client::Touch::sequenceEnded);
quint32 timestamp = 1;
Test::touchDown(1, QPointF(125, 125) + window->clientPos(), timestamp++);
Test::touchDown(1, window->mapFromLocal(QPointF(25, 25)), timestamp++);
QVERIFY(sequenceStartedSpy.wait());
QCOMPARE(sequenceStartedSpy.count(), 1);
QCOMPARE(m_touch->sequence().count(), 1);
@ -173,7 +173,7 @@ void TouchInputTest::testMultipleTouchPoints()
QCOMPARE(pointMovedSpy.count(), 0);
// a point outside the window
Test::touchDown(2, QPointF(0, 0) + window->clientPos(), timestamp++);
Test::touchDown(2, window->mapFromLocal(QPointF(-100, -100)), timestamp++);
QVERIFY(pointAddedSpy.wait());
QCOMPARE(pointAddedSpy.count(), 1);
QCOMPARE(m_touch->sequence().count(), 2);
@ -182,7 +182,7 @@ void TouchInputTest::testMultipleTouchPoints()
QCOMPARE(pointMovedSpy.count(), 0);
// let's move that one
Test::touchMotion(2, QPointF(100, 100) + window->clientPos(), timestamp++);
Test::touchMotion(2, window->mapFromLocal(QPointF(0, 0)), timestamp++);
QVERIFY(pointMovedSpy.wait());
QCOMPARE(pointMovedSpy.count(), 1);
QCOMPARE(m_touch->sequence().count(), 2);

4
autotests/integration/xwayland_input_test.cpp
View file

@ -173,12 +173,12 @@ void XWaylandInputTest::testPointerEnterLeaveSsd()
Cursors::self()->mouse()->setPos(window->frameGeometry().center());
QCOMPARE(waylandServer()->seat()->focusedPointerSurface(), window->surface());
QVERIFY(enteredSpy.wait());
QCOMPARE(enteredSpy.last().first().toPoint(), (window->frameGeometry().center() - window->clientPos()).toPoint());
QCOMPARE(enteredSpy.last().first().toPoint(), (window->frameGeometry().center() - QPointF(window->frameMargins().left(), window->frameMargins().top())).toPoint());
// move out of window
Cursors::self()->mouse()->setPos(window->frameGeometry().bottomRight() + QPointF(10, 10));
QVERIFY(leftSpy.wait());
QCOMPARE(leftSpy.last().first().toPoint(), (window->frameGeometry().center() - window->clientPos()).toPoint());
QCOMPARE(leftSpy.last().first().toPoint(), (window->frameGeometry().center() - QPointF(window->frameMargins().left(), window->frameMargins().top())).toPoint());
// destroy window again
QSignalSpy windowClosedSpy(window, &X11Window::windowClosed);