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

[autotests] Stabilize testMoveResize

Browse source
This commit is contained in:
Vlad Zahorodnii 2019-09-12 20:18:14 +03:00
parent 2b73484976
commit 0962cc661c
1 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
autotests/integration/move_resize_window_test.cpp
View file

@ -916,33 +916,39 @@ void MoveResizeWindowTest::testResizeForVirtualKeyboard()
QScopedPointer<Surface> surface(Test::createSurface()); QScopedPointer<Surface> surface(Test::createSurface());
QVERIFY(!surface.isNull()); QVERIFY(!surface.isNull());
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellSurface( QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
Test::ShellSurfaceType::XdgShellStable, surface.data()));
QVERIFY(!shellSurface.isNull()); QVERIFY(!shellSurface.isNull());
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
// let's render // let's render
auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue); auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue);
QVERIFY(client);
// The client should receive a configure event upon becoming active.
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
QVERIFY(configureRequestedSpy.isValid());
QVERIFY(configureRequestedSpy.wait());
client->move(100, 300); client->move(100, 300);
QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged); QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged);
QVERIFY(geometryChangedSpy.isValid());
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800)); QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500)); client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
configureRequestedSpy.wait(); QVERIFY(configureRequestedSpy.wait());
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt()); shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
// render at the new size // render at the new size
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue); Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
geometryChangedSpy.wait(); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(client->geometry(), QRect(100, 0, 500, 101)); QCOMPARE(client->geometry(), QRect(100, 0, 500, 101));
client->setVirtualKeyboardGeometry(QRect()); client->setVirtualKeyboardGeometry(QRect());
configureRequestedSpy.wait(); QVERIFY(configureRequestedSpy.wait());
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt()); shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
// render at the new size // render at the new size
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue); Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
geometryChangedSpy.wait(); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800)); QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
} }
@ -953,35 +959,39 @@ void MoveResizeWindowTest::testResizeForVirtualKeyboardWithMaximize()
QScopedPointer<Surface> surface(Test::createSurface()); QScopedPointer<Surface> surface(Test::createSurface());
QVERIFY(!surface.isNull()); QVERIFY(!surface.isNull());
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellSurface( QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
Test::ShellSurfaceType::XdgShellStable, surface.data()));
QVERIFY(!shellSurface.isNull()); QVERIFY(!shellSurface.isNull());
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
// let's render // let's render
auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue); auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue);
QVERIFY(client);
// The client should receive a configure event upon becoming active.
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
QVERIFY(configureRequestedSpy.isValid());
QVERIFY(configureRequestedSpy.wait());
client->move(100, 300); client->move(100, 300);
QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged); QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged);
QVERIFY(geometryChangedSpy.isValid());
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800)); QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500)); client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
configureRequestedSpy.wait(); QVERIFY(configureRequestedSpy.wait());
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt()); shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
// render at the new size // render at the new size
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue); Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
geometryChangedSpy.wait(); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(client->geometry(), QRect(100, 0, 500, 101)); QCOMPARE(client->geometry(), QRect(100, 0, 500, 101));
client->setMaximize(true, true); client->setMaximize(true, true);
configureRequestedSpy.wait(); QVERIFY(configureRequestedSpy.wait());
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt()); shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue); Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
geometryChangedSpy.wait(); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024)); QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024));
client->setVirtualKeyboardGeometry(QRect()); client->setVirtualKeyboardGeometry(QRect());
QVERIFY(!configureRequestedSpy.wait(10)); QVERIFY(!configureRequestedSpy.wait(10));
@ -1000,35 +1010,39 @@ void MoveResizeWindowTest::testResizeForVirtualKeyboardWithFullScreen()
QScopedPointer<Surface> surface(Test::createSurface()); QScopedPointer<Surface> surface(Test::createSurface());
QVERIFY(!surface.isNull()); QVERIFY(!surface.isNull());
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellSurface( QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data()));
Test::ShellSurfaceType::XdgShellStable, surface.data()));
QVERIFY(!shellSurface.isNull()); QVERIFY(!shellSurface.isNull());
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
// let's render // let's render
auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue); auto client = Test::renderAndWaitForShown(surface.data(), QSize(500, 800), Qt::blue);
QVERIFY(client);
// The client should receive a configure event upon becoming active.
QSignalSpy configureRequestedSpy(shellSurface.data(), &XdgShellSurface::configureRequested);
QVERIFY(configureRequestedSpy.isValid());
QVERIFY(configureRequestedSpy.wait());
client->move(100, 300); client->move(100, 300);
QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged); QSignalSpy geometryChangedSpy(client, &ShellClient::geometryChanged);
QVERIFY(geometryChangedSpy.isValid());
QCOMPARE(client->geometry(), QRect(100, 300, 500, 800)); QCOMPARE(client->geometry(), QRect(100, 300, 500, 800));
client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500)); client->setVirtualKeyboardGeometry(QRect(0, 100, 1280, 500));
configureRequestedSpy.wait(); QVERIFY(configureRequestedSpy.wait());
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt()); shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
// render at the new size // render at the new size
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue); Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
geometryChangedSpy.wait(); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(client->geometry(), QRect(100, 0, 500, 101)); QCOMPARE(client->geometry(), QRect(100, 0, 500, 101));
client->setFullScreen(true, true); client->setFullScreen(true, true);
configureRequestedSpy.wait(); QVERIFY(configureRequestedSpy.wait());
shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt()); shellSurface->ackConfigure(configureRequestedSpy.last()[2].toInt());
Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue); Test::render(surface.data(), configureRequestedSpy.last().first().toSize(), Qt::blue);
geometryChangedSpy.wait(); QVERIFY(geometryChangedSpy.wait());
QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024)); QCOMPARE(client->geometry(), QRect(0, 0, 1280, 1024));
client->setVirtualKeyboardGeometry(QRect()); client->setVirtualKeyboardGeometry(QRect());
QVERIFY(!configureRequestedSpy.wait(10)); QVERIFY(!configureRequestedSpy.wait(10));