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

autotests: Make QuickTilingTest not expect a configure event after starting move

Browse source 
No configure event is sent after starting interactive move anymore, but
QuickTilingTest has not been adjusted to the new behavior.
This commit is contained in:
Vlad Zahorodnii 2022-01-14 12:44:46 +02:00
parent fce4b635fb
commit ef3ba9b4e8
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
autotests/integration/quick_tiling_test.cpp
View file

@ -437,8 +437,6 @@ void QuickTilingTest::testQuickTilingPointerMove()
workspace()->performWindowOperation(c, Options::UnrestrictedMoveOp); workspace()->performWindowOperation(c, Options::UnrestrictedMoveOp);
QCOMPARE(c, workspace()->moveResizeClient()); QCOMPARE(c, workspace()->moveResizeClient());
QCOMPARE(Cursors::self()->mouse()->pos(), QPoint(49, 24)); QCOMPARE(Cursors::self()->mouse()->pos(), QPoint(49, 24));
QVERIFY(surfaceConfigureRequestedSpy.wait());
QCOMPARE(surfaceConfigureRequestedSpy.count(), 3);
QFETCH(QPoint, targetPos); QFETCH(QPoint, targetPos);
quint32 timestamp = 1; quint32 timestamp = 1;
@ -451,7 +449,7 @@ void QuickTilingTest::testQuickTilingPointerMove()
QCOMPARE(quickTileChangedSpy.count(), 1); QCOMPARE(quickTileChangedSpy.count(), 1);
QTEST(c->quickTileMode(), "expectedMode"); QTEST(c->quickTileMode(), "expectedMode");
QVERIFY(surfaceConfigureRequestedSpy.wait()); QVERIFY(surfaceConfigureRequestedSpy.wait());
QCOMPARE(surfaceConfigureRequestedSpy.count(), 4); QCOMPARE(surfaceConfigureRequestedSpy.count(), 3);
QCOMPARE(false, toplevelConfigureRequestedSpy.last().first().toSize().isEmpty()); QCOMPARE(false, toplevelConfigureRequestedSpy.last().first().toSize().isEmpty());
} }
@ -511,11 +509,12 @@ void QuickTilingTest::testQuickTilingTouchMove()
QSignalSpy quickTileChangedSpy(c, &AbstractClient::quickTileModeChanged); QSignalSpy quickTileChangedSpy(c, &AbstractClient::quickTileModeChanged);
QVERIFY(quickTileChangedSpy.isValid()); QVERIFY(quickTileChangedSpy.isValid());
// Note that interactive move will be started with a delay.
quint32 timestamp = 1; quint32 timestamp = 1;
QSignalSpy clientStartUserMovedResizedSpy(c, &AbstractClient::clientStartUserMovedResized);
kwinApp()->platform()->touchDown(0, QPointF(c->frameGeometry().center().x(), c->frameGeometry().y() + decoration->borderTop() / 2), timestamp++); kwinApp()->platform()->touchDown(0, QPointF(c->frameGeometry().center().x(), c->frameGeometry().y() + decoration->borderTop() / 2), timestamp++);
QVERIFY(surfaceConfigureRequestedSpy.wait()); QVERIFY(clientStartUserMovedResizedSpy.wait());
QCOMPARE(c, workspace()->moveResizeClient()); QCOMPARE(c, workspace()->moveResizeClient());
QCOMPARE(surfaceConfigureRequestedSpy.count(), 3);
QFETCH(QPoint, targetPos); QFETCH(QPoint, targetPos);
kwinApp()->platform()->touchMotion(0, targetPos, timestamp++); kwinApp()->platform()->touchMotion(0, targetPos, timestamp++);
@ -530,7 +529,7 @@ void QuickTilingTest::testQuickTilingTouchMove()
QCOMPARE(quickTileChangedSpy.count(), 1); QCOMPARE(quickTileChangedSpy.count(), 1);
QTEST(c->quickTileMode(), "expectedMode"); QTEST(c->quickTileMode(), "expectedMode");
QVERIFY(surfaceConfigureRequestedSpy.wait()); QVERIFY(surfaceConfigureRequestedSpy.wait());
QTRY_COMPARE(surfaceConfigureRequestedSpy.count(), hasBorders ? 5 : 4); QTRY_COMPARE(surfaceConfigureRequestedSpy.count(), hasBorders ? 4 : 3);
QCOMPARE(false, toplevelConfigureRequestedSpy.last().first().toSize().isEmpty()); QCOMPARE(false, toplevelConfigureRequestedSpy.last().first().toSize().isEmpty());
} }