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

autotests: Port testQuickTiling to AbstractOutput

Browse source
This commit is contained in:
Vlad Zahorodnii 2021-09-29 13:51:02 +03:00
parent 31b9f34d9b
commit 57a8d5ca50
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
autotests/integration/quick_tiling_test.cpp
View file

@ -548,7 +548,7 @@ void QuickTilingTest::testX11QuickTiling_data()
{ {
QTest::addColumn<QuickTileMode>("mode"); QTest::addColumn<QuickTileMode>("mode");
QTest::addColumn<QRect>("expectedGeometry"); QTest::addColumn<QRect>("expectedGeometry");
QTest::addColumn<int>("screen"); QTest::addColumn<int>("screenId");
QTest::addColumn<QuickTileMode>("modeAfterToggle"); QTest::addColumn<QuickTileMode>("modeAfterToggle");
#define FLAG(name) QuickTileMode(QuickTileFlag::name) #define FLAG(name) QuickTileMode(QuickTileFlag::name)
@ -608,9 +608,11 @@ void QuickTilingTest::testX11QuickTiling()
QCOMPARE(quickTileChangedSpy.count(), 1); QCOMPARE(quickTileChangedSpy.count(), 1);
// quick tile to same edge again should also act like send to screen // quick tile to same edge again should also act like send to screen
QCOMPARE(client->screen(), 0); const auto outputs = kwinApp()->platform()->enabledOutputs();
QCOMPARE(client->output(), outputs[0]);
client->setQuickTileMode(mode, true); client->setQuickTileMode(mode, true);
QTEST(client->screen(), "screen"); QFETCH(int, screenId);
QCOMPARE(client->output(), outputs[screenId]);
QTEST(client->quickTileMode(), "modeAfterToggle"); QTEST(client->quickTileMode(), "modeAfterToggle");
QCOMPARE(client->geometryRestore(), origGeo); QCOMPARE(client->geometryRestore(), origGeo);
@ -680,7 +682,7 @@ void QuickTilingTest::testX11QuickTilingAfterVertMaximize()
// vertically maximize the window // vertically maximize the window
client->maximize(client->maximizeMode() ^ MaximizeVertical); client->maximize(client->maximizeMode() ^ MaximizeVertical);
QCOMPARE(client->frameGeometry().width(), origGeo.width()); QCOMPARE(client->frameGeometry().width(), origGeo.width());
QCOMPARE(client->height(), screens()->size(client->screen()).height()); QCOMPARE(client->height(), client->output()->geometry().height());
QCOMPARE(client->geometryRestore(), origGeo); QCOMPARE(client->geometryRestore(), origGeo);
// now quick tile // now quick tile