Merge lp:unity-scopes-shell/rtm-14.09 into lp:unity-scopes-shell

[Pete Woods]

Sync with RTM

Sync with RTM

[lp:unity-scopes-shell/rtm-14.09]

128. By Pete Woods on 2014-08-19

Bump the version number

129. By Pete Woods on 2014-08-20

Hide the RTM release

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-06 19:44:56 +0000
+++ debian/changelog	2014-08-20 14:26:16 +0000
@@ -1,3 +1,15 @@
+unity-scopes-shell (0.5.4-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Pete Woods ]
+  * Switch to QSettings, removing U1DB dependencies Support new location
+    setting.
+
+  [ Marcus Tomlinson ]
+  * Added support for ScopeInterface::Status::NoInternet and
+    NoLocationData completion statuses
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 18 Aug 2014 18:41:35 +0000
+
 unity-scopes-shell (0.5.3+14.10.20140806-0ubuntu1) utopic; urgency=medium
 
   [ Michal Hruby ]

=== modified file 'debian/control'
--- debian/control	2014-08-05 09:35:00 +0000
+++ debian/control	2014-08-20 14:26:16 +0000
@@ -4,11 +4,10 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                libunity-api-dev (>= 7.88),
-               libunity-scopes-dev (>= 0.6.0~),
+               libunity-scopes-dev (>= 0.6.2~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
                libqtdbusmock1-dev (>= 0.2),
-               libu1db-qt5-dev,
                libubuntu-location-service-dev (>= 2.0.1),
                pkg-config,
                python-tornado,

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2014-08-05 09:35:00 +0000
+++ src/Unity/CMakeLists.txt	2014-08-20 14:26:16 +0000
@@ -3,9 +3,8 @@
 
 # Dependencies
 pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=4)
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.0)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.2)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
-pkg_check_modules(U1DB REQUIRED libu1db-qt5)
 pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
 
 include_directories(

=== modified file 'src/Unity/collectors.cpp'
--- src/Unity/collectors.cpp	2014-08-05 09:35:00 +0000
+++ src/Unity/collectors.cpp	2014-08-20 14:26:16 +0000
@@ -39,6 +39,55 @@
 
 const QEvent::Type PushEvent::eventType = static_cast<QEvent::Type>(QEvent::registerEventType());
 
+namespace
+{
+
+CollectorBase::Status getStatus(scopes::CompletionDetails const& details)
+{
+    // Gather info from the completion details
+    bool no_internet = false;
+    bool no_location_data = false;
+    bool unknown = false;
+    for (auto const& info : details.info_list())
+    {
+        switch (info.code())
+        {
+            case scopes::OperationInfo::NoInternet:
+                no_internet = true;
+                break;
+            case scopes::OperationInfo::NoLocationData:
+                no_location_data = true;
+                break;
+            case scopes::OperationInfo::Unknown:
+                unknown = true;
+                break;
+            default:
+                break;
+        }
+    }
+
+    // Return status (in order of priority)
+    if (no_internet)
+    {
+        return CollectorBase::Status::NO_INTERNET;
+    }
+    else if (no_location_data)
+    {
+        return CollectorBase::Status::NO_LOCATION_DATA;
+    }
+    else if (unknown)
+    {
+        return CollectorBase::Status::UNKNOWN;
+    }
+    else if (details.status() == scopes::CompletionDetails::Cancelled)
+    {
+        return CollectorBase::Status::CANCELLED;
+    }
+    return CollectorBase::Status::FINISHED;
+}
+
+}
+
 CollectorBase::CollectorBase(): m_status(Status::INCOMPLETE), m_posted(false)
 {
     m_timer.start();
@@ -324,10 +373,7 @@
 // this might be called from any thread (might be main, might be any other thread)
 void SearchResultReceiver::finished(scopes::CompletionDetails const& details)
 {
-    CollectorBase::Status status = details.status() == scopes::CompletionDetails::CompletionStatus::Cancelled ?
-        CollectorBase::Status::CANCELLED : CollectorBase::Status::FINISHED;
-
-    postCollectedResults(status);
+    postCollectedResults(getStatus(details));
 }
 
 PreviewDataReceiver::PreviewDataReceiver(QObject* receiver):
@@ -364,10 +410,7 @@
 // this might be called from any thread (might be main, might be any other thread)
 void PreviewDataReceiver::finished(scopes::CompletionDetails const& details)
 {
-    CollectorBase::Status status = details.status() == scopes::CompletionDetails::CompletionStatus::Cancelled ?
-        CollectorBase::Status::CANCELLED : CollectorBase::Status::FINISHED;
-
-    postCollectedResults(status);
+    postCollectedResults(getStatus(details));
 }
 
 void ActivationReceiver::activated(scopes::ActivationResponse const& response)
@@ -377,10 +420,7 @@
 
 void ActivationReceiver::finished(scopes::CompletionDetails const& details)
 {
-    CollectorBase::Status status = details.status() == scopes::CompletionDetails::CompletionStatus::Cancelled ?
-        CollectorBase::Status::CANCELLED : CollectorBase::Status::FINISHED;
-
-    postCollectedResults(status);
+    postCollectedResults(getStatus(details));
 }
 
 ActivationReceiver::ActivationReceiver(QObject* receiver, std::shared_ptr<scopes::Result> const& result):

=== modified file 'src/Unity/collectors.h'
--- src/Unity/collectors.h	2014-08-05 09:35:00 +0000
+++ src/Unity/collectors.h	2014-08-20 14:26:16 +0000
@@ -47,7 +47,7 @@
 class CollectorBase
 {
 public:
-    enum Status { INCOMPLETE, FINISHED, CANCELLED };
+    enum Status { UNKNOWN, INCOMPLETE, FINISHED, CANCELLED, NO_INTERNET, NO_LOCATION_DATA };
 
     CollectorBase();
     virtual ~CollectorBase();

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-08-06 08:35:20 +0000
+++ src/Unity/scope.cpp	2014-08-20 14:26:16 +0000
@@ -134,7 +134,21 @@
         flushUpdates();
 
         setSearchInProgress(false);
-        setStatus(status == CollectorBase::Status::FINISHED ? Status::Okay : Status::Unknown);
+
+        switch (status) {
+            case CollectorBase::Status::FINISHED:
+            case CollectorBase::Status::CANCELLED:
+                setStatus(Status::Okay);
+                break;
+            case CollectorBase::Status::NO_INTERNET:
+                setStatus(Status::NoInternet);
+                break;
+            case CollectorBase::Status::NO_LOCATION_DATA:
+                setStatus(Status::NoLocationData);
+                break;
+            default:
+                setStatus(Status::Unknown);
+        }
 
         // Don't schedule a refresh if the query suffered an error
         if (status == CollectorBase::Status::FINISHED) {
@@ -617,15 +631,20 @@
             }
         }
         try {
-            // TODO Verify that the scope is allowed to access the location data
-            if (m_scopeMetadata && m_scopeMetadata->location_data_needed())
+            if (m_settingsModel && m_scopeMetadata && m_scopeMetadata->location_data_needed())
             {
-                meta.set_location(m_locationService->location());
+                QVariant locationEnabled = m_settingsModel->value("internal.location");
+                if (locationEnabled.type() == QVariant::Bool && locationEnabled.toBool())
+                {
+                    meta.set_location(m_locationService->location());
+                }
             }
         }
         catch (std::domain_error& e)
         {
         }
+        meta.set_internet_connectivity(m_network_manager.isOnline() ? scopes::SearchMetadata::Connected : scopes::SearchMetadata::Disconnected);
+
         scopes::SearchListenerBase::SPtr listener(new SearchResultReceiver(this));
         m_searchController->setListener(listener);
         try {
@@ -658,13 +677,13 @@
         scopes::Variant settings_definitions;
         settings_definitions = m_scopeMetadata->settings_definitions();
         QDir shareDir;
-        if(qEnvironmentVariableIsSet("UNITY_SCOPES_SETTINGS_DIR"))
+        if(qEnvironmentVariableIsSet("UNITY_SCOPES_CONFIG_DIR"))
         {
-            shareDir = qgetenv("UNITY_SCOPES_SETTINGS_DIR");
+            shareDir = qgetenv("UNITY_SCOPES_CONFIG_DIR");
         }
         else
         {
-            shareDir = QDir::home().filePath(".local/share");
+            shareDir = QDir::home().filePath(".config/unity-scopes");
         }
 
         m_settingsModel.reset(

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2014-08-04 16:27:17 +0000
+++ src/Unity/scope.h	2014-08-20 14:26:16 +0000
@@ -26,6 +26,7 @@
 #include <QTimer>
 #include <QMetaType>
 #include <QMetaObject>
+#include <QNetworkConfigurationManager>
 #include <QPointer>
 #include <QMultiMap>
 #include <QSet>
@@ -233,6 +234,7 @@
     QMap<Department*, QString> m_inverseDepartments;
     QMetaObject::Connection m_metadataConnection;
     LocationService::Ptr m_locationService;
+    QNetworkConfigurationManager m_network_manager;
 };
 
 } // namespace scopes_ng

=== modified file 'src/Unity/settingsmodel.cpp'
--- src/Unity/settingsmodel.cpp	2014-08-05 16:24:32 +0000
+++ src/Unity/settingsmodel.cpp	2014-08-20 14:26:16 +0000
@@ -27,18 +27,15 @@
 using namespace scopes_ng;
 namespace sc = unity::scopes;
 
-static const QString SETTING_GROUP("default");
-
-static const QString SETTING_ID_PATTERN("%1-%2");
-
-SettingsModel::SettingsModel(const QDir& shareDir, const QString& scopeId,
+SettingsModel::SettingsModel(const QDir& configDir, const QString& scopeId,
         const QVariant& settingsDefinitions, QObject* parent,
         int settingsTimeout)
         : SettingsModelInterface(parent), m_settingsTimeout(settingsTimeout)
 {
-    shareDir.mkdir(scopeId);
-    QDir databaseDir = shareDir.filePath(scopeId);
-    m_database.setPath(databaseDir.filePath("settings.db"));
+    configDir.mkpath(scopeId);
+    QDir databaseDir = configDir.filePath(scopeId);
+
+    m_settings.reset(new QSettings(databaseDir.filePath("settings.ini"), QSettings::IniFormat));
 
     for (const auto &it : settingsDefinitions.toList())
     {
@@ -46,27 +43,38 @@
         QString id = data["id"].toString();
         QString displayName = data["displayName"].toString();
         QVariantMap properties;
+        QVariant defaultValue;
         if (data.contains("displayValues"))
         {
             properties["values"] = data["displayValues"].toList();
         }
         QString type = data["type"].toString();
 
-        QVariantMap defaults;
+        QVariant::Type variantType;
+
+        if(type == "boolean")
+        {
+            variantType = QVariant::Bool;
+        }
+        else if(type == "list")
+        {
+            variantType = QVariant::UInt;
+        }
+        else if(type == "number")
+        {
+            variantType = QVariant::Double;
+        }
+        else if(type == "string")
+        {
+            variantType = QVariant::String;
+        }
+
         if(data.contains("defaultValue"))
         {
-            defaults["value"] = data["defaultValue"];
-            properties["defaultValue"] = data["defaultValue"];
+            defaultValue = data["defaultValue"];
+            properties["defaultValue"] = defaultValue;
         }
 
-        QSharedPointer<U1db::Document> document(new U1db::Document);
-        document->setDocId(SETTING_ID_PATTERN.arg(SETTING_GROUP, id));
-        document->setDefaults(defaults);
-        document->setDatabase(&m_database);
-        document->setCreate(true);
-
-        m_documents[id] = document;
-
         QSharedPointer<QTimer> timer(new QTimer());
         timer->setProperty("setting_id", id);
         timer->setSingleShot(true);
@@ -77,9 +85,11 @@
         m_timers[id] = timer;
 
         QSharedPointer<Data> setting(
-                new Data(id, displayName, type, properties));
+                new Data(id, displayName, type, properties, defaultValue,
+                        variantType));
 
         m_data << setting;
+        m_data_by_id[id] = setting;
     }
 }
 
@@ -108,9 +118,8 @@
                 break;
             case Roles::RoleValue:
             {
-                QSharedPointer<U1db::Document> document = m_documents[data->id];
-                QVariantMap contents = document->getContents().toMap();
-                result = contents["value"];
+                result = m_settings->value(data->id, data->defaultValue);
+                result.convert(data->variantType);
                 break;
             }
             default:
@@ -121,6 +130,21 @@
     return result;
 }
 
+QVariant SettingsModel::value(const QString& id) const
+{
+    m_settings->sync();
+
+    QVariant result;
+
+    QSharedPointer<Data> data = m_data_by_id[id];
+    if (data)
+    {
+        result = m_settings->value(data->id, data->defaultValue);
+        result.convert(data->variantType);
+    }
+    return result;
+}
+
 bool SettingsModel::setData(const QModelIndex &index, const QVariant &value,
         int role)
 {
@@ -170,8 +194,5 @@
     QString setting_id = timer->property("setting_id").toString();
     QVariant value = timer->property("value");
 
-    QSharedPointer<U1db::Document> document = m_documents[setting_id];
-    QVariantMap map;
-    map["value"] = value;
-    document->setContents(map);
+    m_settings->setValue(setting_id, value);
 }

=== modified file 'src/Unity/settingsmodel.h'
--- src/Unity/settingsmodel.h	2014-07-08 09:52:28 +0000
+++ src/Unity/settingsmodel.h	2014-08-20 14:26:16 +0000
@@ -20,14 +20,13 @@
 #ifndef NG_PREVIEW_SETTTINGSMODEL_H_
 #define NG_PREVIEW_SETTTINGSMODEL_H_
 
-#include <libu1db-qt5/database.h>
-#include <libu1db-qt5/document.h>
 #include <unity/SymbolExport.h>
 #include <unity/shell/scopes/SettingsModelInterface.h>
 
 #include <QAbstractListModel>
 #include <QList>
 #include <QSharedPointer>
+#include <QSettings>
 
 QT_BEGIN_NAMESPACE
 class QDir;
@@ -47,17 +46,21 @@
         QString displayName;
         QString type;
         QVariant properties;
+        QVariant defaultValue;
+        QVariant::Type variantType;
 
         Data(QString const& id_, QString const& displayName_,
-                QString const& type_, QVariant const& properties_)
-                : id(id_), displayName(displayName_), type(type_), properties(
-                        properties_)
+                QString const& type_, QVariant const& properties_,
+                QVariant const& defaultValue_, QVariant::Type variantType_) :
+                id(id_), displayName(displayName_), type(type_), properties(
+                        properties_), defaultValue(defaultValue_), variantType(
+                        variantType_)
         {
         }
     };
 
 public:
-    explicit SettingsModel(const QDir& shareDir, const QString& scopeId,
+    explicit SettingsModel(const QDir& configDir, const QString& scopeId,
             const QVariant& settingsDefinitions, QObject* parent = 0,
             int settingsTimeout = 300);
 
@@ -71,6 +74,8 @@
 
     int count() const override;
 
+    QVariant value(const QString& id) const;
+
 protected Q_SLOTS:
     void settings_timeout();
 
@@ -79,9 +84,9 @@
 
     QList<QSharedPointer<Data>> m_data;
 
-    U1db::Database m_database;
+    QMap<QString, QSharedPointer<Data>> m_data_by_id;
 
-    QMap<QString, QSharedPointer<U1db::Document>> m_documents;
+    QScopedPointer<QSettings> m_settings;
 
     QMap<QString, QSharedPointer<QTimer>> m_timers;
 };

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-08-05 16:24:32 +0000
+++ tests/CMakeLists.txt	2014-08-20 14:26:16 +0000
@@ -1,5 +1,5 @@
 pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=3)
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.0)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.2)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1>=0.2 REQUIRED)
 pkg_check_modules(QTDBUSMOCK REQUIRED libqtdbusmock-1>=0.2 REQUIRED)

=== modified file 'tests/data/CMakeLists.txt'
--- tests/data/CMakeLists.txt	2014-07-29 10:50:23 +0000
+++ tests/data/CMakeLists.txt	2014-08-20 14:26:16 +0000
@@ -1,6 +1,7 @@
 add_subdirectory(mock-scope)
 add_subdirectory(mock-scope-departments)
 add_subdirectory(mock-scope-double-nav)
+add_subdirectory(mock-scope-info)
 add_subdirectory(mock-scope-ttl)
 add_subdirectory(scopes)
 

=== added directory 'tests/data/mock-scope-info'
=== added file 'tests/data/mock-scope-info/CMakeLists.txt'
--- tests/data/mock-scope-info/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-info/CMakeLists.txt	2014-08-20 14:26:16 +0000
@@ -0,0 +1,15 @@
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.0)
+
+set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
+
+include_directories(${SCOPESLIB_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set(SCOPE_SOURCES
+    mock-scope-info.cpp
+    )
+
+add_library(mock-scope-info MODULE ${SCOPE_SOURCES})
+target_link_libraries(mock-scope-info ${SCOPESLIB_LDFLAGS})
+
+configure_file(mock-scope-info.ini.in mock-scope-info.ini)

=== added file 'tests/data/mock-scope-info/mock-scope-info.cpp'
--- tests/data/mock-scope-info/mock-scope-info.cpp	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-info/mock-scope-info.cpp	2014-08-20 14:26:16 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2014 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 version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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/>.
+ *
+ * Authored by: Marcus Tomlinson <[e-mail]>
+ */
+
+#include <unity/scopes/ScopeBase.h>
+#include <unity/scopes/SearchReply.h>
+
+#include <atomic>
+
+#define EXPORT __attribute__ ((visibility ("default")))
+
+using namespace std;
+using namespace unity::scopes;
+
+class MyQuery : public SearchQueryBase
+{
+public:
+    MyQuery(CannedQuery const& query, SearchMetadata const& metadata)
+        : SearchQueryBase(query, metadata)
+        , m_query(query.query_string())
+    {
+    }
+
+    ~MyQuery()
+    {
+    }
+
+    virtual void cancelled() override
+    {
+    }
+
+    virtual void run(SearchReplyProxy const& reply) override
+    {
+        // No info (Status::Okay)
+        if (m_query == "no_info")
+        {
+        }
+        // NoInternet (Status::NoInternet)
+        if (m_query == "no_internet")
+        {
+            reply->info(OperationInfo{OperationInfo::NoInternet});
+        }
+        // NoLocationData (Status::NoLocationData)
+        if (m_query == "no_location")
+        {
+            reply->info(OperationInfo{OperationInfo::NoLocationData});
+        }
+        // DefaultSettingsUsed (unknown to shell but known to run-time so Status::Okay)
+        if (m_query == "shell_unknown")
+        {
+            reply->info(OperationInfo{OperationInfo::DefaultSettingsUsed});
+        }
+        // DefaultSettingsUsed (unknown to runtime so Status::Unknown)
+        if (m_query == "runtime_unknown")
+        {
+            reply->info(OperationInfo{static_cast<OperationInfo::InfoCode>(OperationInfo::LastInfoCode_ + 1)});
+        }
+        // NoLocationData and NoInternet (Status::NoInternet takes priority)
+        if (m_query == "no_location_no_internet")
+        {
+            reply->info(OperationInfo{OperationInfo::NoLocationData});
+            reply->info(OperationInfo{OperationInfo::NoInternet});
+        }
+    }
+
+private:
+    std::string m_query;
+};
+
+class MyScope : public ScopeBase
+{
+public:
+    MyScope()
+    {
+    }
+
+    virtual SearchQueryBase::UPtr search(CannedQuery const& q, SearchMetadata const& metadata) override
+    {
+        return SearchQueryBase::UPtr(new MyQuery(q, metadata));
+    }
+
+    virtual PreviewQueryBase::UPtr preview(Result const&, ActionMetadata const&) override
+    {
+        return nullptr;
+    }
+};
+
+extern "C"
+{
+
+    EXPORT
+    unity::scopes::ScopeBase*
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_CREATE_FUNCTION()
+    {
+        return new MyScope;
+    }
+
+    EXPORT
+    void
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
+    {
+        delete scope_base;
+    }
+
+}

=== added file 'tests/data/mock-scope-info/mock-scope-info.ini.in'
--- tests/data/mock-scope-info/mock-scope-info.ini.in	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-info/mock-scope-info.ini.in	2014-08-20 14:26:16 +0000
@@ -0,0 +1,5 @@
+[ScopeConfig]
+DisplayName = mock-info.DisplayName
+Description = mock-info.Description
+Icon = /mock-info.Icon
+Author = mock-info.Author

=== modified file 'tests/registry-spawner.h'
--- tests/registry-spawner.h	2014-08-05 16:24:32 +0000
+++ tests/registry-spawner.h	2014-08-20 14:26:16 +0000
@@ -35,7 +35,7 @@
 public:
     RegistrySpawner()
     {
-        qputenv("UNITY_SCOPES_SETTINGS_DIR", m_tempDir.path().toUtf8());
+        qputenv("UNITY_SCOPES_CONFIG_DIR", m_tempDir.path().toUtf8());
 
         QDir endpointdir(QFileInfo(TEST_RUNTIME_CONFIG).dir());
         endpointdir.cd(QString("endpoints"));

=== modified file 'tests/resultstest.cpp'
--- tests/resultstest.cpp	2014-08-01 11:43:58 +0000
+++ tests/resultstest.cpp	2014-08-20 14:26:16 +0000
@@ -88,6 +88,7 @@
     QScopedPointer<Scopes> m_scopes;
     Scope* m_scope;
     Scope* m_scope_ttl;
+    Scope* m_scope_info;
     QScopedPointer<RegistrySpawner> m_registry;
 
 private Q_SLOTS:
@@ -121,8 +122,13 @@
 
         // get scope proxy for TTL scope
         m_scope_ttl = qobject_cast<scopes_ng::Scope*>(m_scopes->getScopeById(QString("mock-scope-ttl")));
-        QVERIFY(m_scope != nullptr);
+        QVERIFY(m_scope_ttl != nullptr);
         m_scope_ttl->setActive(true);
+
+        // get scope proxy for info scope (sends info() messages)
+        m_scope_info = qobject_cast<scopes_ng::Scope*>(m_scopes->getScopeById(QString("mock-scope-info")));
+        QVERIFY(m_scope_info != nullptr);
+        m_scope_info->setActive(true);
     }
 
     void cleanup()
@@ -130,6 +136,7 @@
         m_scopes.reset();
         m_scope = nullptr;
         m_scope_ttl = nullptr;
+        m_scope_info = nullptr;
     }
 
     void testScopeCommunication()
@@ -666,6 +673,28 @@
         QCOMPARE(m_scope->searchQuery(), QString("next-scope-query"));
     }
 
+    void testInfoStatus()
+    {
+        // No info (Status::Okay)
+        performSearch(m_scope_info, QString("no_info"));
+        QCOMPARE(m_scope_info->status(), unity::shell::scopes::ScopeInterface::Status::Okay);
+        // NoInternet (Status::NoInternet)
+        performSearch(m_scope_info, QString("no_internet"));
+        QCOMPARE(m_scope_info->status(), unity::shell::scopes::ScopeInterface::Status::NoInternet);
+        // NoLocationData (Status::NoLocationData)
+        performSearch(m_scope_info, QString("no_location"));
+        QCOMPARE(m_scope_info->status(), unity::shell::scopes::ScopeInterface::Status::NoLocationData);
+        // DefaultSettingsUsed (unknown to shell but known to run-time so Status::Okay)
+        performSearch(m_scope_info, QString("shell_unknown"));
+        QCOMPARE(m_scope_info->status(), unity::shell::scopes::ScopeInterface::Status::Okay);
+        // DefaultSettingsUsed (unknown to runtime so Status::Unknown)
+        performSearch(m_scope_info, QString("runtime_unknown"));
+        QCOMPARE(m_scope_info->status(), unity::shell::scopes::ScopeInterface::Status::Unknown);
+        // NoLocationData and NoInternet (Status::NoInternet takes priority)
+        performSearch(m_scope_info, QString("no_location_no_internet"));
+        QCOMPARE(m_scope_info->status(), unity::shell::scopes::ScopeInterface::Status::NoInternet);
+    }
+
 };
 
 QTEST_GUILESS_MAIN(ResultsTest)