From 50987a6ddca16c2affa2427bbe4fb13e9eb99547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 7 Jan 2014 13:45:25 +0100
Subject: [PATCH] [kwin] Fix TestVirtualDesktops

* enable compilation
* Remove KActionCollection
---
 tests/CMakeLists.txt            | 28 ++++++++++++++--------------
 tests/test_virtual_desktops.cpp | 16 ++++------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9d31f823ed..1c9404ef38 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,20 +22,20 @@ target_link_libraries( testWindowPaintData kwineffects Qt5::Widgets Qt5::Test )
 ########################################################
 # Test VirtualDesktopManager
 ########################################################
-# set( testVirtualDesktops_SRCS
-#      test_virtual_desktops.cpp
-#      ../virtualdesktops.cpp
-# )
-# kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${testVirtualDesktops_SRCS} )
-#
-# target_link_libraries( testVirtualDesktops
-#                        Qt5::Test
-#                        Qt5::Widgets
-#                        KF5::I18n
-#                        KF5::GlobalAccel
-#                        KF5::ConfigCore
-#                        KF5::WindowSystem
-# )
+set( testVirtualDesktops_SRCS
+     test_virtual_desktops.cpp
+     ../virtualdesktops.cpp
+)
+kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${testVirtualDesktops_SRCS} )
+
+target_link_libraries( testVirtualDesktops
+                       Qt5::Test
+                       Qt5::Widgets
+                       KF5::I18n
+                       KF5::GlobalAccel
+                       KF5::ConfigCore
+                       KF5::WindowSystem
+)
 
 ########################################################
 # Test ClientMachine
diff --git a/tests/test_virtual_desktops.cpp b/tests/test_virtual_desktops.cpp
index 7ee23180ec..ab38a3431a 100644
--- a/tests/test_virtual_desktops.cpp
+++ b/tests/test_virtual_desktops.cpp
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "../virtualdesktops.h"
 // KDE
-#include <KDE/KActionCollection>
 #include <KDE/KConfigGroup>
 
 #include <QAction>
@@ -274,9 +273,8 @@ void TestVirtualDesktops::testDirection(const QString &actionName)
     QCOMPARE(functor(0, wrap), result);
 
     vds->setNavigationWrappingAround(wrap);
-    QScopedPointer<KActionCollection> keys(new KActionCollection(this));
-    vds->initShortcuts(keys.data());
-    QAction *action = keys->action(actionName);
+    vds->initShortcuts();
+    QAction *action = vds->findChild<QAction*>(actionName);
     QVERIFY(action);
     action->trigger();
     QCOMPARE(vds->current(), result);
@@ -551,25 +549,19 @@ void TestVirtualDesktops::name()
 
 void TestVirtualDesktops::switchToShortcuts()
 {
-    QScopedPointer<KActionCollection> keys(new KActionCollection(this));
     VirtualDesktopManager *vds = VirtualDesktopManager::self();
     vds->setCount(vds->maximum());
     vds->setCurrent(vds->maximum());
     QCOMPARE(vds->current(), vds->maximum());
-    vds->initShortcuts(keys.data());
+    vds->initShortcuts();
     const QString toDesktop = QStringLiteral("Switch to Desktop %1");
     for (uint i=1; i<=vds->maximum(); ++i) {
         const QString desktop(toDesktop.arg(i));
-        QAction *action = keys->action(desktop);
+        QAction *action = vds->findChild<QAction*>(desktop);
         QVERIFY2(action, desktop.toUtf8().constData());
         action->trigger();
         QCOMPARE(vds->current(), i);
     }
-    // test switchTo with incorrect data in QAction
-    QAction *action = keys->addAction(QStringLiteral("wrong"), vds, SLOT(slotSwitchTo()));
-    action->trigger();
-    // should still be on max
-    QCOMPARE(vds->current(), vds->maximum());
     // invoke switchTo not from a QAction
     QMetaObject::invokeMethod(vds, "slotSwitchTo");
     // should still be on max