autotests: Fix TestBuiltInEffectLoader
The looking glass effect creates an opengl texture at load time without a current context, which aborts the test. The test should be converted into an integration test. Mocking the GL library is simply not feasible and not worth the trouble. :/
This commit is contained in:
parent
5d1062f42d
commit
0e9ab1fced
1 changed files with 5 additions and 4 deletions
|
@ -193,7 +193,8 @@ void TestBuiltInEffectLoader::testSupported_data()
|
|||
QTest::newRow("Invert-GL") << QStringLiteral("invert") << true << oc << true;
|
||||
QTest::newRow("Kscreen") << QStringLiteral("kscreen") << true << qc << true;
|
||||
QTest::newRow("LookingGlass") << QStringLiteral("lookingglass") << false << qc << true;
|
||||
QTest::newRow("LookingGlass-GL") << QStringLiteral("lookingglass") << true << oc << true;
|
||||
// Tries to create an opengl texture and crashes.
|
||||
// QTest::newRow("LookingGlass-GL") << QStringLiteral("lookingglass") << true << oc << true;
|
||||
QTest::newRow("MagicLamp") << QStringLiteral("magiclamp") << false << qc << true;
|
||||
QTest::newRow("MagicLamp-GL") << QStringLiteral("magiclamp") << true << oc << true;
|
||||
QTest::newRow("MagicLamp-GL-no-anim") << QStringLiteral("magiclamp") << false << oc << false;
|
||||
|
@ -270,7 +271,8 @@ void TestBuiltInEffectLoader::testLoadEffect_data()
|
|||
QTest::newRow("Invert-GL") << QStringLiteral("invert") << true << oc;
|
||||
QTest::newRow("Kscreen") << QStringLiteral("kscreen") << true << qc;
|
||||
QTest::newRow("LookingGlass") << QStringLiteral("lookingglass") << false << qc;
|
||||
QTest::newRow("LookingGlass-GL") << QStringLiteral("lookingglass") << true << oc;
|
||||
// Tries to create an opengl texture and crashes.
|
||||
// QTest::newRow("LookingGlass-GL") << QStringLiteral("lookingglass") << true << oc;
|
||||
QTest::newRow("MagicLamp") << QStringLiteral("magiclamp") << false << qc;
|
||||
QTest::newRow("MagicLamp-GL") << QStringLiteral("magiclamp") << true << oc;
|
||||
QTest::newRow("Magnifier") << QStringLiteral("magnifier") << false << qc;
|
||||
|
@ -377,7 +379,7 @@ void TestBuiltInEffectLoader::testLoadBuiltInEffect_data()
|
|||
// enabled by default
|
||||
QTest::newRow("HighlightWindow") << KWin::BuiltInEffect::HighlightWindow << QStringLiteral("highlightwindow") << true << qc << checkDefault;
|
||||
// supported but not enabled by default
|
||||
QTest::newRow("LookingGlass-GL") << KWin::BuiltInEffect::LookingGlass << QStringLiteral("lookingglass") << true << oc << checkDefault;
|
||||
QTest::newRow("LookingGlass") << KWin::BuiltInEffect::LookingGlass << QStringLiteral("lookingglass") << false << qc << checkDefault;
|
||||
// not enabled by default
|
||||
QTest::newRow("MouseClick") << KWin::BuiltInEffect::MouseClick << QStringLiteral("mouseclick") << true << qc << checkDefault;
|
||||
// Force an Effect which will load
|
||||
|
@ -385,7 +387,6 @@ void TestBuiltInEffectLoader::testLoadBuiltInEffect_data()
|
|||
// Force an Effect which is not supported
|
||||
QTest::newRow("LookingGlass-Force") << KWin::BuiltInEffect::LookingGlass << QStringLiteral("lookingglass") << false << qc << forceFlags;
|
||||
// Force the Effect as supported
|
||||
QTest::newRow("LookingGlass-Force-GL") << KWin::BuiltInEffect::LookingGlass << QStringLiteral("lookingglass") << true << oc << forceFlags;
|
||||
// Enforce no load of effect which is enabled by default
|
||||
QTest::newRow("HighlightWindow-DontLoad") << KWin::BuiltInEffect::HighlightWindow << QStringLiteral("highlightwindow") << false << qc << dontLoadFlags;
|
||||
// Enforce no load of effect which is not enabled by default, but enforced
|
||||
|
|
Loading…
Reference in a new issue