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

autotests: Don't be so paranoid about compositing type

Browse source 
In many cases it's irrelevant, what we care about is whether given effect
is loaded and performs its function. So remove these paranoid checks
except the tests where it's important to use OpenGL compositing.
This commit is contained in:
Vlad Zahorodnii 2023-08-31 15:17:38 +03:00
parent faea125299
commit 9cf6011ba4
9 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
autotests/integration/dont_crash_aurorae_destroy_deco.cpp
View file

@ -8,10 +8,7 @@
*/
#include "kwin_wayland_test.h"
#include "composite.h"
#include "core/output.h"
#include "core/renderbackend.h"
#include "libkwineffects/kwineffects.h"
#include "pointer_input.h"
#include "wayland_server.h"
#include "workspace.h"
@ -66,8 +63,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);
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void DontCrashAuroraeDestroyDecoTest::init()

5
autotests/integration/dont_crash_empty_deco.cpp
View file

@ -8,10 +8,7 @@
*/
#include "kwin_wayland_test.h"
#include "composite.h"
#include "core/output.h"
#include "core/renderbackend.h"
#include "libkwineffects/kwineffects.h"
#include "pointer_input.h"
#include "wayland_server.h"
#include "workspace.h"
@ -58,8 +55,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);
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void DontCrashEmptyDecorationTest::init()

3
autotests/integration/dont_crash_reinitialize_compositor.cpp
View file

@ -11,7 +11,6 @@
#include "composite.h"
#include "core/output.h"
#include "core/renderbackend.h"
#include "effectloader.h"
#include "effects.h"
#include "wayland_server.h"
@ -72,8 +71,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));
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void DontCrashReinitializeCompositorTest::init()

4
autotests/integration/effects/desktop_switching_animation_test.cpp
View file

@ -9,8 +9,6 @@
#include "kwin_wayland_test.h"
#include "composite.h"
#include "core/renderbackend.h"
#include "effectloader.h"
#include "effects.h"
#include "virtualdesktops.h"
@ -67,8 +65,6 @@ void DesktopSwitchingAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void DesktopSwitchingAnimationTest::init()

4
autotests/integration/effects/minimize_animation_test.cpp
View file

@ -9,8 +9,6 @@
#include "kwin_wayland_test.h"
#include "composite.h"
#include "core/renderbackend.h"
#include "effectloader.h"
#include "effects.h"
#include "wayland_server.h"
@ -67,8 +65,6 @@ void MinimizeAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void MinimizeAnimationTest::init()

6
autotests/integration/effects/scripted_effects_test.cpp
View file

@ -9,9 +9,6 @@
#include "kwin_wayland_test.h"
#include "composite.h"
#include "core/renderbackend.h"
#include "cursor.h"
#include "effectloader.h"
#include "effects.h"
#include "libkwineffects/anidata_p.h"
@ -149,9 +146,6 @@ void ScriptedEffectsTest::initTestCase()
qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1");
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
QVERIFY(Compositor::self());
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
KWin::VirtualDesktopManager::self()->setCount(2);
}

6
autotests/integration/effects/slidingpopups_test.cpp
View file

@ -6,9 +6,6 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "composite.h"
#include "core/renderbackend.h"
#include "cursor.h"
#include "effectloader.h"
#include "effects.h"
#include "kwin_wayland_test.h"
@ -78,9 +75,6 @@ void SlidingPopupsTest::initTestCase()
qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1");
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
QVERIFY(Compositor::self());
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void SlidingPopupsTest::init()

4
autotests/integration/effects/toplevel_open_close_animation_test.cpp
View file

@ -9,8 +9,6 @@
#include "kwin_wayland_test.h"
#include "composite.h"
#include "core/renderbackend.h"
#include "effectloader.h"
#include "effects.h"
#include "wayland_server.h"
@ -68,8 +66,6 @@ void ToplevelOpenCloseAnimationTest::initTestCase()
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void ToplevelOpenCloseAnimationTest::init()

5
autotests/integration/effects/wobbly_shade_test.cpp
View file

@ -8,8 +8,6 @@
*/
#include "kwin_wayland_test.h"
#include "composite.h"
#include "core/renderbackend.h"
#include "cursor.h"
#include "effectloader.h"
#include "effects.h"
@ -71,9 +69,6 @@ void WobblyWindowsShadeTest::initTestCase()
qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1");
kwinApp()->start();
QVERIFY(applicationStartedSpy.wait());
QVERIFY(Compositor::self());
QCOMPARE(Compositor::self()->backend()->compositingType(), KWin::OpenGLCompositing);
}
void WobblyWindowsShadeTest::init()