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

Fix testScreenEdges for good

Browse source 
Don't call kwinApp, because we are not on one.
The correct way to mock the geometries is by using the MockScreens,
which is already used in this test.
This commit is contained in:
Aleix Pol 2020-09-02 17:08:28 +02:00
parent 6d59c0b4e5
commit 5903c5be09
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
autotests/test_screen_edges.cpp
View file

@ -123,6 +123,8 @@ void TestScreenEdges::init()
new MockWorkspace(this);
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
Screens::create();
QSignalSpy sp(screens(), &MockScreens::changed);
QVERIFY(sp.wait());
auto vd = VirtualDesktopManager::create();
vd->setConfig(config);
@ -591,15 +593,12 @@ void TestScreenEdges::testOverlappingEdges()
QFETCH(QRect, geo1);
QFETCH(QRect, geo2);
QVector<QRect> geometries{{geo1, geo2}};
QMetaObject::invokeMethod(kwinApp()->platform(),
"setVirtualOutputs",
Qt::DirectConnection,
Q_ARG(int, geometries.count()),
Q_ARG(QVector<QRect>, geometries),
Q_ARG(QVector<int>, QVector<int>(geometries.count(), 1))
);
MockScreens* mockScreens = static_cast<MockScreens*>(screens());
QSignalSpy sp(mockScreens, &MockScreens::changed);
mockScreens->setGeometries({geo1, geo2});
QVERIFY(sp.wait());
QCOMPARE(screens()->count(), 2);
auto screenEdges = ScreenEdges::self();
screenEdges->init();
}
@ -630,16 +629,6 @@ void TestScreenEdges::testPushBack()
config->group("Windows").writeEntry("ElectricBorderPushbackPixels", pushback);
config->sync();
QVector<QRect> geometries{{QRect{0, 0, 1024, 768}, QRect{200, 768, 1024, 768}}};
QMetaObject::invokeMethod(kwinApp()->platform(),
"setVirtualOutputs",
Qt::DirectConnection,
Q_ARG(int, geometries.count()),
Q_ARG(QVector<QRect>, geometries),
Q_ARG(QVector<int>, QVector<int>(geometries.count(), 1))
);
auto s = ScreenEdges::self();
s->setConfig(config);
s->init();