vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
icc-effect-5.14.5
Martin Gräßlin 2013-09-09 05:32:49 +02:00
parent 687e264387
commit e336a8f434
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/CMakeLists.txt
View File

@ -29,7 +29,6 @@ set( testVirtualDesktops_SRCS
kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${testVirtualDesktops_SRCS} ) kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${testVirtualDesktops_SRCS} )
target_link_libraries( testVirtualDesktops target_link_libraries( testVirtualDesktops
${KDE4Support_LIBRARIES}
Qt5::Test Qt5::Test
Qt5::Widgets Qt5::Widgets
KF5::KI18n KF5::KI18n

4
tests/test_virtual_desktops.cpp
View File

@ -19,10 +19,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/ *********************************************************************/
#include "../virtualdesktops.h" #include "../virtualdesktops.h"
// KDE // KDE
#include <KDE/KAction>
#include <KDE/KActionCollection> #include <KDE/KActionCollection>
#include <KDE/KConfigGroup> #include <KDE/KConfigGroup>
#include <QAction>
#include <QtTest/QtTest> #include <QtTest/QtTest>
namespace KWin { namespace KWin {
@ -278,7 +278,6 @@ void TestVirtualDesktops::testDirection(const QString &actionName)
vds->initShortcuts(keys.data()); vds->initShortcuts(keys.data());
QAction *action = keys->action(actionName); QAction *action = keys->action(actionName);
QVERIFY(action); QVERIFY(action);
QVERIFY(static_cast<KAction*>(action)->isGlobalShortcutEnabled());
action->trigger(); action->trigger();
QCOMPARE(vds->current(), result); QCOMPARE(vds->current(), result);
QCOMPARE(functor(initCurrent, wrap), result); QCOMPARE(functor(initCurrent, wrap), result);
@ -563,7 +562,6 @@ void TestVirtualDesktops::switchToShortcuts()
const QString desktop(toDesktop.arg(i)); const QString desktop(toDesktop.arg(i));
QAction *action = keys->action(desktop); QAction *action = keys->action(desktop);
QVERIFY2(action, desktop.toUtf8().constData()); QVERIFY2(action, desktop.toUtf8().constData());
QVERIFY(static_cast<KAction*>(action)->isGlobalShortcutEnabled());
action->trigger(); action->trigger();
QCOMPARE(vds->current(), i); QCOMPARE(vds->current(), i);
} }