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

autotests: Use new xdg-shell helpers in ToplevelOpenCloseAnimationTest

Browse source
This commit is contained in:
Vlad Zahorodnii 2020-09-02 12:44:53 +03:00
parent 2691b84c99
commit 6dbc060596
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
autotests/integration/effects/toplevel_open_close_animation_test.cpp
View file

@ -22,7 +22,6 @@
#include "effect_builtins.h" #include "effect_builtins.h"
#include <KWayland/Client/surface.h> #include <KWayland/Client/surface.h>
#include <KWayland/Client/xdgshell.h>
using namespace KWin; using namespace KWin;
@ -122,7 +121,7 @@ void ToplevelOpenCloseAnimationTest::testAnimateToplevels()
using namespace KWayland::Client; using namespace KWayland::Client;
QScopedPointer<Surface> surface(Test::createSurface()); QScopedPointer<Surface> surface(Test::createSurface());
QVERIFY(!surface.isNull()); QVERIFY(!surface.isNull());
QScopedPointer<XdgShellSurface> shellSurface(Test::createXdgShellStableSurface(surface.data())); QScopedPointer<Test::XdgToplevel> shellSurface(Test::createXdgToplevelSurface(surface.data()));
QVERIFY(!shellSurface.isNull()); QVERIFY(!shellSurface.isNull());
AbstractClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue); AbstractClient *client = Test::renderAndWaitForShown(surface.data(), QSize(100, 50), Qt::blue);
QVERIFY(client); QVERIFY(client);
@ -166,7 +165,7 @@ void ToplevelOpenCloseAnimationTest::testDontAnimatePopups()
using namespace KWayland::Client; using namespace KWayland::Client;
QScopedPointer<Surface> mainWindowSurface(Test::createSurface()); QScopedPointer<Surface> mainWindowSurface(Test::createSurface());
QVERIFY(!mainWindowSurface.isNull()); QVERIFY(!mainWindowSurface.isNull());
QScopedPointer<XdgShellSurface> mainWindowShellSurface(Test::createXdgShellStableSurface(mainWindowSurface.data())); QScopedPointer<Test::XdgToplevel> mainWindowShellSurface(Test::createXdgToplevelSurface(mainWindowSurface.data()));
QVERIFY(!mainWindowShellSurface.isNull()); QVERIFY(!mainWindowShellSurface.isNull());
AbstractClient *mainWindow = Test::renderAndWaitForShown(mainWindowSurface.data(), QSize(100, 50), Qt::blue); AbstractClient *mainWindow = Test::renderAndWaitForShown(mainWindowSurface.data(), QSize(100, 50), Qt::blue);
QVERIFY(mainWindow); QVERIFY(mainWindow);
@ -183,12 +182,15 @@ void ToplevelOpenCloseAnimationTest::testDontAnimatePopups()
// Create a popup, it should not be animated. // Create a popup, it should not be animated.
QScopedPointer<Surface> popupSurface(Test::createSurface()); QScopedPointer<Surface> popupSurface(Test::createSurface());
QVERIFY(!popupSurface.isNull()); QVERIFY(!popupSurface.isNull());
XdgPositioner positioner(QSize(20, 20), QRect(0, 0, 10, 10)); QScopedPointer<Test::XdgPositioner> positioner(Test::createXdgPositioner());
positioner.setGravity(Qt::BottomEdge | Qt::RightEdge); QVERIFY(positioner);
positioner.setAnchorEdge(Qt::BottomEdge | Qt::LeftEdge); positioner->set_size(20, 20);
QScopedPointer<XdgShellPopup> popupShellSurface(Test::createXdgShellStablePopup(popupSurface.data(), mainWindowShellSurface.data(), positioner)); positioner->set_anchor_rect(0, 0, 10, 10);
positioner->set_gravity(Test::XdgPositioner::gravity_bottom_right);
positioner->set_anchor(Test::XdgPositioner::anchor_bottom_left);
QScopedPointer<Test::XdgPopup> popupShellSurface(Test::createXdgPopupSurface(popupSurface.data(), mainWindowShellSurface->xdgSurface(), positioner.data()));
QVERIFY(!popupShellSurface.isNull()); QVERIFY(!popupShellSurface.isNull());
AbstractClient *popup = Test::renderAndWaitForShown(popupSurface.data(), positioner.initialSize(), Qt::red); AbstractClient *popup = Test::renderAndWaitForShown(popupSurface.data(), QSize(20, 20), Qt::red);
QVERIFY(popup); QVERIFY(popup);
QVERIFY(popup->isPopupWindow()); QVERIFY(popup->isPopupWindow());
QCOMPARE(popup->transientFor(), mainWindow); QCOMPARE(popup->transientFor(), mainWindow);