Commit e24ee60b authored by Vlad Zahorodnii's avatar Vlad Zahorodnii Committed by David Edmundson
Browse files

autotests: Remove Test::initWaylandWorkspace()

It reduces the amount of boilerplate code and makes startup sequence in
autotests similar to the one in kwin_wayland.
parent 84bde36c
Pipeline #215165 failed with stage
in 31 minutes and 55 seconds
......@@ -60,7 +60,6 @@ void ActivationTest::initTestCase()
QCOMPARE(outputs.count(), 2);
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
Test::initWaylandWorkspace();
}
void ActivationTest::init()
......
......@@ -62,7 +62,6 @@ void ActivitiesTest::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
}
void ActivitiesTest::cleanupTestCase()
......
......@@ -65,7 +65,6 @@ void TestDbusInterface::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
VirtualDesktopManager::self()->setCount(4);
}
......
......@@ -62,7 +62,6 @@ void DebugConsoleTest::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
}
void DebugConsoleTest::cleanup()
......
......@@ -143,7 +143,6 @@ void DecorationInputTest::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
}
void DecorationInputTest::init()
......
......@@ -56,7 +56,6 @@ void X11DesktopWindowTest::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
}
void X11DesktopWindowTest::init()
......
......@@ -62,7 +62,6 @@ void DontCrashAuroraeDestroyDecoTest::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
......
......@@ -71,7 +71,6 @@ void DontCrashCursorPhysicalSizeEmpty::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
}
void DontCrashCursorPhysicalSizeEmpty::testMoveCursorOverDeco()
......
......@@ -54,7 +54,6 @@ void DontCrashEmptyDecorationTest::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
......
......@@ -63,7 +63,6 @@ void DontCrashNoBorder::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
......
......@@ -70,7 +70,6 @@ void DontCrashReinitializeCompositorTest::initTestCase()
QCOMPARE(outputs.count(), 2);
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
Test::initWaylandWorkspace();
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
......
......@@ -62,7 +62,6 @@ void TestDontCrashUseractionsMenu::initTestCase()
QCOMPARE(outputs.count(), 2);
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
Test::initWaylandWorkspace();
}
void TestDontCrashUseractionsMenu::init()
......
......@@ -62,7 +62,6 @@ void DesktopSwitchingAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
......
......@@ -59,7 +59,6 @@ void MaximizeAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
}
void MaximizeAnimationTest::init()
......
......@@ -63,7 +63,6 @@ void MinimizeAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
......
......@@ -68,7 +68,6 @@ void PopupOpenCloseAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
}
void PopupOpenCloseAnimationTest::init()
......
......@@ -65,7 +65,6 @@ void ToplevelOpenCloseAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
......
......@@ -69,7 +69,6 @@ void GlobalShortcutsTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
}
void GlobalShortcutsTest::init()
......
......@@ -48,7 +48,6 @@ void TestIdleInhibition::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
Test::initWaylandWorkspace();
}
void TestIdleInhibition::init()
......
......@@ -62,7 +62,6 @@ void InputStackingOrderTest::initTestCase()
QCOMPARE(outputs[0]->geometry(), QRect(0, 0, 1280, 1024));
QCOMPARE(outputs[1]->geometry(), QRect(1280, 0, 1280, 1024));
setenv("QT_QPA_PLATFORM", "wayland", true);
Test::initWaylandWorkspace();
}
void InputStackingOrderTest::init()
......
Supports Markdown
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