From d78d6866908334e1bc77d3e52418e58a0444efdc Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 12 May 2021 20:44:18 +0300 Subject: [PATCH] autotests: Stabilize ActivationTest::testSwitchToWindowMaximized --- autotests/integration/activation_test.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/autotests/integration/activation_test.cpp b/autotests/integration/activation_test.cpp index c33480c153..571f3194cf 100644 --- a/autotests/integration/activation_test.cpp +++ b/autotests/integration/activation_test.cpp @@ -362,13 +362,12 @@ void ActivationTest::testSwitchToWindowMaximized() // Create several maximized clients on the left screen. QScopedPointer surface1(Test::createSurface()); QScopedPointer shellSurface1(Test::createXdgToplevelSurface(surface1.data())); + QSignalSpy toplevelConfigureRequestedSpy1(shellSurface1.data(), &Test::XdgToplevel::configureRequested); + QSignalSpy surfaceConfigureRequestedSpy1(shellSurface1->xdgSurface(), &Test::XdgSurface::configureRequested); AbstractClient *client1 = Test::renderAndWaitForShown(surface1.data(), QSize(100, 50), Qt::blue); QVERIFY(client1); QVERIFY(client1->isActive()); - QSignalSpy toplevelConfigureRequestedSpy1(shellSurface1.data(), &Test::XdgToplevel::configureRequested); - QVERIFY(toplevelConfigureRequestedSpy1.isValid()); - QSignalSpy surfaceConfigureRequestedSpy1(shellSurface1->xdgSurface(), &Test::XdgSurface::configureRequested); - QVERIFY(surfaceConfigureRequestedSpy1.isValid()); + QVERIFY(surfaceConfigureRequestedSpy1.wait()); // Wait for the configure event with the activated state. workspace()->slotWindowMaximize(); QVERIFY(surfaceConfigureRequestedSpy1.wait()); QSignalSpy frameGeometryChangedSpy1(client1, &AbstractClient::frameGeometryChanged); @@ -379,13 +378,12 @@ void ActivationTest::testSwitchToWindowMaximized() QScopedPointer surface2(Test::createSurface()); QScopedPointer shellSurface2(Test::createXdgToplevelSurface(surface2.data())); + QSignalSpy toplevelConfigureRequestedSpy2(shellSurface2.data(), &Test::XdgToplevel::configureRequested); + QSignalSpy surfaceConfigureRequestedSpy2(shellSurface2->xdgSurface(), &Test::XdgSurface::configureRequested); AbstractClient *client2 = Test::renderAndWaitForShown(surface2.data(), QSize(100, 50), Qt::blue); QVERIFY(client2); QVERIFY(client2->isActive()); - QSignalSpy toplevelConfigureRequestedSpy2(shellSurface2.data(), &Test::XdgToplevel::configureRequested); - QVERIFY(toplevelConfigureRequestedSpy2.wait()); - QSignalSpy surfaceConfigureRequestedSpy2(shellSurface2->xdgSurface(), &Test::XdgSurface::configureRequested); - QVERIFY(surfaceConfigureRequestedSpy2.isValid()); + QVERIFY(surfaceConfigureRequestedSpy2.wait()); // Wait for the configure event with the activated state. workspace()->slotWindowMaximize(); QVERIFY(surfaceConfigureRequestedSpy2.wait()); QSignalSpy frameGeometryChangedSpy2(client2, &AbstractClient::frameGeometryChanged);