|
|
@ -865,7 +865,7 @@ void TestWaylandSurface::testOutput()
|
|
|
|
m_display->dispatchEvents();
|
|
|
|
m_display->dispatchEvents();
|
|
|
|
|
|
|
|
|
|
|
|
// now enter it
|
|
|
|
// now enter it
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>{serverOutput.get()});
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>{serverOutput.get()}, serverOutput.get());
|
|
|
|
QCOMPARE(serverSurface->outputs(), QList<OutputInterface *>{serverOutput.get()});
|
|
|
|
QCOMPARE(serverSurface->outputs(), QList<OutputInterface *>{serverOutput.get()});
|
|
|
|
QVERIFY(enteredSpy.wait());
|
|
|
|
QVERIFY(enteredSpy.wait());
|
|
|
|
QCOMPARE(enteredSpy.count(), 1);
|
|
|
|
QCOMPARE(enteredSpy.count(), 1);
|
|
|
@ -873,10 +873,10 @@ void TestWaylandSurface::testOutput()
|
|
|
|
QCOMPARE(s->outputs(), QList<KWayland::Client::Output *>{clientOutput.get()});
|
|
|
|
QCOMPARE(s->outputs(), QList<KWayland::Client::Output *>{clientOutput.get()});
|
|
|
|
|
|
|
|
|
|
|
|
// adding to same should not trigger
|
|
|
|
// adding to same should not trigger
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>{serverOutput.get()});
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>{serverOutput.get()}, serverOutput.get());
|
|
|
|
|
|
|
|
|
|
|
|
// leave again
|
|
|
|
// leave again
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>());
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>(), nullptr);
|
|
|
|
QCOMPARE(serverSurface->outputs(), QList<OutputInterface *>());
|
|
|
|
QCOMPARE(serverSurface->outputs(), QList<OutputInterface *>());
|
|
|
|
QVERIFY(leftSpy.wait());
|
|
|
|
QVERIFY(leftSpy.wait());
|
|
|
|
QCOMPARE(enteredSpy.count(), 1);
|
|
|
|
QCOMPARE(enteredSpy.count(), 1);
|
|
|
@ -885,10 +885,10 @@ void TestWaylandSurface::testOutput()
|
|
|
|
QCOMPARE(s->outputs(), QList<KWayland::Client::Output *>());
|
|
|
|
QCOMPARE(s->outputs(), QList<KWayland::Client::Output *>());
|
|
|
|
|
|
|
|
|
|
|
|
// leave again should not trigger
|
|
|
|
// leave again should not trigger
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>());
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>(), nullptr);
|
|
|
|
|
|
|
|
|
|
|
|
// and enter again, just to verify
|
|
|
|
// and enter again, just to verify
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>{serverOutput.get()});
|
|
|
|
serverSurface->setOutputs(QList<OutputInterface *>{serverOutput.get()}, serverOutput.get());
|
|
|
|
QCOMPARE(serverSurface->outputs(), QList<OutputInterface *>{serverOutput.get()});
|
|
|
|
QCOMPARE(serverSurface->outputs(), QList<OutputInterface *>{serverOutput.get()});
|
|
|
|
QVERIFY(enteredSpy.wait());
|
|
|
|
QVERIFY(enteredSpy.wait());
|
|
|
|
QCOMPARE(enteredSpy.count(), 2);
|
|
|
|
QCOMPARE(enteredSpy.count(), 2);
|
|
|
|