From e336a8f434b452e1b1c769e757711517cb9f8b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 9 Sep 2013 05:32:49 +0200 Subject: [PATCH] Remove KAction related tests from virtual desktops tests No more KAction in virtual desktops. This makes the test work again though the global shortcuts are not tested any more. --- tests/CMakeLists.txt | 1 - tests/test_virtual_desktops.cpp | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 07b863a3bc..17f6f39dec 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,7 +29,6 @@ set( testVirtualDesktops_SRCS kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${testVirtualDesktops_SRCS} ) target_link_libraries( testVirtualDesktops - ${KDE4Support_LIBRARIES} Qt5::Test Qt5::Widgets KF5::KI18n diff --git a/tests/test_virtual_desktops.cpp b/tests/test_virtual_desktops.cpp index 4f8b2b775d..7ee23180ec 100644 --- a/tests/test_virtual_desktops.cpp +++ b/tests/test_virtual_desktops.cpp @@ -19,10 +19,10 @@ along with this program. If not, see . *********************************************************************/ #include "../virtualdesktops.h" // KDE -#include #include #include +#include #include namespace KWin { @@ -278,7 +278,6 @@ void TestVirtualDesktops::testDirection(const QString &actionName) vds->initShortcuts(keys.data()); QAction *action = keys->action(actionName); QVERIFY(action); - QVERIFY(static_cast(action)->isGlobalShortcutEnabled()); action->trigger(); QCOMPARE(vds->current(), result); QCOMPARE(functor(initCurrent, wrap), result); @@ -563,7 +562,6 @@ void TestVirtualDesktops::switchToShortcuts() const QString desktop(toDesktop.arg(i)); QAction *action = keys->action(desktop); QVERIFY2(action, desktop.toUtf8().constData()); - QVERIFY(static_cast(action)->isGlobalShortcutEnabled()); action->trigger(); QCOMPARE(vds->current(), i); }