From 09dd9153d8f656706fec0585171ec59aaa244e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 5 Apr 2016 08:36:53 +0200 Subject: [PATCH] [autotests] Use DMZ-White as cursor theme On build.kde.org we cannot use the breeze cursor theme. Instead we have DMZ-White (debian package dmz-cursor-theme). This change adjusts the PointerInput test to enforce DMZ-White and uses SizeAllCursor instead of OpenHandCursor as that one seems to be missing in that theme. Hopefully with these changes the test starts to pass on build.kde.org. --- autotests/wayland/pointer_input.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/autotests/wayland/pointer_input.cpp b/autotests/wayland/pointer_input.cpp index 014e456c66..075fa477fa 100644 --- a/autotests/wayland/pointer_input.cpp +++ b/autotests/wayland/pointer_input.cpp @@ -96,8 +96,8 @@ void PointerInputTest::initTestCase() kwinApp()->setConfig(KSharedConfig::openConfig(QString(), KConfig::SimpleConfig)); - qputenv("XCURSOR_THEME", QByteArrayLiteral("breeze_cursors")); - qputenv("XCURSOR_SIZE", QByteArrayLiteral("32")); + qputenv("XCURSOR_THEME", QByteArrayLiteral("DMZ-White")); + qputenv("XCURSOR_SIZE", QByteArrayLiteral("24")); kwinApp()->start(); QVERIFY(workspaceCreatedSpy.wait()); @@ -908,19 +908,19 @@ void PointerInputTest::testEffectOverrideCursorImage() // now create an effect and set an override cursor QScopedPointer effect(new HelperEffect); - effects->startMouseInterception(effect.data(), Qt::OpenHandCursor); - const QImage openHand = p->cursorImage(); - QVERIFY(!openHand.isNull()); - QVERIFY(openHand != fallback); + effects->startMouseInterception(effect.data(), Qt::SizeAllCursor); + const QImage sizeAll = p->cursorImage(); + QVERIFY(!sizeAll.isNull()); + QVERIFY(sizeAll != fallback); QVERIFY(leftSpy.wait()); // let's change to arrow cursor, this should be our fallback effects->defineCursor(Qt::ArrowCursor); QCOMPARE(p->cursorImage(), fallback); - // back to openhand - effects->defineCursor(Qt::OpenHandCursor); - QCOMPARE(p->cursorImage(), openHand); + // back to size all + effects->defineCursor(Qt::SizeAllCursor); + QCOMPARE(p->cursorImage(), sizeAll); // move cursor outside the window area Cursor::setPos(800, 800); @@ -929,8 +929,8 @@ void PointerInputTest::testEffectOverrideCursorImage() QCOMPARE(p->cursorImage(), fallback); // start mouse interception again - effects->startMouseInterception(effect.data(), Qt::OpenHandCursor); - QCOMPARE(p->cursorImage(), openHand); + effects->startMouseInterception(effect.data(), Qt::SizeAllCursor); + QCOMPARE(p->cursorImage(), sizeAll); // move cursor to area of window Cursor::setPos(window->geometry().center());