Commit deb3bab9 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

Port the wl_compositor wrapper to the new approach

parent fb9846c5
......@@ -77,10 +77,6 @@ void TestCompositor::init()
// here we need a shm pool
m_compositorInterface = m_display->createCompositor(m_display);
QVERIFY(m_compositorInterface);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
}
......
......@@ -122,9 +122,6 @@ void TestDataDevice::init()
QVERIFY(pointerChangedSpy.wait());
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(),
compositorSpy.first().last().value<quint32>(), this);
......
......@@ -78,8 +78,6 @@ void TestDragAndDrop::init()
m_connection->setSocketName(s_socketName);
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
m_seatInterface = m_display->createSeat(m_display);
m_seatInterface->setHasPointer(true);
m_seatInterface->setHasTouch(true);
......
......@@ -56,7 +56,6 @@ void ErrorTest::init()
QVERIFY(m_display->isRunning());
m_display->createShm();
m_ci = m_display->createCompositor(m_display);
m_ci->create();
m_psi = m_display->createPlasmaShell(m_display);
m_psi->create();
......
......@@ -117,9 +117,6 @@ void TestVirtualDesktop::init()
registry.setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
......
......@@ -65,7 +65,6 @@ void TestPlasmaShell::init()
QVERIFY(m_display->isRunning());
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
m_display->createShm();
m_plasmaShellInterface = m_display->createPlasmaShell(m_display);
......
......@@ -71,7 +71,6 @@ void TestPointerConstraints::init()
m_seatInterface->setHasPointer(true);
m_seatInterface->create();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
m_pointerConstraintsInterface = m_display->createPointerConstraints(PointerConstraintsInterfaceVersion::UnstableV1, m_display);
m_pointerConstraintsInterface->create();
......
......@@ -68,7 +68,6 @@ void SelectionTest::init()
QVERIFY(m_display->isRunning());
m_display->createShm();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
m_seatInterface = m_display->createSeat(m_display);
m_seatInterface->setHasKeyboard(true);
m_seatInterface->create();
......
......@@ -94,9 +94,6 @@ void TestServerSideDecoration::init()
m_registry->setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = m_registry->createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
......
......@@ -98,9 +98,6 @@ void TestServerSideDecorationPalette::init()
registry.setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
......
......@@ -57,7 +57,6 @@ void ShadowTest::init()
QVERIFY(m_display->isRunning());
m_display->createShm();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
m_shadowInterface = m_display->createShadowManager(m_display);
m_shadowInterface->create();
......
......@@ -90,7 +90,6 @@ void TextInputTest::init()
m_seatInterface->setHasTouch(true);
m_seatInterface->create();
m_compositorInterface = m_display->createCompositor();
m_compositorInterface->create();
m_textInputManagerV0Interface = m_display->createTextInputManager(TextInputInterfaceVersion::UnstableV0);
m_textInputManagerV0Interface->create();
m_textInputManagerV2Interface = m_display->createTextInputManager(TextInputInterfaceVersion::UnstableV2);
......
......@@ -101,9 +101,6 @@ void TestAppmenu::init()
registry.setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
......
......@@ -98,9 +98,6 @@ void TestBlur::init()
registry.setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
......
......@@ -100,9 +100,6 @@ void TestContrast::init()
registry.setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
......
......@@ -82,9 +82,6 @@ void TestFilter::init()
QVERIFY(m_display->isRunning());
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
m_blurManagerInterface = m_display->createBlurManager(m_display);
}
......
......@@ -95,9 +95,7 @@ void TestWaylandOutputManagement::init()
m_display->start();
QVERIFY(m_display->isRunning());
auto comp = m_display->createCompositor(this);
comp->create();
m_display->createCompositor(this);
auto outputDeviceInterface = m_display->createOutputDevice(this);
OutputDeviceInterface::Mode m0;
......
......@@ -91,9 +91,6 @@ void TestRegion::init()
registry.setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
}
......
......@@ -130,10 +130,6 @@ void TestWaylandSeat::init()
m_display->createShm();
m_compositorInterface = m_display->createCompositor(m_display);
QVERIFY(m_compositorInterface);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
m_subCompositorInterface = m_display->createSubCompositor(m_display);
QVERIFY(m_subCompositorInterface);
m_subCompositorInterface->create();
......
......@@ -97,9 +97,6 @@ void TestSlide::init()
registry.setup();
m_compositorInterface = m_display->createCompositor(m_display);
m_compositorInterface->create();
QVERIFY(m_compositorInterface->isValid());
QVERIFY(compositorSpy.wait());
m_compositor = registry.createCompositor(compositorSpy.first().first().value<quint32>(), compositorSpy.first().last().value<quint32>(), this);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment