Unity 8

Merge lp:~mzanetti/unity8/appdrawer-recent-apps into lp:unity8

appdrawer-recent-apps
Merge into trunk

Proposed by Michael Zanetti on 2017-03-13

Status:

Approved

Approved by:

Lukáš Tinkl on 2017-04-05

Approved revision:

2846

Proposed branch:

lp:~mzanetti/unity8/appdrawer-recent-apps

Merge into:

lp:unity8

Diff against target:

621 lines (+340/-13)

17 files modified

CMakeLists.txt (+1/-1)
debian/control (+3/-3)
plugins/Greeter/Unity/Launcher/launcheritem.cpp (+6/-0)
plugins/Greeter/Unity/Launcher/launcheritem.h (+1/-0)
plugins/Unity/Launcher/appdrawermodel.cpp (+68/-7)
plugins/Unity/Launcher/appdrawermodel.h (+8/-0)
plugins/Unity/Launcher/launcheritem.cpp (+13/-0)
plugins/Unity/Launcher/launcheritem.h (+3/-0)
plugins/Unity/Launcher/launchermodel.cpp (+1/-0)
plugins/Unity/Launcher/ualwrapper.cpp (+12/-2)
plugins/Unity/Launcher/ualwrapper.h (+6/-0)
tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+13/-0)
tests/mocks/Unity/Launcher/MockLauncherItem.h (+3/-0)
tests/plugins/Unity/Launcher/CMakeLists.txt (+34/-0)
tests/plugins/Unity/Launcher/appdrawermodeltest.cpp (+53/-0)
tests/plugins/Unity/Launcher/ualwrapper.cpp (+60/-0)
tests/plugins/Unity/Launcher/ualwrapper.h (+55/-0)

To merge this branch:

bzr merge lp:~mzanetti/unity8/appdrawer-recent-apps

High

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-04-05
Lukáš Tinkl (community)		2017-03-13	Approve on 2017-04-05
Review via email: mp+319697@code.launchpad.net

Commit Message

Appdrawer improvements

* Complete support for recent/most used apps (still hidden as u-a-l backend doesn't support it yet)
* update drawer contents when things change in the backend

Description of the Change

Prereq-archive: ppa:ci-train-ppa-service/2692

* Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~mzanetti/unity-api/launcheritems-popularity/+merge/321708

* Did you perform an exploratory manual test run of your code change and any related functionality?

yes

* If you changed the UI, has there been a design review?

n/a

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-04:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3657/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/appdrawer-recent-apps updated on 2017-04-04

2843. By Michael Zanetti on 2017-04-04: also bump version for required pkgconfig launcher api

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-04:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3658/rebuild

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/appdrawer-recent-apps updated on 2017-04-05

2844. By Michael Zanetti on 2017-04-05: align appid usage
2845. By Michael Zanetti on 2017-04-05: drop debug print
2846. By Michael Zanetti on 2017-04-05: improve a little

Lukáš Tinkl (lukas-kde) wrote on 2017-04-05:

Works fine, review comments I had, addressed

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Waiting with top ack

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-05:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3694/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-04-05:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3697/rebuild

review: Approve (continuous-integration)

Unmerged revisions

2846. By Michael Zanetti on 2017-04-05

improve a little

2845. By Michael Zanetti on 2017-04-05

drop debug print

2844. By Michael Zanetti on 2017-04-05

align appid usage

2843. By Michael Zanetti on 2017-04-04

also bump version for required pkgconfig launcher api

2842. By Michael Zanetti on 2017-04-04

bump required unity-api versions

2841. By Michael Zanetti on 2017-04-03

add appdrawermodeltest

2840. By Michael Zanetti on 2017-04-03

disable recent apps view again to we can land this without waiting on zeitgeist

2839. By Michael Zanetti on 2017-04-03

hook up to appAdded and appRemoved signals

2838. By Michael Zanetti on 2017-04-03

merge trunk

2837. By Michael Zanetti on 2017-02-27

more complete support for recently used app in the drawer

not tested yet as u-a-l doesn't fully implement it yet

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-03-28 21:45:31 +0000
 +++ CMakeLists.txt	2017-04-05 16:29:50 +0000
@@ -75,7 +75,7 @@
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=12)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=13)
  pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
  pkg_check_modules(GD3 REQUIRED gnome-desktop-3.0)
  pkg_check_modules(UAL REQUIRED ubuntu-app-launch-3)
 === modified file 'debian/control'
 --- debian/control	2017-03-20 10:19:11 +0000
 +++ debian/control	2017-04-05 16:29:50 +0000
@@ -40,7 +40,7 @@
                 libubuntugestures5-private-dev (>= 1.3.2030),
                 libudev-dev,
                 libudm-common-dev,
--               libunity-api-dev (>= 8.6),
++               libunity-api-dev (>= 8.7),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!arm64 !armhf],
@@ -135,7 +135,7 @@
           qtdeclarative5-qtmir-plugin (>= 0.4.8),
           qtdeclarative5-ubuntu-telephony0.1,
           ubuntu-system-settings (>= 0.4),
--         unity-launcher-impl-12,
++         unity-launcher-impl-13,
           unity8-common (= ${source:Version}),
           unity8-private (= ${binary:Version}),
           unity8-private | unity-launcher-impl,
@@ -239,7 +239,7 @@
           ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-launcher-impl,
--          unity-launcher-impl-12,
++          unity-launcher-impl-13,
  Description: Unity 8 private libs
   The Unity 8 shell is the primary user interface for Ubuntu devices.
+  .
 === modified file 'plugins/Greeter/Unity/Launcher/launcheritem.cpp'
 --- plugins/Greeter/Unity/Launcher/launcheritem.cpp	2016-11-16 18:52:53 +0000
 +++ plugins/Greeter/Unity/Launcher/launcheritem.cpp	2017-04-05 16:29:50 +0000
@@ -89,6 +89,12 @@
+     }
+ }
++uint LauncherItem::popularity() const
++{
++    // Not exposing usage order in greeter session at this point.
++    return 0;
++}
++
  bool LauncherItem::pinned() const
+ {
      return m_pinned;
 === modified file 'plugins/Greeter/Unity/Launcher/launcheritem.h'
 --- plugins/Greeter/Unity/Launcher/launcheritem.h	2016-11-16 18:52:53 +0000
 +++ plugins/Greeter/Unity/Launcher/launcheritem.h	2017-04-05 16:29:50 +0000
@@ -35,6 +35,7 @@
      QString name() const override;
      QString icon() const override;
      QStringList keywords() const override;
++    uint popularity() const override;
      bool pinned() const override;
      bool running() const override;
      bool recent() const override;
 === modified file 'plugins/Unity/Launcher/appdrawermodel.cpp'
 --- plugins/Unity/Launcher/appdrawermodel.cpp	2017-01-25 17:44:54 +0000
 +++ plugins/Unity/Launcher/appdrawermodel.cpp	2017-04-05 16:29:50 +0000
@@ -21,7 +21,8 @@
  #include <QDateTime>
  AppDrawerModel::AppDrawerModel(QObject *parent):
--    AppDrawerModelInterface(parent)
++    AppDrawerModelInterface(parent),
++    m_ual(new UalWrapper(this))
+ {
      Q_FOREACH (const QString &appId, UalWrapper::installedApps()) {
          UalWrapper::AppInfo info = UalWrapper::getApplicationInfo(appId);
@@ -29,10 +30,16 @@
              qWarning() << "Failed to get app info for app" << appId;
              continue;
+         }
--        m_list.append(new LauncherItem(appId, info.name, info.icon, this));
--        m_list.last()->setKeywords(info.keywords);
++        LauncherItem* item = new LauncherItem(appId, info.name, info.icon, this);
++        item->setKeywords(info.keywords);
++        item->setPopularity(info.popularity);
++        m_list.append(item);
+     }
--    qsrand(QDateTime::currentMSecsSinceEpoch() / 100);
++
++    // keep this a queued connection as it's coming from another thread.
++    connect(m_ual, &UalWrapper::appAdded, this, &AppDrawerModel::appAdded, Qt::QueuedConnection);
++    connect(m_ual, &UalWrapper::appRemoved, this, &AppDrawerModel::appRemoved, Qt::QueuedConnection);
++    connect(m_ual, &UalWrapper::appInfoChanged, this, &AppDrawerModel::appInfoChanged, Qt::QueuedConnection);
+ }
  int AppDrawerModel::rowCount(const QModelIndex &parent) const
@@ -53,10 +60,64 @@
      case RoleKeywords:
          return m_list.at(index.row())->keywords();
      case RoleUsage:
--        // FIXME: u-a-l needs to provide API for usage stats.
--        // don't forget to drop the qsrand() call in the ctor when dropping this.
--        return qrand();
++        return m_list.at(index.row())->popularity();
+     }
      return QVariant();
+ }
++
++void AppDrawerModel::appAdded(const QString &appId)
++{
++    UalWrapper::AppInfo info = UalWrapper::getApplicationInfo(appId);
++    if (!info.valid) {
++        qWarning() << "App added signal received but failed to get app info for app" << appId;
++        return;
++    }
++
++    beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
++    LauncherItem* item = new LauncherItem(appId, info.name, info.icon, this);
++    item->setKeywords(info.keywords);
++    item->setPopularity(info.popularity);
++    m_list.append(item);
++    endInsertRows();
++}
++
++void AppDrawerModel::appRemoved(const QString &appId)
++{
++    int idx = -1;
++    for (int i = 0; i < m_list.count(); i++) {
++        if (m_list.at(i)->appId() == appId) {
++            idx = i;
++            break;
++        }
++    }
++    if (idx < 0) {
++        qWarning() << "App removed signal received but app doesn't seem to be in the drawer model";
++        return;
++    }
++    beginRemoveRows(QModelIndex(), idx, idx);
++    m_list.takeAt(idx)->deleteLater();
++    endRemoveRows();
++}
++
++void AppDrawerModel::appInfoChanged(const QString &appId)
++{
++    LauncherItem *item = nullptr;
++    int idx = -1;
++
++    for(int i = 0; i < m_list.count(); i++) {
++        if (m_list.at(i)->appId() == appId) {
++            item = m_list.at(i);
++            idx = i;
++            break;
++        }
++    }
++
++    if (!item) {
++        return;
++    }
++
++    UalWrapper::AppInfo info = m_ual->getApplicationInfo(appId);
++    item->setPopularity(info.popularity);
++    Q_EMIT dataChanged(index(idx), index(idx), {AppDrawerModelInterface::RoleUsage});
++}
 === modified file 'plugins/Unity/Launcher/appdrawermodel.h'
 --- plugins/Unity/Launcher/appdrawermodel.h	2016-11-24 16:17:30 +0000
 +++ plugins/Unity/Launcher/appdrawermodel.h	2017-04-05 16:29:50 +0000
@@ -19,6 +19,8 @@
  #include "launcheritem.h"
++class UalWrapper;
++
  class AppDrawerModel: public AppDrawerModelInterface
+ {
      Q_OBJECT
@@ -28,6 +30,12 @@
      int rowCount(const QModelIndex &parent) const override;
      QVariant data(const QModelIndex &index, int role) const override;
++private Q_SLOTS:
++    void appAdded(const QString &appId);
++    void appRemoved(const QString &appId);
++    void appInfoChanged(const QString &appId);
++
  private:
      QList<LauncherItem*> m_list;
++    UalWrapper *m_ual;
  };
 === modified file 'plugins/Unity/Launcher/launcheritem.cpp'
 --- plugins/Unity/Launcher/launcheritem.cpp	2017-03-16 11:54:13 +0000
 +++ plugins/Unity/Launcher/launcheritem.cpp	2017-04-05 16:29:50 +0000
@@ -256,6 +256,19 @@
+     }
+ }
++uint LauncherItem::popularity() const
++{
++    return m_popularity;
++}
++
++void LauncherItem::setPopularity(uint popularity)
++{
++    if (m_popularity != popularity) {
++        m_popularity = popularity;
++        Q_EMIT popularityChanged(popularity);
++    }
++}
++
  unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
+ {
      return m_quickList;
 === modified file 'plugins/Unity/Launcher/launcheritem.h'
 --- plugins/Unity/Launcher/launcheritem.h	2017-03-02 13:28:33 +0000
 +++ plugins/Unity/Launcher/launcheritem.h	2017-04-05 16:29:50 +0000
@@ -39,6 +39,7 @@
      QString name() const override;
      QString icon() const override;
      QStringList keywords() const override;
++    uint popularity() const override;
      bool pinned() const override;
      bool running() const override;
      bool recent() const override;
@@ -55,6 +56,7 @@
      void setName(const QString &name);
      void setIcon(const QString &icon);
      void setKeywords(const QStringList &keywords);
++    void setPopularity(uint popularity);
      void setPinned(bool pinned);
      void setRunning(bool running);
      void setRecent(bool recent);
@@ -70,6 +72,7 @@
      QString m_name;
      QString m_icon;
      QStringList m_keywords;
++    uint m_popularity;
      bool m_pinned;
      bool m_running;
      bool m_recent;
 === modified file 'plugins/Unity/Launcher/launchermodel.cpp'
 --- plugins/Unity/Launcher/launchermodel.cpp	2017-03-28 21:47:24 +0000
 +++ plugins/Unity/Launcher/launchermodel.cpp	2017-04-05 16:29:50 +0000
@@ -167,6 +167,7 @@
                                                appInfo.icon,
                                                this);
          item->setPinned(true);
++        item->setPopularity(appInfo.popularity);
          m_list.insert(index, item);
          endInsertRows();
+     }
 === modified file 'plugins/Unity/Launcher/ualwrapper.cpp'
 --- plugins/Unity/Launcher/ualwrapper.cpp	2016-11-24 16:17:30 +0000
 +++ plugins/Unity/Launcher/ualwrapper.cpp	2017-04-05 16:29:50 +0000
@@ -24,7 +24,15 @@
  UalWrapper::UalWrapper(QObject *parent):
      QObject(parent)
+ {
--
++    Registry::appAdded().connect([this](const std::shared_ptr<Application>&app) {
++        Q_EMIT appAdded(QString::fromStdString(app->appId()));
++    });
++    Registry::appRemoved().connect([this](const AppID &appId) {
++        Q_EMIT appRemoved(QString::fromStdString(appId));
++    });
++    Registry::appInfoUpdated().connect([this](const std::shared_ptr<Application>&app){
++        Q_EMIT appInfoChanged(QString::fromStdString(app->appId()));
++    });
+ }
  QStringList UalWrapper::installedApps()
@@ -39,7 +47,7 @@
+             }
+         }
      } catch (const std::runtime_error &e) {
--        qWarning() << "ubuntu-all-launch threw an exception listing apps:" << e.what();
++        qWarning() << "ubuntu-app-launch threw an exception listing apps:" << e.what();
+     }
      return appIds;
@@ -59,11 +67,13 @@
          std::shared_ptr<Application> ualApp;
          ualApp = Application::create(ualAppId, Registry::getDefault());
++        info.appId = appId;
          info.name = QString::fromStdString(ualApp->info()->name());
          info.icon = QString::fromStdString(ualApp->info()->iconPath());
          for (const std::string &keyword : ualApp->info()->keywords().value()) {
              info.keywords << QString::fromStdString(keyword);
+         }
++        info.popularity = ualApp->info()->popularity();
          info.valid = true;
      } catch (const std::runtime_error &e) {
          qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();
 === modified file 'plugins/Unity/Launcher/ualwrapper.h'
 --- plugins/Unity/Launcher/ualwrapper.h	2016-11-24 16:17:30 +0000
 +++ plugins/Unity/Launcher/ualwrapper.h	2017-04-05 16:29:50 +0000
@@ -21,10 +21,12 @@
      Q_OBJECT
  public:
      struct AppInfo {
++        QString appId;
          bool valid = false;
          QString name;
          QString icon;
          QStringList keywords;
++        uint popularity = 0;
      };
      UalWrapper(QObject* parent = nullptr);
@@ -32,4 +34,8 @@
      static QStringList installedApps();
      static AppInfo getApplicationInfo(const QString &appId);
++Q_SIGNALS:
++    void appAdded(const QString &appId);
++    void appRemoved(const QString &appId);
++    void appInfoChanged(const QString &appId);
  };
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2016-12-14 15:52:45 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2017-04-05 16:29:50 +0000
@@ -72,6 +72,11 @@
      return m_keywords;
+ }
++uint MockLauncherItem::popularity() const
++{
++    return m_popularity;
++}
++
  bool MockLauncherItem::pinned() const
+ {
      return m_pinned;
@@ -201,6 +206,14 @@
+     }
+ }
++void MockLauncherItem::setPopularity(uint popularity)
++{
++    if (m_popularity != popularity) {
++        m_popularity = popularity;
++        Q_EMIT popularityChanged(m_popularity);
++    }
++}
++
  unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const
+ {
      return m_quickList;
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
 --- tests/mocks/Unity/Launcher/MockLauncherItem.h	2016-11-17 12:39:57 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2017-04-05 16:29:50 +0000
@@ -40,6 +40,7 @@
      QString name() const override;
      QString icon() const override;
      QStringList keywords() const override;
++    uint popularity() const override;
      bool pinned() const override;
      bool running() const override;
@@ -55,6 +56,7 @@
  private:
      void setKeywords(const QStringList &keywords);
++    void setPopularity(uint popularity);
      void setPinned(bool pinned);
      void setRunning(bool running);
      void setRecent(bool recent);
@@ -70,6 +72,7 @@
      QString m_name;
      QString m_icon;
      QStringList m_keywords;
++    uint m_popularity;
      bool m_pinned;
      bool m_running;
      bool m_recent;
 === modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
 --- tests/plugins/Unity/Launcher/CMakeLists.txt	2017-03-02 13:28:33 +0000
 +++ tests/plugins/Unity/Launcher/CMakeLists.txt	2017-04-05 16:29:50 +0000
@@ -61,6 +61,40 @@
          --wait-for org.freedesktop.Accounts
+ )
++### AppDrawerModelTest
++add_executable(appdrawermodeltestExec
++    appdrawermodeltest.cpp
++    ualwrapper.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/appdrawermodel.cpp
++    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/AppDrawerModelInterface.h
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistentry.cpp
++    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
++    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
++    )
++target_link_libraries(appdrawermodeltestExec
++    unity8-private
++    ${GSETTINGS_QT_LDFLAGS}
++    ${GLIB_LIBRARIES}
++    ${UAL_LIBRARIES}
++    )
++add_dependencies(appdrawermodeltestExec mock-server)
++qt5_use_modules(appdrawermodeltestExec Test Core DBus Xml Gui Qml)
++install(TARGETS appdrawermodeltestExec
++    DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
++    )
++
++add_unity8_unittest(AppDrawerModel dbus-test-runner
++    ENVIRONMENT "APPDIR=${CMAKE_CURRENT_BINARY_DIR}/applications"
++    ARG_PREFIX "--parameter"
++    ARGS
++        --task $<TARGET_FILE:mock-server>
++        --ignore-return
++        --task $<TARGET_FILE:appdrawermodeltestExec>
++        --wait-for org.freedesktop.Accounts
++)
++
  # copy sample application files into build directory for shadow builds
  file(COPY applications
       DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
 === added file 'tests/plugins/Unity/Launcher/appdrawermodeltest.cpp'
 --- tests/plugins/Unity/Launcher/appdrawermodeltest.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/appdrawermodeltest.cpp	2017-04-05 16:29:50 +0000
@@ -0,0 +1,53 @@
++/*
++ * Copyright 2017 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "ualwrapper.h"
++#include "appdrawermodel.h"
++
++#include <QtTest>
++
++class AppDrawerModelTest : public QObject
++{
++    Q_OBJECT
++
++private:
++    AppDrawerModel *appDrawerModel;
++
++private Q_SLOTS:
++
++    void initTestCase() {
++        UalWrapper::s_list << QStringLiteral("app1") << QStringLiteral("app2");
++        appDrawerModel = new AppDrawerModel(this);
++        QCOMPARE(appDrawerModel->rowCount(QModelIndex()), 2);
++    }
++
++    void testUalAppAddedRemoved() {
++        QCOMPARE(appDrawerModel->rowCount(QModelIndex()), 2);
++
++        UalWrapper::instance()->addMockApp("app3");
++        qApp->processEvents(); // ualwrapper is connected Queued
++
++        QCOMPARE(appDrawerModel->rowCount(QModelIndex()), 3);
++
++        UalWrapper::instance()->removeMockApp("app3");
++        qApp->processEvents();
++
++        QCOMPARE(appDrawerModel->rowCount(QModelIndex()), 2);
++    }
++};
++
++QTEST_GUILESS_MAIN(AppDrawerModelTest)
++#include "appdrawermodeltest.moc"
 === added file 'tests/plugins/Unity/Launcher/ualwrapper.cpp'
 --- tests/plugins/Unity/Launcher/ualwrapper.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/ualwrapper.cpp	2017-04-05 16:29:50 +0000
@@ -0,0 +1,60 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "ualwrapper.h"
++#include <QDebug>
++
++UalWrapper* UalWrapper::s_instance = nullptr;
++QStringList UalWrapper::s_list;
++
++UalWrapper::UalWrapper(QObject *parent): QObject(parent)
++{
++    s_instance = this;
++}
++
++UalWrapper* UalWrapper::instance()
++{
++    return s_instance;
++}
++
++QStringList UalWrapper::installedApps()
++{
++    return s_list;
++}
++
++UalWrapper::AppInfo UalWrapper::getApplicationInfo(const QString &appId)
++{
++    AppInfo info;
++    info.appId = appId;
++    info.name = "App_" + appId;
++    info.icon = "/dummy/icon/path/" + appId + ".png";
++    info.keywords << QStringLiteral("keyword1") << QStringLiteral("keyword2");
++    info.popularity = 1;
++    info.valid = true;
++    return info;
++}
++
++void UalWrapper::addMockApp(const QString &appId)
++{
++    s_list.append(appId);
++    Q_EMIT appAdded(appId);
++}
++
++void UalWrapper::removeMockApp(const QString &appId)
++{
++    s_list.removeAll(appId);
++    Q_EMIT appRemoved(appId);
++}
 === added file 'tests/plugins/Unity/Launcher/ualwrapper.h'
 --- tests/plugins/Unity/Launcher/ualwrapper.h	1970-01-01 00:00:00 +0000
 +++ tests/plugins/Unity/Launcher/ualwrapper.h	2017-04-05 16:29:50 +0000
@@ -0,0 +1,55 @@
++/*
++ * Copyright (C) 2017 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QObject>
++
++// This is a mock implementation
++
++class UalWrapper: public QObject
++{
++    Q_OBJECT
++public:
++    struct AppInfo {
++        QString appId;
++        bool valid = false;
++        QString name;
++        QString icon;
++        QStringList keywords;
++        uint popularity = 0;
++    };
++
++    UalWrapper(QObject* parent = nullptr);
++
++    static QStringList installedApps();
++    static AppInfo getApplicationInfo(const QString &appId);
++
++    // for testing:
++    static UalWrapper* instance();
++    void addMockApp(const QString &appId);
++    void removeMockApp(const QString &appId);
++
++Q_SIGNALS:
++    void appAdded(const QString &appId);
++    void appRemoved(const QString &appId);
++    void appInfoChanged(const QString &appId);
++
++
++private:
++    static QStringList s_list;
++    static UalWrapper *s_instance;
++
++    friend class AppDrawerModelTest;
++};