on xenial help sign in
cleanup
commit8a22c112e9a701d5240b4d2780f23f860758314a authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 30 Sep 2014, 18:48 (12 years ago) parenteb180d1
2 files changed+4−11
plugins/Unity/Launcher/desktopfilehandler.cpp−1 tests/plugins/Unity/Launcher/launchermodeltest.cpp+4−10
plugins/Unity/Launcher/desktopfilehandler.cpp−1
@@ -24,7 +24,6 @@
2424#include <QDir>
2525#include <QSettings>
2626#include <QLocale>
27−#include <QDebug>
2827
2928#include <libintl.h>
3029
tests/plugins/Unity/Launcher/launchermodeltest.cpp+4−10
@@ -419,13 +419,6 @@ private Q_SLOTS:
419419 QDir::setCurrent(oldCurrent);
420420 }
421421
422− void testSettings_data() {
423− QTest::addColumn<QStringList>("storedList");
424−
425− QTest::newRow("2 stored") << (QStringList() << "abs-icon" << "no-icon");
426− QTest::newRow("1 stored") << (QStringList() << "abs-icon");
427− }
428−
429422 void testSettings() {
430423 GSettings *settings = launcherModel->m_settings;
431424
@@ -453,10 +446,11 @@ private Q_SLOTS:
453446 // Check if it disappeared from the frontend too
454447 QCOMPARE(launcherModel->rowCount(), 1);
455448
456− // Add them back:
457− settings->setStoredApplications(QStringList() << "abs-icon" << "no-icon");
449+ // Add them back but in reverse order
450+ settings->setStoredApplications(QStringList() << "no-icon" << "abs-icon");
458451 QCOMPARE(launcherModel->rowCount(), 2);
459−
452+ QCOMPARE(launcherModel->get(0)->appId(), QString("no-icon"));
453+ QCOMPARE(launcherModel->get(1)->appId(), QString("abs-icon"));
460454 }
461455};
462456