Commit 3cdc97a4 authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

Avoid converting socket name between QString and QByteArray back and forth

It only contributes overhead.
parent 1e2f2a28
...@@ -51,7 +51,7 @@ void ActivationTest::initTestCase() ...@@ -51,7 +51,7 @@ void ActivationTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->start(); kwinApp()->start();
......
...@@ -51,7 +51,7 @@ void ActivitiesTest::initTestCase() ...@@ -51,7 +51,7 @@ void ActivitiesTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->setUseKActivities(true); kwinApp()->setUseKActivities(true);
......
...@@ -59,7 +59,7 @@ void TestDbusInterface::initTestCase() ...@@ -59,7 +59,7 @@ void TestDbusInterface::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
kwinApp()->start(); kwinApp()->start();
QVERIFY(applicationStartedSpy.wait()); QVERIFY(applicationStartedSpy.wait());
......
...@@ -51,7 +51,7 @@ void DebugConsoleTest::initTestCase() ...@@ -51,7 +51,7 @@ void DebugConsoleTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->start(); kwinApp()->start();
......
...@@ -123,7 +123,7 @@ void DecorationInputTest::initTestCase() ...@@ -123,7 +123,7 @@ void DecorationInputTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
// change some options // change some options
......
...@@ -46,7 +46,7 @@ void X11DesktopWindowTest::initTestCase() ...@@ -46,7 +46,7 @@ void X11DesktopWindowTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->start(); kwinApp()->start();
......
...@@ -46,7 +46,7 @@ void DontCrashAuroraeDestroyDecoTest::initTestCase() ...@@ -46,7 +46,7 @@ void DontCrashAuroraeDestroyDecoTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -46,7 +46,7 @@ void DontCrashCancelAnimationFromAnimationEndedTest::initTestCase() ...@@ -46,7 +46,7 @@ void DontCrashCancelAnimationFromAnimationEndedTest::initTestCase()
qRegisterMetaType<KWin::Deleted*>(); qRegisterMetaType<KWin::Deleted*>();
qRegisterMetaType<KWin::AbstractClient*>(); qRegisterMetaType<KWin::AbstractClient*>();
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
kwinApp()->start(); kwinApp()->start();
QVERIFY(Compositor::self()); QVERIFY(Compositor::self());
QSignalSpy compositorToggledSpy(Compositor::self(), &Compositor::compositingToggled); QSignalSpy compositorToggledSpy(Compositor::self(), &Compositor::compositingToggled);
......
...@@ -58,7 +58,7 @@ void DontCrashCursorPhysicalSizeEmpty::initTestCase() ...@@ -58,7 +58,7 @@ void DontCrashCursorPhysicalSizeEmpty::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
if (!QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("icons/DMZ-White/index.theme")).isEmpty()) { if (!QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("icons/DMZ-White/index.theme")).isEmpty()) {
qputenv("XCURSOR_THEME", QByteArrayLiteral("DMZ-White")); qputenv("XCURSOR_THEME", QByteArrayLiteral("DMZ-White"));
......
...@@ -42,7 +42,7 @@ void DontCrashEmptyDecorationTest::initTestCase() ...@@ -42,7 +42,7 @@ void DontCrashEmptyDecorationTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
// this test needs to enforce OpenGL compositing to get into the crashy condition // this test needs to enforce OpenGL compositing to get into the crashy condition
......
...@@ -36,7 +36,7 @@ void DontCrashGlxgearsTest::initTestCase() ...@@ -36,7 +36,7 @@ void DontCrashGlxgearsTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
kwinApp()->start(); kwinApp()->start();
QVERIFY(applicationStartedSpy.wait()); QVERIFY(applicationStartedSpy.wait());
} }
......
...@@ -47,7 +47,7 @@ void DontCrashNoBorder::initTestCase() ...@@ -47,7 +47,7 @@ void DontCrashNoBorder::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -51,7 +51,7 @@ void DontCrashReinitializeCompositorTest::initTestCase() ...@@ -51,7 +51,7 @@ void DontCrashReinitializeCompositorTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -49,7 +49,7 @@ void TestDontCrashUseractionsMenu::initTestCase() ...@@ -49,7 +49,7 @@ void TestDontCrashUseractionsMenu::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
// force style to breeze as that's the one which triggered the crash // force style to breeze as that's the one which triggered the crash
......
...@@ -48,7 +48,7 @@ void DesktopSwitchingAnimationTest::initTestCase() ...@@ -48,7 +48,7 @@ void DesktopSwitchingAnimationTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
KConfigGroup plugins(config, QStringLiteral("Plugins")); KConfigGroup plugins(config, QStringLiteral("Plugins"));
......
...@@ -47,7 +47,7 @@ void MaximizeAnimationTest::initTestCase() ...@@ -47,7 +47,7 @@ void MaximizeAnimationTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
KConfigGroup plugins(config, QStringLiteral("Plugins")); KConfigGroup plugins(config, QStringLiteral("Plugins"));
......
...@@ -50,7 +50,7 @@ void MinimizeAnimationTest::initTestCase() ...@@ -50,7 +50,7 @@ void MinimizeAnimationTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
KConfigGroup plugins(config, QStringLiteral("Plugins")); KConfigGroup plugins(config, QStringLiteral("Plugins"));
......
...@@ -57,7 +57,7 @@ void PopupOpenCloseAnimationTest::initTestCase() ...@@ -57,7 +57,7 @@ void PopupOpenCloseAnimationTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
KConfigGroup plugins(config, QStringLiteral("Plugins")); KConfigGroup plugins(config, QStringLiteral("Plugins"));
......
...@@ -138,7 +138,7 @@ void ScriptedEffectsTest::initTestCase() ...@@ -138,7 +138,7 @@ void ScriptedEffectsTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
ScriptedEffectLoader loader; ScriptedEffectLoader loader;
......
...@@ -55,7 +55,7 @@ void SlidingPopupsTest::initTestCase() ...@@ -55,7 +55,7 @@ void SlidingPopupsTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
// disable all effects - we don't want to have it interact with the rendering // disable all effects - we don't want to have it interact with the rendering
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -51,7 +51,7 @@ void ToplevelOpenCloseAnimationTest::initTestCase() ...@@ -51,7 +51,7 @@ void ToplevelOpenCloseAnimationTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
KConfigGroup plugins(config, QStringLiteral("Plugins")); KConfigGroup plugins(config, QStringLiteral("Plugins"));
......
...@@ -48,7 +48,7 @@ void TranslucencyTest::initTestCase() ...@@ -48,7 +48,7 @@ void TranslucencyTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
// disable all effects - we don't want to have it interact with the rendering // disable all effects - we don't want to have it interact with the rendering
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -44,7 +44,7 @@ void WindowGeometryTest::initTestCase() ...@@ -44,7 +44,7 @@ void WindowGeometryTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
// disable all effects - we don't want to have it interact with the rendering // disable all effects - we don't want to have it interact with the rendering
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -48,7 +48,7 @@ void WobblyWindowsShadeTest::initTestCase() ...@@ -48,7 +48,7 @@ void WobblyWindowsShadeTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
// disable all effects - we don't want to have it interact with the rendering // disable all effects - we don't want to have it interact with the rendering
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -42,7 +42,7 @@ void GenericSceneOpenGLTest::initTestCase() ...@@ -42,7 +42,7 @@ void GenericSceneOpenGLTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
// disable all effects - we don't want to have it interact with the rendering // disable all effects - we don't want to have it interact with the rendering
auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); auto config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig);
......
...@@ -56,7 +56,7 @@ void GlobalShortcutsTest::initTestCase() ...@@ -56,7 +56,7 @@ void GlobalShortcutsTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
qputenv("KWIN_XKB_DEFAULT_KEYMAP", "1"); qputenv("KWIN_XKB_DEFAULT_KEYMAP", "1");
......
...@@ -47,7 +47,7 @@ void TestIdleInhibition::initTestCase() ...@@ -47,7 +47,7 @@ void TestIdleInhibition::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->start(); kwinApp()->start();
......
...@@ -53,7 +53,7 @@ void InputStackingOrderTest::initTestCase() ...@@ -53,7 +53,7 @@ void InputStackingOrderTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->start(); kwinApp()->start();
......
...@@ -64,7 +64,7 @@ void InputMethodTest::initTestCase() ...@@ -64,7 +64,7 @@ void InputMethodTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
static_cast<WaylandTestApplication *>(kwinApp())->setInputMethodServerToStart("internal"); static_cast<WaylandTestApplication *>(kwinApp())->setInputMethodServerToStart("internal");
......
...@@ -177,7 +177,7 @@ void InternalWindowTest::initTestCase() ...@@ -177,7 +177,7 @@ void InternalWindowTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
......
...@@ -131,7 +131,7 @@ void KeyboardLayoutTest::initTestCase() ...@@ -131,7 +131,7 @@ void KeyboardLayoutTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
kwinApp()->setKxkbConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); kwinApp()->setKxkbConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
......
...@@ -50,7 +50,7 @@ void KeymapCreationFailureTest::initTestCase() ...@@ -50,7 +50,7 @@ void KeymapCreationFailureTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
kwinApp()->setKxkbConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); kwinApp()->setKxkbConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
......
...@@ -50,7 +50,7 @@ void KWinBindingsTest::initTestCase() ...@@ -50,7 +50,7 @@ void KWinBindingsTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig));
......
...@@ -56,7 +56,7 @@ void LayerShellV1ClientTest::initTestCase() ...@@ -56,7 +56,7 @@ void LayerShellV1ClientTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
kwinApp()->start(); kwinApp()->start();
......
...@@ -175,7 +175,7 @@ void LockScreenTest::initTestCase() ...@@ -175,7 +175,7 @@ void LockScreenTest::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started); QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);
QVERIFY(applicationStartedSpy.isValid()); QVERIFY(applicationStartedSpy.isValid());
kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024)); kwinApp()->platform()->setInitialWindowSize(QSize(1280, 1024));
QVERIFY(waylandServer()->init(s_socketName.toLocal8Bit())); QVERIFY(waylandServer()->init(s_socketName));
QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2)); QMetaObject::invokeMethod(kwinApp()->platform(), "setVirtualOutputs", Qt::DirectConnection, Q_ARG(int, 2));
qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2"));
......
...@@ -54,7 +54,7 @@ void TestMaximized::initTestCase() ...@@ -54,7 +54,7 @@ void TestMaximized::initTestCase()
QSignalSpy applicationStartedSpy(kwinApp(), &Application::started);