Merge lp:~unity-api-team/unity-scopes-shell/scope-harness into lp:unity-scopes-shell

[Pete Woods]

Add test harness for scopes

Add test harness for scopes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/300/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/42/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/300/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:237
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/301/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/301/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

767 +void Scopes::addTempScope(Scope::Ptr const& scope)

I've found the change from raw ptrs to shared ptrs for temporary scopes problematic - it makes it crash in closeScope() at the moment. closeScope() expects that Scopes object is the owner of all created temporary scopes (it needs to call deleteLater on it), but this cannot be guaranteed with shared pointers (NB, closeScope is exposed to QML via Scope/Scopes interfaces in unity-api).
In general, using shared ptrs to QObjects in Qt is problematic, because all the standard Qt APIs expect raw QObject pointers and it conflicts with Qt's internal semantics of child-parent object relationships and QObject lifetime control.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/303/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/303/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/305/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/47/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/305/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/306/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/306/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:242
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/307/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/49

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/307/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

693 // we need to delay actual deletion of Scope object so that shell can animate it
694 - QTimer::singleShot(1000 * SCOPE_DELETE_DELAY, (*it), SLOT(deleteLater()));
695 + QTimer::singleShot(1000 * SCOPE_DELETE_DELAY, (*it).data(), SLOT(deleteLater()));
696 it = m_scopes.erase(it);

I think that will not work anymore, because erasing from m_scopes will just invoke deleteLater immediately?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/308/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/50
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/50/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/50

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/308/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/309/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/51

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/309/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/310/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/310/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Great stuff! Proved to work while I worked on python bindings. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:247
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/317/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/59

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/317/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

Many of the methods added in this code are using typedef types, such as size_t, which the C++ symbol mangling will morph into unsigned long or unsigned int, depending on whether it's on 64-bit or 32-bit. This is causing the symbols check failures in https://code.launchpad.net/~unity-api-team/unity-scopes-shell/harness-symbols/+merge/252323 .

These symbols, which show up as #MISSING# in the failed build console output, need to be changed to use a different type which is stable across architectures.

review: Needs Fixing

[James Henstridge (jamesh)]

Rodney: why are you marking this MP as needs-fixing if it is the other one that you have an issue with?

Yes, size_t mangles to a different symbol on different architectures. But the branch fixing the symbols addresses that. This is hardly the only library that hits this 32-bit/64-bit difference.

[dobey (dobey)]

On Wed, 2015-03-18 at 10:17 +0000, James Henstridge wrote:
> Rodney: why are you marking this MP as needs-fixing if it is the other
> one that you have an issue with?
>
> Yes, size_t mangles to a different symbol on different architectures.
> But the branch fixing the symbols addresses that. This is hardly the
> only library that hits this 32-bit/64-bit difference.

This is the branch which introduces the size_t (and this library, and
the symbols file should really be part of this branch, not a separate
one). The correct way to fix this was to use an int and wrap the size_t
exposure out of our own API, using error checking to prevent negative
values or such.

We do have the same issue in other libraries, but that is not an excuse
to keep reintroducing the problem in new libraries we write.

[Michi Henning (michihenning)]

I agree with the sentiment in general. size_t shouldn't be part of a public API unless it *really* (*really*) means "size of the largest object supported by the implementation". size_t most definitely does *not* mean "non-negative" (and is useless for that, anyway).

People need to learn to hate unsigned. It creates the illusion of something that doesn't exist…

One of the few legitimate uses of unsigned is when bit shifting, to avoid sign extension. Other than that, unsigned creates far more problems than it's worth. (And, in hindsight, having the same single >> operator behave differently depending on the type of its left-hand operand was a thoroughly bad idea. A better language would have different operators for arithmetic shift and logical shift, and a ton of subtle bugs would have been avoided over the past 35 years.)

[James Henstridge (jamesh)]

If your premise is that size_t should never be used in an API, then I disagree. It is unfortunate that it causes mangling differences, but this is hardly the only package to have to deal with this issue.

The API is simply using size_t where the underlying STL containers use it too, which seems sensible.

[Michi Henning (michihenning)]

size_t *could* be used in an API, if it really happens to mean "largest size of an object supported by the implementation". In other words, the same thing as sizeof(something). However, there is nothing to be gained by using size_t; an integer will do the same job more safely.

If size_t is used to indicate something like "number of things in this container", size_t is always the wrong type. If anything, in that case, it should be int (or, if I really want to insist on using an unsigned type), unsigned. With int and unsigned, there are no surprises with implementation-defined types.

Note that STL containers do *not* use size_t for things like counts. They use size_type instead. size_type sometimes happens to be defined as size_t beneath the covers. If so, it's just as wrong, because that introduces the exact same problem we ran into here...

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-03 07:32:37 +0000
+++ CMakeLists.txt	2015-03-04 08:54:34 +0000
@@ -1,10 +1,5 @@
 cmake_minimum_required(VERSION 2.8.9)
 
-# Default install location. Must be set here, before setting the project.
-if (NOT DEFINED CMAKE_INSTALL_PREFIX)
-    set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "" FORCE)
-endif()
-
 project(unity-scopes-shell C CXX)
 
 if(${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
@@ -15,6 +10,7 @@
 
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
 
@@ -45,11 +41,16 @@
 
 find_package(PkgConfig)
 find_package(Intltool)
+find_package(Qt5Concurrent)
 find_package(Qt5Core)
 find_package(Qt5DBus)
 find_package(Qt5Qml)
 find_package(Qt5Quick)
 find_package(Qt5Gui)
+find_package(Boost COMPONENTS regex REQUIRED)
+
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.12)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)
 
 # Standard install paths
 include(GNUInstallDirs)

=== added file 'cmake/modules/QtWithObjectTarget.cmake'
--- cmake/modules/QtWithObjectTarget.cmake	1970-01-01 00:00:00 +0000
+++ cmake/modules/QtWithObjectTarget.cmake	2015-03-04 08:54:34 +0000
@@ -0,0 +1,13 @@
+
+function(object_qt5_use_modules TARGET_NAME)
+    foreach(_module ${ARGN})
+        target_include_directories(
+            ${TARGET_NAME} PRIVATE
+            $<TARGET_PROPERTY:Qt5::${_module},INTERFACE_INCLUDE_DIRECTORIES>
+        )
+        target_compile_definitions(
+            ${TARGET_NAME} PRIVATE
+            $<TARGET_PROPERTY:Qt5::${_module},INTERFACE_COMPILE_DEFINITIONS>
+        )
+    endforeach()
+endfunction()
\ No newline at end of file

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-11-18 17:58:14 +0000
+++ data/CMakeLists.txt	2015-03-04 08:54:34 +0000
@@ -1,3 +1,13 @@
 # Set up package config.
 configure_file(unity-plugin-scopes.pc.in unity-plugin-scopes.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-plugin-scopes.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+configure_file(
+    "libscope-harness.pc.in"
+    "libscope-harness.pc"
+    @ONLY
+)
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/libscope-harness.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
\ No newline at end of file

=== added file 'data/libscope-harness.pc.in'
--- data/libscope-harness.pc.in	1970-01-01 00:00:00 +0000
+++ data/libscope-harness.pc.in	2015-03-04 08:54:34 +0000
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${exec_prefix}/include
+ 
+Name: libscope-harness
+Description: Test harness for scopes
+Version: 1.0
+Cflags: -I${includedir}
+Libs: -L${libdir} -lscope-harness

=== modified file 'debian/control'
--- debian/control	2015-02-12 17:19:29 +0000
+++ debian/control	2015-03-04 08:54:34 +0000
@@ -3,6 +3,7 @@
 Section: libs
 Build-Depends: cmake,
                debhelper (>= 9),
+               libboost-regex-dev,
                libunity-api-dev (>= 7.96),
                libunity-scopes-dev (>= 0.6.12~),
                libgsettings-qt-dev (>= 0.1),
@@ -44,3 +45,24 @@
 Replaces: unity8-private (<< 7.84)
 Description: QML plugin for Scopes
  Plugin to integrate scopes with the Unity shell
+
+Package: libscope-harness1
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Test harness for Unity scopes
+ Drive Unity scopes with a simple synchronous API. Make assertions
+ about results. Runtime library.
+
+Package: libscope-harness-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         libscope-harness1 (= ${binary:Version})
+Description: Test harness for Unity scopes
+ Drive Unity scopes with a simple synchronous API. Make assertions
+ about results. Development files.

=== added file 'debian/libscope-harness-dev.install'
--- debian/libscope-harness-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libscope-harness-dev.install	2015-03-04 08:54:34 +0000
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/libscope-harness.so
+usr/lib/*/pkgconfig/libscope-harness.pc

=== added file 'debian/libscope-harness1.install'
--- debian/libscope-harness1.install	1970-01-01 00:00:00 +0000
+++ debian/libscope-harness1.install	2015-03-04 08:54:34 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libscope-harness.so.*

=== modified file 'debian/rules'
--- debian/rules	2014-03-19 16:59:10 +0000
+++ debian/rules	2015-03-04 08:54:34 +0000
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/dpkg/default.mk
+
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifneq (,$(findstring powerpc,$(DEB_HOST_GNU_TYPE)))
@@ -17,4 +19,4 @@
 	dh $@ --parallel --fail-missing
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)

=== added file 'debian/unity-plugin-scopes.install'
--- debian/unity-plugin-scopes.install	1970-01-01 00:00:00 +0000
+++ debian/unity-plugin-scopes.install	2015-03-04 08:54:34 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/pkgconfig/unity-plugin-scopes.pc
+usr/lib/*/unity8/*

=== modified file 'po/unity-plugin-scopes.pot'
--- po/unity-plugin-scopes.pot	2015-02-03 08:28:40 +0000
+++ po/unity-plugin-scopes.pot	2015-03-04 08:54:34 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-03 10:03+0200\n"
+"POT-Creation-Date: 2015-03-04 08:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-11-08 17:01:37 +0000
+++ src/CMakeLists.txt	2015-03-04 08:54:34 +0000
@@ -1,2 +1,32 @@
+
+# Dependencies
+pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
+pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
+pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
+pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
+
+include_directories(
+    ${UBUNTU_LOCATION_SERVICE_INCLUDE_DIRS}
+)
+
+set(
+    SCOPES_SHELL_DEPENDENCIES
+    ${SCOPESLIB_LDFLAGS}
+    ${GSETTINGSQT_LDFLAGS}
+    ${U1DB_LDFLAGS}
+    ${UBUNTU_LOCATION_SERVICE_LDFLAGS}
+    ${ONLINE_ACCOUNTS_CLIENT_LDFLAGS}
+)
+
+set(
+    SCOPES_SHELL_QT_DEPENDENCIES
+    Concurrent
+    DBus
+    Gui
+    Network
+    Qml
+)
+
 add_subdirectory(Unity)
+add_subdirectory(scope-harness)
 

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2015-02-13 16:47:34 +0000
+++ src/Unity/CMakeLists.txt	2015-03-04 08:54:34 +0000
@@ -1,11 +1,10 @@
 # export_qmlplugin macro
 include(Plugins)
 
+include(QtWithObjectTarget)
+
 # Dependencies
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=6)
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.12)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
-pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)
 pkg_check_modules(ONLINE_ACCOUNTS_CLIENT REQUIRED OnlineAccountsClient)
 
 include_directories(
@@ -14,9 +13,12 @@
     ${SCOPESLIB_INCLUDE_DIRS}
     ${GSETTINGSQT_INCLUDE_DIRS}
     ${U1DB_INCLUDE_DIRS}
-    ${UBUNTU_LOCATION_SERVICE_INCLUDE_DIRS}
 )
 
+add_definitions(
+    -DUNITY_DLL_EXPORTS=1
+    )
+
 set(QMLPLUGIN_SRC
     categories.cpp
     collectors.cpp
@@ -37,7 +39,6 @@
     settingsmodel.cpp
     ubuntulocationservice.cpp
     utils.cpp
-    plugin.cpp
     iconutils.cpp
     # We need these headers here so moc runs and we get the moc-stuff
     # compiled in, otherwise we miss some symbols
@@ -52,21 +53,45 @@
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h
 )
 
+# Object code library
+
+add_library(
+    Unity-qml-object OBJECT
+    ${QMLPLUGIN_SRC}
+)
+
+set_target_properties(
+    Unity-qml-object
+    PROPERTIES
+        COMPILE_FLAGS -fPIC
+)
+
+# Work around cmake definciency for using Qt with OBJECT target
+object_qt5_use_modules(
+    Unity-qml-object
+    ${SCOPES_SHELL_QT_DEPENDENCIES}
+)
+
+# Shared library for plugin
+
+add_library(
+  Unity-qml SHARED
+  $<TARGET_OBJECTS:Unity-qml-object>
+  plugin.cpp
+)
+
+target_link_libraries(
+    Unity-qml
+    ${SCOPES_SHELL_DEPENDENCIES}
+)
+
+qt5_use_modules(
+    Unity-qml
+    ${SCOPES_SHELL_QT_DEPENDENCIES}
+)
 # Workaround for gcc failure LP: #1417664
 set_source_files_properties(previewwidgetmodel.cpp PROPERTIES COMPILE_FLAGS -O1)
 
-add_library(Unity-qml SHARED ${QMLPLUGIN_SRC})
-
-target_link_libraries(Unity-qml
-    ${SCOPESLIB_LDFLAGS}
-    ${GSETTINGSQT_LDFLAGS}
-    ${U1DB_LDFLAGS}
-    ${UBUNTU_LOCATION_SERVICE_LDFLAGS}
-    ${ONLINE_ACCOUNTS_CLIENT_LDFLAGS}
-    )
-
-qt5_use_modules(Unity-qml Qml Gui DBus Concurrent)
-
 # export the qmldir qmltypes and plugin files
 export_qmlfiles(Unity Unity)
 export_qmlplugin(Unity 0.2 Unity TARGETS Unity-qml)

=== modified file 'src/Unity/categories.cpp'
--- src/Unity/categories.cpp	2014-11-24 10:55:37 +0000
+++ src/Unity/categories.cpp	2015-03-04 08:54:34 +0000
@@ -247,9 +247,9 @@
         return true;
     }
 
+    scopes::Category::SCPtr m_category;
 private:
     static QJsonValue* DEFAULTS;
-    scopes::Category::SCPtr m_category;
     QString m_catId;
     QString m_catTitle;
     QString m_catIcon;
@@ -512,7 +512,7 @@
 Categories::data(const QModelIndex& index, int role) const
 {
     int row = index.row();
-    if (row >= m_categories.size())
+    if (row >= m_categories.size() || row < 0)
     {
         qWarning() << "Categories::data - invalid index" << row << "size"
                 << m_categories.size();
@@ -552,11 +552,35 @@
             }
             else
             {
+                qWarning() << "Category data has no results model" << catData->categoryId();
                 return QVariant();
             }
         }
         case RoleCount:
             return catData->resultsModelCount();
+        case RoleResultsSPtr:
+        {
+            QSharedPointer<unity::shell::scopes::ResultsModelInterface> resultsModel = catData->resultsModel();
+            if (resultsModel)
+            {
+                return QVariant::fromValue(resultsModel);
+            }
+            else
+            {
+                return QVariant();
+            }
+        }
+        case RoleCategorySPtr:
+        {
+            if (catData->m_category)
+            {
+                return QVariant::fromValue(catData->m_category);
+            }
+            else
+            {
+                return QVariant();
+            }
+        }
         default:
             return QVariant();
     }

=== modified file 'src/Unity/categories.h'
--- src/Unity/categories.h	2014-11-20 13:29:07 +0000
+++ src/Unity/categories.h	2015-03-04 08:54:34 +0000
@@ -43,6 +43,12 @@
 public:
     explicit Categories(QObject* parent = 0);
 
+    enum ExtraRoles
+    {
+        RoleResultsSPtr = 999998,
+        RoleCategorySPtr = 999999
+    };
+
     ~Categories();
 
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
@@ -73,5 +79,6 @@
 } // namespace scopes_ng
 
 Q_DECLARE_METATYPE(scopes_ng::Categories*)
+Q_DECLARE_METATYPE(std::shared_ptr<const unity::scopes::Category>)
 
 #endif // NG_CATEGORIES_H

=== modified file 'src/Unity/overviewscope.cpp'
--- src/Unity/overviewscope.cpp	2014-10-24 13:20:36 +0000
+++ src/Unity/overviewscope.cpp	2015-03-04 08:54:34 +0000
@@ -33,7 +33,12 @@
 
 using namespace unity;
 
-OverviewScope::OverviewScope(QObject *parent) : scopes_ng::Scope(parent)
+QSharedPointer<OverviewScope> OverviewScope::newInstance(scopes_ng::Scopes* parent)
+{
+    return QSharedPointer<OverviewScope>(new OverviewScope(parent), &QObject::deleteLater);
+}
+
+OverviewScope::OverviewScope(scopes_ng::Scopes* parent) : scopes_ng::Scope(parent)
 {
     m_categories.reset(new OverviewCategories(this));
 

=== modified file 'src/Unity/overviewscope.h'
--- src/Unity/overviewscope.h	2014-10-24 13:20:36 +0000
+++ src/Unity/overviewscope.h	2015-03-04 08:54:34 +0000
@@ -30,7 +30,8 @@
     Q_OBJECT
 
 public:
-    explicit OverviewScope(QObject *parent = 0);
+    static QSharedPointer<OverviewScope> newInstance(scopes_ng::Scopes* parent);
+
     virtual ~OverviewScope();
 
     /* getters */
@@ -42,6 +43,9 @@
 
     unity::scopes::ScopeProxy proxy_for_result(unity::scopes::Result::SPtr const& result) const override;
 
+protected:
+    explicit OverviewScope(scopes_ng::Scopes* parent);
+
 private Q_SLOTS:
     void metadataChanged();
 

=== modified file 'src/Unity/previewmodel.cpp'
--- src/Unity/previewmodel.cpp	2014-11-19 13:08:17 +0000
+++ src/Unity/previewmodel.cpp	2015-03-04 08:54:34 +0000
@@ -203,7 +203,7 @@
         for (int i = 0; i < numColumns; i++) {
             std::vector<std::string> widgetArr(layout.column(i));
             QStringList widgets;
-            for (unsigned int j = 0; j < widgetArr.size(); j++) {
+            for (std::size_t j = 0; j < widgetArr.size(); j++) {
                 widgets.append(QString::fromStdString(widgetArr[j]));
             }
             widgetsPerColumn.append(widgets);

=== modified file 'src/Unity/resultsmodel.cpp'
--- src/Unity/resultsmodel.cpp	2014-11-28 08:52:30 +0000
+++ src/Unity/resultsmodel.cpp	2015-03-04 08:54:34 +0000
@@ -143,7 +143,7 @@
 
         QVariantList attributes;
         scopes::VariantArray arr(v.get_array());
-        for (unsigned i = 0; i < arr.size(); i++) {
+        for (size_t i = 0; i < arr.size(); i++) {
             if (arr[i].which() != scopes::Variant::Type::Dict) {
                 continue;
             }

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2015-02-26 18:02:32 +0000
+++ src/Unity/scope.cpp	2015-03-04 08:54:34 +0000
@@ -24,6 +24,7 @@
 #include "categories.h"
 #include "collectors.h"
 #include "previewstack.h"
+#include "locationservice.h"
 #include "utils.h"
 #include "scopes.h"
 #include "settingsmodel.h"
@@ -32,8 +33,8 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QDebug>
+#include <QGSettings>
 #include <QtGui/QDesktopServices>
-#include <QQmlEngine>
 #include <QEvent>
 #include <QMutex>
 #include <QMutexLocker>
@@ -45,6 +46,8 @@
 #include <QLocale>
 #include <QtConcurrent>
 
+#include <QQmlEngine>
+
 #include <libintl.h>
 
 #include <online-accounts-client/Setup>
@@ -71,8 +74,13 @@
 const int RESULTS_TTL_MEDIUM = 300000; // 5 minutes
 const int RESULTS_TTL_LARGE = 3600000; // 1 hour
 
-Scope::Scope(QObject *parent) : unity::shell::scopes::ScopeInterface(parent)
-    , m_query_id(0)
+Scope::Ptr Scope::newInstance(scopes_ng::Scopes* parent)
+{
+    return Scope::Ptr(new Scope(parent), &QObject::deleteLater);
+}
+
+Scope::Scope(scopes_ng::Scopes* parent) :
+      m_query_id(0)
     , m_formFactor("phone")
     , m_isActive(false)
     , m_searchInProgress(false)
@@ -86,12 +94,13 @@
     , m_activationController(new CollectionController)
     , m_status(Status::Okay)
 {
+    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
     m_categories.reset(new Categories(this));
 
     m_settings = QGSettings::isSchemaInstalled("com.canonical.Unity.Lenses") ? new QGSettings("com.canonical.Unity.Lenses", QByteArray(), this) : nullptr;
     QObject::connect(m_settings, &QGSettings::changed, this, &Scope::internetFlagChanged);
 
-    setScopesInstance(qobject_cast<scopes_ng::Scopes*>(parent));
+    setScopesInstance(parent);
 
     m_typingTimer.setSingleShot(true);
     if (qEnvironmentVariableIsSet("UNITY_SCOPES_TYPING_TIMEOUT_OVERRIDE"))
@@ -263,10 +272,13 @@
         scope = this;
     } else {
         // figure out if this scope is already favourited
-        scope = m_scopesInstance->getScopeById(scopeId);
+        auto tmp = m_scopesInstance->getScopeById(scopeId);
+        if (tmp) {
+           scope = tmp.data();
+        }
     }
 
-    if (scope != nullptr) {
+    if (scope) {
         scope->setCurrentNavigationId(departmentId);
         scope->setFilterState(query.filter_state());
         scope->setSearchQuery(searchString);
@@ -274,25 +286,27 @@
         if (!scope->searchInProgress()) {
             scope->invalidateResults();
         }
-        if (scope != this) Q_EMIT gotoScope(scopeId);
+        if (scope != this) {
+            Q_EMIT gotoScope(scopeId);
+        }
     } else {
         // create temp dash page
         auto meta_sptr = m_scopesInstance->getCachedMetadata(scopeId);
         if (meta_sptr) {
-            scope = new scopes_ng::Scope(m_scopesInstance);
-            scope->setScopeData(*meta_sptr);
-            scope->setScopesInstance(m_scopesInstance);
-            scope->setCurrentNavigationId(departmentId);
-            scope->setFilterState(query.filter_state());
-            scope->setSearchQuery(searchString);
-            m_scopesInstance->addTempScope(scope);
-            Q_EMIT openScope(scope);
+            Scope::Ptr newScope = Scope::newInstance(m_scopesInstance);
+            newScope->setScopeData(*meta_sptr);
+            newScope->setCurrentNavigationId(departmentId);
+            newScope->setFilterState(query.filter_state());
+            newScope->setSearchQuery(searchString);
+            m_scopesInstance->addTempScope(newScope);
+            Q_EMIT openScope(newScope.data());
         } else if (allowDelayedActivation) {
             // request registry refresh to get the missing metadata
             m_delayedActivation = std::make_shared<scopes::ActivationResponse>(query);
             m_scopesInstance->refreshScopeMetadata();
         } else {
-            qWarning("Unable to find scope \"%s\" after metadata refresh", query.scope_id().c_str());
+            qWarning("Unable to find scope \"%s\" after metadata refresh", qPrintable(scopeId));
+            Q_EMIT activationFailed(scopeId);
         }
     }
 }
@@ -429,12 +443,12 @@
     }
 }
 
-unity::shell::scopes::ScopeInterface* Scope::findTempScope(QString const& id) const
+Scope::Ptr Scope::findTempScope(QString const& id) const
 {
     if (m_scopesInstance) {
         return m_scopesInstance->findTempScope(id);
     }
-    return nullptr;
+    return Scope::Ptr();
 }
 
 void Scope::updateNavigationModels(DepartmentNode* rootNode, QMultiMap<QString, Department*>& navigationModels, QString const& activeNavigation)
@@ -1253,13 +1267,18 @@
     /*
      * If it's a scope URI, perform the query, otherwise ask Qt to open it.
      */
+    Q_EMIT gotoUri(uri);
     QUrl url(uri);
-    if (url.scheme() == QLatin1String("scope")) {
-        qDebug() << "Got scope URI" << uri;
+    if (url.scheme() == QLatin1String("scope"))
+    {
         performQuery(uri);
-    } else {
-        qDebug() << "Trying to open" << uri;
-        QDesktopServices::openUrl(url);
+    }
+    else
+    {
+        if (qEnvironmentVariableIsEmpty("UNITY_SCOPES_NO_OPEN_URL"))
+        {
+            QDesktopServices::openUrl(url);
+        }
     }
 }
 

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2015-02-26 18:02:32 +0000
+++ src/Unity/scope.h	2015-03-04 08:54:34 +0000
@@ -29,7 +29,6 @@
 #include <QNetworkConfigurationManager>
 #include <QPointer>
 #include <QMultiMap>
-#include <QGSettings>
 #include <QUuid>
 
 // scopes
@@ -44,12 +43,15 @@
 #include "department.h"
 #include "locationservice.h"
 
+class QGSettings;
+
 namespace scopes_ng
 {
 
 class Categories;
 class PushEvent;
 class PreviewStack;
+class LocationService;
 class SettingsModel;
 class Scopes;
 
@@ -106,7 +108,10 @@
     Q_OBJECT
 
 public:
-    explicit Scope(QObject *parent = 0);
+    typedef QSharedPointer<Scope> Ptr;
+
+    static Scope::Ptr newInstance(scopes_ng::Scopes* parent);
+
     virtual ~Scope();
 
     virtual bool event(QEvent* ev) override;
@@ -163,7 +168,7 @@
     int queryId() const;
     bool initialQueryDone() const;
 
-    unity::shell::scopes::ScopeInterface* findTempScope(QString const& id) const;
+    Scope::Ptr findTempScope(QString const& id) const;
 
     bool loginToAccount(QString const& scope_id, QString const& service_name, QString const& service_type, QString const& provider_name);
 
@@ -174,6 +179,7 @@
 Q_SIGNALS:
     void resultsDirtyChanged();
     void favoriteChanged(bool);
+    void activationFailed(QString const& id);
 
 private Q_SLOTS:
     void typingFinished();
@@ -183,6 +189,8 @@
     void departmentModelDestroyed(QObject* obj);
 
 protected:
+    explicit Scope(scopes_ng::Scopes* parent);
+
     void setSearchInProgress(bool searchInProgress);
     void setStatus(unity::shell::scopes::ScopeInterface::Status status);
     void invalidateLastSearch();
@@ -249,7 +257,7 @@
     QMultiMap<QString, Department*> m_altNavModels;
     QMap<Department*, QString> m_inverseDepartments;
     QMetaObject::Connection m_metadataConnection;
-    LocationService::Ptr m_locationService;
+    QSharedPointer<LocationService> m_locationService;
     QSharedPointer<LocationService::Token> m_locationToken;
     QNetworkConfigurationManager m_network_manager;
 };

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2015-02-12 15:34:38 +0000
+++ src/Unity/scopes.cpp	2015-03-04 08:54:34 +0000
@@ -27,6 +27,7 @@
 
 // Qt
 #include <QDebug>
+#include <QGSettings>
 #include <QTimer>
 #include <QDBusConnection>
 #include <QProcess>
@@ -123,10 +124,14 @@
         QObject::connect(m_dashSettings, &QGSettings::changed, this, &Scopes::dashSettingsChanged);
     }
 
-    m_overviewScope = new OverviewScope(this);
+    m_overviewScope = OverviewScope::newInstance(this);
     m_locationService.reset(new UbuntuLocationService());
 
     createUserAgentString();
+
+    m_scopesToDeleteTimer.setSingleShot(true);
+    m_scopesToDeleteTimer.setInterval(1000 * SCOPE_DELETE_DELAY);
+    connect(&m_scopesToDeleteTimer, SIGNAL(timeout()), SLOT(purgeScopesToDelete()));
 }
 
 Scopes::~Scopes()
@@ -142,6 +147,11 @@
     return m_userAgent;
 }
 
+void Scopes::purgeScopesToDelete()
+{
+    m_scopesToDelete.clear();
+}
+
 int Scopes::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent)
@@ -294,8 +304,8 @@
         // add all visible scopes
         for (auto it = scopes.begin(); it != scopes.end(); ++it) {
             if (!it->second.invisible()) {
-                auto scope = new Scope(this);
-                connect(scope, SIGNAL(isActiveChanged()), this, SLOT(prepopulateNextScopes()));
+                Scope::Ptr scope = Scope::newInstance(this);
+                connect(scope.data(), SIGNAL(isActiveChanged()), this, SLOT(prepopulateNextScopes()));
                 scope->setScopeData(it->second);
                 m_scopes.append(scope);
             }
@@ -360,7 +370,7 @@
 
 void Scopes::prepopulateNextScopes()
 {
-    for (QList<Scope*>::iterator it = m_scopes.begin(); it != m_scopes.end(); it++) {
+    for (auto it = m_scopes.begin(); it != m_scopes.end(); it++) {
         // query next two scopes following currently active scope
         if ((*it)->isActive()) {
             ++it;
@@ -432,10 +442,12 @@
             if (!favScopesLut.contains((*it)->id()))
             {
                 beginRemoveRows(QModelIndex(), row, row);
-                (*it)->setFavorite(false);
-                //
+                Scope::Ptr toDelete = *it;
+                toDelete->setFavorite(false);
                 // we need to delay actual deletion of Scope object so that shell can animate it
-                QTimer::singleShot(1000 * SCOPE_DELETE_DELAY, (*it), SLOT(deleteLater()));
+                m_scopesToDelete.push_back(toDelete);
+                // if the timer is already active, we just wait a bit longer, which is no problem
+                m_scopesToDeleteTimer.start();
                 it = m_scopes.erase(it);
                 endRemoveRows();
             }
@@ -457,8 +469,8 @@
                 auto it = m_cachedMetadata.find(fav);
                 if (it != m_cachedMetadata.end())
                 {
-                    auto scope = new Scope(this);
-                    connect(scope, SIGNAL(isActiveChanged()), this, SLOT(prepopulateNextScopes()));
+                    Scope::Ptr scope = Scope::newInstance(this);
+                    connect(scope.data(), SIGNAL(isActiveChanged()), this, SLOT(prepopulateNextScopes()));
                     scope->setScopeData(*(it.value()));
                     scope->setFavorite(true);
                     beginInsertRows(QModelIndex(), row, row);
@@ -538,13 +550,13 @@
     } else if (scopeName == "scopes") {
         // emitted when smart-scopes proxy or scope registry discovers new scopes
         refreshScopeMetadata();
-        Q_FOREACH(Scope* scope, m_scopes) {
+        Q_FOREACH(Scope::Ptr scope, m_scopes) {
             scope->invalidateResults();
         }
         return;
     }
 
-    Scope* scope = getScopeById(scopeName);
+    auto scope = getScopeById(scopeName);
     if (scope == nullptr) {
         // check temporary scopes
         scope = qobject_cast<Scope*>(findTempScope(scopeName));
@@ -567,11 +579,11 @@
         return QVariant();
     }
 
-    Scope* scope = m_scopes.at(index.row());
+    Scope::Ptr scope = m_scopes.at(index.row());
 
     switch (role) {
         case Scopes::RoleScope:
-            return QVariant::fromValue(scope);
+            return QVariant::fromValue(scope.data());
         case Scopes::RoleId:
             return QString(scope->id());
         case Scopes::RoleTitle:
@@ -583,26 +595,31 @@
 
 unity::shell::scopes::ScopeInterface* Scopes::getScope(int row) const
 {
+    return getScopeByRow(row).data();
+}
+
+Scope::Ptr Scopes::getScopeByRow(int row) const
+{
     if (row >= m_scopes.size() || row < 0) {
-        return nullptr;
+        return Scope::Ptr();
     }
     return m_scopes[row];
 }
 
 unity::shell::scopes::ScopeInterface* Scopes::getScope(const QString& scopeId) const
 {
-    return getScopeById(scopeId);
+    return getScopeById(scopeId).data();
 }
 
-Scope* Scopes::getScopeById(QString const& scopeId) const
+Scope::Ptr Scopes::getScopeById(QString const& scopeId) const
 {
-    Q_FOREACH(Scope* scope, m_scopes) {
+    Q_FOREACH(Scope::Ptr scope, m_scopes) {
         if (scope->id() == scopeId) {
             return scope;
         }
     }
 
-    return nullptr;
+    return Scope::Ptr();
 }
 
 QStringList Scopes::getFavoriteIds() const
@@ -647,26 +664,24 @@
     }
 }
 
-void Scopes::addTempScope(unity::shell::scopes::ScopeInterface* scope)
+void Scopes::addTempScope(Scope::Ptr const& scope)
 {
-    m_tempScopes.insert(scope);
+    m_tempScopes.insert(scope->id(), scope);
 }
 
 void Scopes::closeScope(unity::shell::scopes::ScopeInterface* scope)
 {
-    if (m_tempScopes.remove(scope)) {
-        scope->deleteLater();
-    }
+    m_tempScopes.remove(scope->id());
 }
 
-unity::shell::scopes::ScopeInterface* Scopes::findTempScope(QString const& id) const
+Scope::Ptr Scopes::findTempScope(QString const& id) const
 {
-    for (auto s: m_tempScopes) {
-        if (s->id() == id) {
-            return s;
-        }
+    auto it = m_tempScopes.find(id);
+    if (it != m_tempScopes.end())
+    {
+        return *it;
     }
-    return nullptr;
+    return Scope::Ptr();
 }
 
 void Scopes::moveFavoriteTo(QString const& scopeId, int index)
@@ -733,7 +748,17 @@
 
 unity::shell::scopes::ScopeInterface* Scopes::overviewScope() const
 {
-    return m_loaded ? m_overviewScope : nullptr;
+    return overviewScopeSPtr().data();
+}
+
+Scope::Ptr Scopes::overviewScopeSPtr() const
+{
+    Scope::Ptr result;
+    if (m_loaded)
+    {
+        result = m_overviewScope;
+    }
+    return result;
 }
 
 bool Scopes::loaded() const

=== modified file 'src/Unity/scopes.h'
--- src/Unity/scopes.h	2015-02-05 09:25:18 +0000
+++ src/Unity/scopes.h	2015-03-04 08:54:34 +0000
@@ -21,8 +21,7 @@
 #define NG_SCOPES_H
 
 #include <unity/shell/scopes/ScopesInterface.h>
-
-#include "locationservice.h"
+#include "scope.h"
 
 // Qt
 #include <QList>
@@ -39,9 +38,12 @@
 #include <unity/scopes/ScopeProxyFwd.h>
 #include <unity/scopes/ScopeMetadata.h>
 
+class QGSettings;
+
 namespace scopes_ng
 {
 
+class LocationService;
 class Scope;
 class OverviewScope;
 
@@ -58,7 +60,8 @@
     Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(int row) const override;
     Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(QString const& scopeId) const override;
 
-    Scope* getScopeById(QString const& scopeId) const;
+    Scope::Ptr getScopeByRow(int row) const;
+    Scope::Ptr getScopeById(QString const& scopeId) const;
     unity::scopes::ScopeMetadata::SPtr getCachedMetadata(QString const& scopeId) const;
     QMap<QString, unity::scopes::ScopeMetadata::SPtr> getAllMetadata() const;
     QStringList getFavoriteIds() const;
@@ -70,12 +73,13 @@
     bool loaded() const override;
     int count() const override;
     unity::shell::scopes::ScopeInterface* overviewScope() const override;
+    Scope::Ptr overviewScopeSPtr() const;
 
-    LocationService::Ptr locationService() const;
+    QSharedPointer<LocationService> locationService() const;
     QString userAgentString() const;
 
-    unity::shell::scopes::ScopeInterface* findTempScope(QString const& id) const;
-    void addTempScope(unity::shell::scopes::ScopeInterface* scope);
+    Scope::Ptr findTempScope(QString const& id) const;
+    void addTempScope(Scope::Ptr const& scope);
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
 
 Q_SIGNALS:
@@ -97,6 +101,7 @@
     void dpkgFinished();
     void lsbReleaseFinished();
     void completeDiscoveryFinished();
+    void purgeScopesToDelete();
 
 private:
     void createUserAgentString();
@@ -105,22 +110,24 @@
     static const int SCOPE_DELETE_DELAY;
     class Priv;
 
-    QList<Scope*> m_scopes;
+    QList<QSharedPointer<Scope>> m_scopes;
+    QList<QSharedPointer<Scope>> m_scopesToDelete;
     bool m_noFavorites;
     QStringList m_favoriteScopes;
     QGSettings* m_dashSettings;
     QMap<QString, unity::scopes::ScopeMetadata::SPtr> m_cachedMetadata;
-    OverviewScope* m_overviewScope;
+    QSharedPointer<OverviewScope> m_overviewScope;
     QThread* m_listThread;
     QList<QPair<QString, QString>> m_versions;
     QString m_userAgent;
     bool m_loaded;
 
-    LocationService::Ptr m_locationService;
+    QSharedPointer<LocationService> m_locationService;
     QTimer m_startupQueryTimeout;
+    QTimer m_scopesToDeleteTimer;
 
     unity::scopes::Runtime::SPtr m_scopesRuntime;
-    QSet<unity::shell::scopes::ScopeInterface*> m_tempScopes;
+    QMap<QString, Scope::Ptr> m_tempScopes;
 
     std::unique_ptr<Priv> m_priv;
 };

=== modified file 'src/Unity/utils.cpp'
--- src/Unity/utils.cpp	2014-09-04 09:26:58 +0000
+++ src/Unity/utils.cpp	2015-03-04 08:54:34 +0000
@@ -51,7 +51,7 @@
         case scopes::Variant::Type::Array: {
             scopes::VariantArray arr(variant.get_array());
             QVariantList result_list;
-            for (unsigned i = 0; i < arr.size(); i++) {
+            for (size_t i = 0; i < arr.size(); i++) {
                 result_list.append(scopeVariantToQVariant(arr[i]));
             }
             return result_list;

=== added directory 'src/scope-harness'
=== added file 'src/scope-harness/CMakeLists.txt'
--- src/scope-harness/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/scope-harness/CMakeLists.txt	2015-03-04 08:54:34 +0000
@@ -0,0 +1,95 @@
+
+set(API_VERSION 1)
+set(ABI_VERSION 1)
+
+_pkgconfig_invoke(libunity-scopes SCOPESLIB SCOPERUNNER_BIN "" --variable=scoperunner_bin )
+_pkgconfig_invoke(libunity-scopes SCOPESLIB SCOPEREGISTRY_BIN "" --variable=scoperegistry_bin )
+_pkgconfig_invoke(libunity-scopes SCOPESLIB SCOPESDIR "" --variable=scopesdir )
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/src
+    ${SCOPESLIB_INCLUDE_DIRS}
+    ${GSETTINGSQT_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+)
+    
+add_definitions(
+    -DSCOPESLIB_SCOPERUNNER_BIN="${SCOPESLIB_SCOPERUNNER_BIN}"
+    -DSCOPESLIB_SCOPEREGISTRY_BIN="${SCOPESLIB_SCOPEREGISTRY_BIN}"
+    -DSCOPESLIB_SCOPESDIR="${SCOPESLIB_SCOPESDIR}"
+    -DDEB_HOST_MULTIARCH="${CMAKE_LIBRARY_ARCHITECTURE}"
+)
+
+# Scope harness library
+
+add_library(
+    scope-harness SHARED
+    $<TARGET_OBJECTS:Unity-qml-object>
+    internal/signal-handler.cpp
+    internal/test-utils.cpp
+    matcher/category-matcher.cpp
+    matcher/category-list-matcher.cpp
+    matcher/child-department-matcher.cpp
+    matcher/department-matcher.cpp
+    matcher/match-result.cpp
+    matcher/preview-matcher.cpp
+    matcher/preview-column-matcher.cpp
+    matcher/preview-widget-matcher.cpp
+    matcher/result-matcher.cpp
+    matcher/scope-uri.cpp
+    preview/preview-widget.cpp
+    preview/preview-widget-list.cpp
+    registry/custom-registry.cpp
+    registry/pre-existing-registry.cpp
+    registry/system-registry.cpp
+    results/category.cpp
+    results/child-department.cpp
+    results/department.cpp
+    results/result.cpp
+    view/preview-view.cpp
+    view/results-view.cpp
+    scope-harness.cpp
+)
+
+target_link_libraries(
+    scope-harness
+    ${SCOPES_SHELL_DEPENDENCIES}
+    ${Boost_LIBRARIES}
+)
+
+qt5_use_modules(
+    scope-harness
+    Test
+    ${SCOPES_SHELL_QT_DEPENDENCIES}
+)
+
+set_target_properties(
+    scope-harness
+    PROPERTIES
+    VERSION ${API_VERSION}.0.0
+    SOVERSION ${ABI_VERSION}
+)
+
+install(
+    TARGETS scope-harness
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+install(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DESTINATION "include"
+    FILES_MATCHING PATTERN "*.h"
+    PATTERN "internal" EXCLUDE
+)
+
+# Custom registry executable
+
+add_executable(
+    custom-registry
+    registry/custom-registry-main.cpp
+)
+
+target_link_libraries(
+    custom-registry
+    scope-harness
+)

=== added directory 'src/scope-harness/internal'
=== added file 'src/scope-harness/internal/category-arguments.h'
--- src/scope-harness/internal/category-arguments.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/category-arguments.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtGlobal>
+#include <QAbstractItemModel>
+
+#include <vector>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+    class CategoriesInterface;
+}
+}
+namespace scopeharness
+{
+namespace results
+{
+class Result;
+}
+namespace internal
+{
+struct CategoryArguments
+{
+    unity::shell::scopes::CategoriesInterface* categoriesModel;
+
+    QModelIndex index;
+
+    std::vector<results::Result> results;
+};
+}
+}
+}

=== added file 'src/scope-harness/internal/child-department-arguments.h'
--- src/scope-harness/internal/child-department-arguments.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/child-department-arguments.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QSharedPointer>
+#include <QAbstractItemModel>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+    class NavigationInterface;
+}
+}
+namespace scopeharness
+{
+namespace internal
+{
+struct ChildDepartmentArguments
+{
+    QSharedPointer<unity::shell::scopes::NavigationInterface> navigationModel;
+
+    QModelIndex index;
+};
+}
+}
+}

=== added file 'src/scope-harness/internal/department-arguments.h'
--- src/scope-harness/internal/department-arguments.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/department-arguments.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QSharedPointer>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+    class NavigationInterface;
+}
+}
+namespace scopeharness
+{
+namespace internal
+{
+struct DepartmentArguments
+{
+    QSharedPointer<unity::shell::scopes::NavigationInterface> navigationModel;
+};
+}
+}
+}

=== added file 'src/scope-harness/internal/preview-widget-arguments.h'
--- src/scope-harness/internal/preview-widget-arguments.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/preview-widget-arguments.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtGlobal>
+#include <QAbstractItemModel>
+
+#include <memory>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+    class PreviewWidgetModelInterface;
+    class PreviewModelInterface;
+}
+}
+namespace scopeharness
+{
+namespace view
+{
+class PreviewView;
+class ResultsView;
+}
+namespace internal
+{
+struct PreviewWidgetArguments
+{
+    unity::shell::scopes::PreviewWidgetModelInterface* previewWidgetModel;
+
+    QModelIndex index;
+
+    unity::shell::scopes::PreviewModelInterface* previewModel;
+
+    std::shared_ptr<view::ResultsView> resultsView;
+
+    std::shared_ptr<view::PreviewView> previewView;
+};
+}
+}
+}

=== added file 'src/scope-harness/internal/preview-widget-list-arguments.h'
--- src/scope-harness/internal/preview-widget-list-arguments.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/preview-widget-list-arguments.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtGlobal>
+#include <QAbstractItemModel>
+
+#include <scope-harness/preview/preview-widget.h>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace internal
+{
+struct PreviewWidgetListArguments
+{
+    std::vector<preview::PreviewWidget> previewWidgets;
+};
+}
+}
+}

=== added file 'src/scope-harness/internal/result-arguments.h'
--- src/scope-harness/internal/result-arguments.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/result-arguments.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtGlobal>
+#include <QAbstractItemModel>
+#include <QSharedPointer>
+
+#include <memory>
+
+namespace unity
+{
+namespace shell
+{
+namespace scopes
+{
+    class ResultsModelInterface;
+    class ScopeInterface;
+}
+}
+namespace scopeharness
+{
+namespace view
+{
+class PreviewView;
+class ResultsView;
+}
+namespace internal
+{
+struct ResultArguments
+{
+    QSharedPointer<unity::shell::scopes::ResultsModelInterface> resultsModel;
+
+    QSharedPointer<unity::shell::scopes::ScopeInterface> scope;
+
+    QModelIndex index;
+
+    std::shared_ptr<view::ResultsView> resultsView;
+
+    std::shared_ptr<view::PreviewView> previewView;
+};
+}
+}
+}

=== added file 'src/scope-harness/internal/results-view-arguments.h'
--- src/scope-harness/internal/results-view-arguments.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/results-view-arguments.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtGlobal>
+
+#include <memory>
+
+namespace scopes_ng
+{
+class Scopes;
+}
+namespace unity
+{
+namespace scopeharness
+{
+namespace internal
+{
+struct ResultsViewArguments
+{
+    std::shared_ptr<scopes_ng::Scopes> scopes;
+};
+}
+}
+}

=== added file 'src/scope-harness/internal/signal-handler.cpp'
--- src/scope-harness/internal/signal-handler.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/signal-handler.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/internal/signal-handler.h>
+
+#include <QCoreApplication>
+#include <QDebug>
+
+#include <csignal>
+#include <sys/socket.h>
+#include <unistd.h>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace internal
+{
+int SignalHandler::sigintFd[2];
+
+int SignalHandler::sigtermFd[2];
+
+SignalHandler::SignalHandler(QObject *parent) :
+		QObject(parent) {
+
+	if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigintFd)) {
+		qFatal("Couldn't create INT socketpair");
+	}
+	if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd)) {
+		qFatal("Couldn't create TERM socketpair");
+	}
+
+	m_socketNotifierInt = new QSocketNotifier(sigintFd[1], QSocketNotifier::Read, this);
+	connect(m_socketNotifierInt, &QSocketNotifier::activated, this, &SignalHandler::handleSigInt);
+	m_socketNotifierTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this);
+	connect(m_socketNotifierTerm, &QSocketNotifier::activated, this, &SignalHandler::handleSigTerm);
+}
+
+void SignalHandler::intSignalHandler(int) {
+	char a = 1;
+	::write(sigintFd[0], &a, sizeof(a));
+}
+
+void SignalHandler::termSignalHandler(int) {
+	char a = 1;
+	::write(sigtermFd[0], &a, sizeof(a));
+}
+
+int SignalHandler::setupUnixSignalHandlers() {
+	struct sigaction sigint, sigterm;
+
+	sigint.sa_handler = SignalHandler::intSignalHandler;
+	sigemptyset(&sigint.sa_mask);
+	sigint.sa_flags = 0;
+	sigint.sa_flags |= SA_RESTART;
+
+	if (sigaction(SIGINT, &sigint, 0) > 0)
+		return 1;
+
+	sigterm.sa_handler = SignalHandler::termSignalHandler;
+	sigemptyset(&sigterm.sa_mask);
+	sigterm.sa_flags |= SA_RESTART;
+
+	if (sigaction(SIGTERM, &sigterm, 0) > 0)
+		return 2;
+
+	return 0;
+}
+
+void SignalHandler::handleSigTerm() {
+	m_socketNotifierTerm->setEnabled(false);
+	char tmp;
+	::read(sigtermFd[1], &tmp, sizeof(tmp));
+
+	QCoreApplication::exit(0);
+
+	m_socketNotifierTerm->setEnabled(true);
+}
+
+void SignalHandler::handleSigInt() {
+	m_socketNotifierInt->setEnabled(false);
+	char tmp;
+	::read(sigintFd[1], &tmp, sizeof(tmp));
+
+	QCoreApplication::exit(0);
+
+	m_socketNotifierInt->setEnabled(true);
+}
+
+}
+}
+}

=== added file 'src/scope-harness/internal/signal-handler.h'
--- src/scope-harness/internal/signal-handler.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/internal/signal-handler.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QSocketNotifier>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace internal
+{
+
+class Q_DECL_EXPORT SignalHandler: public QObject
+{
+Q_OBJECT
+
+public:
+	SignalHandler(QObject *parent = 0);
+
+	~SignalHandler() = default;
+
+	static int setupUnixSignalHandlers();
+
+protected Q_SLOTS:
+	void handleSigInt();
+
+	void handleSigTerm();
+
+protected:
+	static void intSignalHandler(int unused);
+
+	static void termSignalHandler(int unused);
+
+	static int sigintFd[2];
+
+	static int sigtermFd[2];
+
+	QSocketNotifier *m_socketNotifierInt;
+
+	QSocketNotifier *m_socketNotifierTerm;
+};
+
+}
+}
+}

=== renamed file 'tests/test-utils.cpp' => 'src/scope-harness/internal/test-utils.cpp'
--- tests/test-utils.cpp	2014-09-24 09:55:13 +0000
+++ src/scope-harness/internal/test-utils.cpp	2015-03-04 08:54:34 +0000
@@ -1,20 +1,19 @@
 /*
- * Copyright (C) 2013-2014 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
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
  *
- * Authors:
- *  Michal Hruby <[e-mail]>
+ * Author: Pete Woods <[e-mail]>
  */
 
 #include "test-utils.h"
@@ -23,48 +22,71 @@
 #include <QTest>
 #include <QFile>
 #include <QFileInfo>
+#include <QGSettings>
 #include <QDir>
 #include <QProcess>
 #include <QThread>
 #include <QScopedPointer>
 #include <QSignalSpy>
 
-#include <scopes.h>
-#include <scope.h>
-#include <categories.h>
-#include <resultsmodel.h>
-#include <previewstack.h>
-
-using namespace scopes_ng;
-
-void scopes_ng::checkedFirstResult(Scope* scope, unity::scopes::Result::SPtr& result, bool& success)
+#include <Unity/scopes.h>
+#include <Unity/scope.h>
+#include <Unity/categories.h>
+#include <Unity/resultsmodel.h>
+#include <Unity/previewstack.h>
+
+namespace sc = unity::scopes;
+namespace ng = scopes_ng;
+namespace ss = unity::shell::scopes;
+
+namespace unity {
+namespace scopeharness {
+namespace internal {
+
+void throwIf(bool condition, const std::string& message)
+{
+    if (condition)
+    {
+        throw std::domain_error(message);
+    }
+}
+
+void throwIfNot(bool condition, const std::string& message)
+{
+    if (!condition)
+    {
+        throw std::domain_error(message);
+    }
+}
+
+void checkedFirstResult(unity::shell::scopes::CategoriesInterface* categories, sc::Result::SPtr& result, bool& success)
 {
     // ensure categories have > 0 rows
-    auto categories = scope->categories();
     QVERIFY(categories->rowCount() > 0);
-    QVariant results_var = categories->data(categories->index(0), Categories::Roles::RoleResults);
-    QVERIFY(results_var.canConvert<ResultsModel*>());
+    QVariant results_var = categories->data(categories->index(0), ng::Categories::Roles::RoleResults);
+    QVERIFY(results_var.canConvert<ng::ResultsModel*>());
 
     // ensure results have some data
-    auto results = results_var.value<ResultsModel*>();
+    auto results = results_var.value<ng::ResultsModel*>();
+    QVERIFY(results);
     QVERIFY(results->rowCount() > 0);
-    auto result_var = results->data(results->index(0), ResultsModel::RoleResult);
+    auto result_var = results->data(results->index(0), ng::ResultsModel::RoleResult);
     QCOMPARE(result_var.isNull(), false);
-    result = result_var.value<std::shared_ptr<unity::scopes::Result>>();
+    result = result_var.value<std::shared_ptr<sc::Result>>();
     success = true;
 }
 
-bool scopes_ng::getFirstResult(Scope* scope, unity::scopes::Result::SPtr& result)
+bool getFirstResult(unity::shell::scopes::CategoriesInterface* categories, sc::Result::SPtr& result)
 {
     bool success = false;
-    checkedFirstResult(scope, result, success);
+    checkedFirstResult(categories, result, success);
     return success;
 }
 
-void scopes_ng::refreshSearch(Scope* scope)
+void refreshSearch(ng::Scope::Ptr scope)
 {
     QCOMPARE(scope->searchInProgress(), false);
-    QSignalSpy spy(scope, SIGNAL(searchInProgressChanged()));
+    QSignalSpy spy(scope.data(), SIGNAL(searchInProgressChanged()));
     // refresh the search
     scope->refresh();
     QVERIFY(scope->searchInProgress() || spy.count() > 1);
@@ -75,10 +97,10 @@
     QCOMPARE(scope->searchInProgress(), false);
 }
 
-void scopes_ng::performSearch(Scope* scope, QString const& searchString)
+void performSearch(QSharedPointer<ss::ScopeInterface> scope, QString const& searchString)
 {
     QCOMPARE(scope->searchInProgress(), false);
-    QSignalSpy spy(scope, SIGNAL(searchInProgressChanged()));
+    QSignalSpy spy(scope.data(), SIGNAL(searchInProgressChanged()));
     // perform a search
     scope->setSearchQuery(searchString);
     // search should not be happening yet
@@ -91,11 +113,11 @@
     QCOMPARE(scope->searchInProgress(), false);
 }
 
-void scopes_ng::waitForResultsChange(Scope* scope)
+void waitForResultsChange(QSharedPointer<ss::ScopeInterface> scope)
 {
     QCOMPARE(scope->searchInProgress(), false);
     // wait for the search to finish
-    QSignalSpy spy(scope, SIGNAL(searchInProgressChanged()));
+    QSignalSpy spy(scope.data(), SIGNAL(searchInProgressChanged()));
     QVERIFY(spy.wait());
     if(spy.size() == 1) {
         QVERIFY(spy.wait());
@@ -103,26 +125,38 @@
     QCOMPARE(scope->searchInProgress(), false);
 }
 
-bool scopes_ng::previewForFirstResult(Scope* scope, QString const& searchString, QScopedPointer<PreviewStack>& preview_stack)
+void waitForSearchFinish(QSharedPointer<ss::ScopeInterface> scope)
+{
+    QCOMPARE(scope->searchInProgress(), true);
+    QSignalSpy spy(scope.data(), SIGNAL(searchInProgressChanged()));
+    QVERIFY(spy.wait());
+    if (scope->searchInProgress()) {
+        // wait for the search to finish
+        QVERIFY(spy.wait());
+    }
+    QCOMPARE(scope->searchInProgress(), false);
+}
+
+bool previewForFirstResult(ng::Scope::Ptr scope, QString const& searchString, QScopedPointer<ng::PreviewStack>& preview_stack)
 {
     performSearch(scope, searchString);
 
     unity::scopes::Result::SPtr result;
-    if (!getFirstResult(scope, result))
+    if (!getFirstResult(scope->categories(), result))
         return false;
-    preview_stack.reset(static_cast<PreviewStack*>(scope->preview(QVariant::fromValue(result))));
+    preview_stack.reset(static_cast<ng::PreviewStack*>(scope->preview(QVariant::fromValue(result))));
 
     return true;
 }
 
-void scopes_ng::setFavouriteScopes(const QStringList& cannedQueries)
+void setFavouriteScopes(const QStringList& cannedQueries)
 {
     setenv("GSETTINGS_BACKEND", "memory", 1);
     QGSettings settings("com.canonical.Unity.Dash", QByteArray(), nullptr);
     settings.set("favoriteScopes", QVariant(cannedQueries));
 }
 
-QStringList scopes_ng::getFavoriteScopes()
+QStringList getFavoriteScopes()
 {
     setenv("GSETTINGS_BACKEND", "memory", 1);
     QGSettings settings("com.canonical.Unity.Dash", QByteArray(), nullptr);
@@ -132,3 +166,7 @@
     }
     return favs;
 }
+
+}
+}
+}

=== renamed file 'tests/test-utils.h' => 'src/scope-harness/internal/test-utils.h'
--- tests/test-utils.h	2014-09-24 09:55:13 +0000
+++ src/scope-harness/internal/test-utils.h	2015-03-04 08:54:34 +0000
@@ -1,52 +1,60 @@
 /*
- * Copyright (C) 2013-2014 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
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
  *
- * Authors:
- *  Michal Hruby <[e-mail]>
+ * Author: Pete Woods <[e-mail]>
  */
 
-#ifndef TEST_UTILS_H
-#define TEST_UTILS_H
+#pragma once
 
-#include <scope.h>
+#include <Unity/scope.h>
 
 #include <unity/scopes/Result.h>
 
 #include <QScopedPointer>
 #include <QStringList>
 
-namespace scopes_ng
-{
-
-Q_DECL_EXPORT
-void checkedFirstResult(Scope* scope, unity::scopes::Result::SPtr& result, bool& success);
-
-Q_DECL_EXPORT
-bool getFirstResult(Scope* scope, unity::scopes::Result::SPtr& result);
-
-Q_DECL_EXPORT
-void refreshSearch(scopes_ng::Scope*);
-
-Q_DECL_EXPORT
-void performSearch(Scope* scope, QString const& searchString);
-
-Q_DECL_EXPORT
-void waitForResultsChange(Scope* scope);
-
-Q_DECL_EXPORT
-bool previewForFirstResult(Scope* scope, QString const& searchString, QScopedPointer<PreviewStack>& preview_stack);
+namespace unity {
+namespace scopeharness {
+namespace internal {
+
+Q_DECL_EXPORT
+void throwIf(bool condition, const std::string& message);
+
+Q_DECL_EXPORT
+void throwIfNot(bool condition, const std::string& message);
+
+Q_DECL_EXPORT
+void checkedFirstResult(unity::shell::scopes::CategoriesInterface* categories, unity::scopes::Result::SPtr& result, bool& success);
+
+Q_DECL_EXPORT
+bool getFirstResult(unity::shell::scopes::CategoriesInterface* categories, unity::scopes::Result::SPtr& result);
+
+Q_DECL_EXPORT
+void refreshSearch(scopes_ng::Scope::Ptr);
+
+Q_DECL_EXPORT
+void performSearch(QSharedPointer<shell::scopes::ScopeInterface> scope, QString const& searchString);
+
+Q_DECL_EXPORT
+void waitForResultsChange(QSharedPointer<shell::scopes::ScopeInterface> scope);
+
+Q_DECL_EXPORT
+void waitForSearchFinish(QSharedPointer<shell::scopes::ScopeInterface> scope);
+
+Q_DECL_EXPORT
+bool previewForFirstResult(scopes_ng::Scope::Ptr scope, QString const& searchString, QScopedPointer<scopes_ng::PreviewStack>& preview_stack);
 
 Q_DECL_EXPORT
 void setFavouriteScopes(const QStringList& cannedQueries);
@@ -55,5 +63,5 @@
 QStringList getFavoriteScopes();
 
 }
-
-#endif //TEST_UTILS_H
+}
+}

=== added directory 'src/scope-harness/matcher'
=== added file 'src/scope-harness/matcher/category-list-matcher.cpp'
--- src/scope-harness/matcher/category-list-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/category-list-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/category-matcher.h>
+#include <scope-harness/matcher/category-list-matcher.h>
+
+#include <boost/optional.hpp>
+
+#include <vector>
+#include <unordered_map>
+
+using namespace std;
+using namespace boost;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+struct CategoryListMatcher::Priv
+{
+    Mode m_mode = Mode::all;
+
+    vector<CategoryMatcher> m_categories;
+
+    optional<size_t> m_hasAtLeast;
+
+    optional<size_t> m_hasExactly;
+
+    void all(MatchResult& matchResult, const results::Category::List& categoryList)
+    {
+        if (categoryList.size() != m_categories.size())
+        {
+            matchResult.failure(
+                    "Category list contained " + to_string(categoryList.size())
+                            + " expected " + to_string(m_categories.size()));
+            return;
+        }
+
+        for (size_t row = 0; row < m_categories.size(); ++row)
+        {
+            const auto& expectedCategory = m_categories[row];
+            const auto& actualCategory = categoryList[row];
+            expectedCategory.match(matchResult, actualCategory);
+        }
+    }
+
+    void byId(MatchResult& matchResult, const results::Category::List& categoryList)
+    {
+        unordered_map<string, results::Category> categoriesById;
+        for (const auto& category : categoryList)
+        {
+            categoriesById.insert({category.id(), category});
+        }
+
+        for (const auto& expectedCategory : m_categories)
+        {
+            auto it = categoriesById.find(expectedCategory.getId());
+            if (it == categoriesById.end())
+            {
+                matchResult.failure(
+                        "Category with ID " + expectedCategory.getId()
+                                + " could not be found");
+            }
+            else
+            {
+                expectedCategory.match(matchResult, it->second);
+            }
+        }
+    }
+
+    void startsWith(MatchResult& matchResult, const results::Category::List& categoryList)
+    {
+        if (categoryList.size() < m_categories.size())
+        {
+            matchResult.failure(
+                    "Category list contained " + to_string(categoryList.size())
+                            + " expected at least " + to_string(m_categories.size()));
+            return;
+        }
+
+        for (size_t row = 0; row < m_categories.size(); ++row)
+        {
+            const auto& expectedCategory = m_categories[row];
+            const auto& actualCategory = categoryList[row];
+            expectedCategory.match(matchResult, actualCategory);
+        }
+    }
+};
+
+CategoryListMatcher::CategoryListMatcher() :
+        p(new Priv)
+{
+}
+
+CategoryListMatcher& CategoryListMatcher::mode(CategoryListMatcher::Mode mode)
+{
+    p->m_mode = mode;
+    return *this;
+}
+
+CategoryListMatcher& CategoryListMatcher::category(CategoryMatcher&& categoryMatcher)
+{
+    p->m_categories.emplace_back(move(categoryMatcher));
+    return *this;
+}
+
+CategoryListMatcher& CategoryListMatcher::category(const CategoryMatcher& categoryMatcher)
+{
+    p->m_categories.emplace_back(categoryMatcher);
+    return *this;
+}
+
+CategoryListMatcher& CategoryListMatcher::hasAtLeast(size_t minimum)
+{
+    p->m_hasAtLeast = minimum;
+    return *this;
+}
+
+CategoryListMatcher& CategoryListMatcher::hasExactly(size_t amount)
+{
+    p->m_hasExactly = amount;
+    return *this;
+}
+
+MatchResult CategoryListMatcher::match(const results::Category::List& categoryList) const
+{
+    MatchResult matchResult;
+
+    if (p->m_hasAtLeast && categoryList.size() < p->m_hasAtLeast.get())
+    {
+        matchResult.failure(
+                "Expected at least " + to_string(p->m_hasAtLeast.get())
+                        + " categories");
+    }
+
+    if (p->m_hasExactly && categoryList.size() != p->m_hasExactly.get())
+    {
+        matchResult.failure(
+                "Expected exactly " + to_string(p->m_hasExactly.get())
+                        + " categories");
+    }
+
+    if (!p->m_categories.empty())
+    {
+        switch (p->m_mode)
+        {
+            case Mode::all:
+                p->all(matchResult, categoryList);
+                break;
+            case Mode::by_id:
+                p->byId(matchResult, categoryList);
+                break;
+            case Mode::starts_with:
+                p->startsWith(matchResult, categoryList);
+                break;
+        }
+    }
+
+    return matchResult;
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/category-list-matcher.h'
--- src/scope-harness/matcher/category-list-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/category-list-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/results/category.h>
+
+#include <memory>
+#include <string>
+
+#include <QtGlobal>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+class CategoryMatcher;
+class ResultsView;
+
+class Q_DECL_EXPORT CategoryListMatcher final
+{
+public:
+    enum class Mode
+    {
+        all, by_id, starts_with
+    };
+
+    CategoryListMatcher();
+
+    ~CategoryListMatcher() = default;
+
+    CategoryListMatcher& mode(Mode mode);
+
+    CategoryListMatcher& category(const CategoryMatcher& categoryMatcher);
+
+    CategoryListMatcher& category(CategoryMatcher&& categoryMatcher);
+
+    CategoryListMatcher& hasAtLeast(std::size_t minimum);
+
+    CategoryListMatcher& hasExactly(std::size_t amount);
+
+    MatchResult match(const results::Category::List& resultList) const;
+
+protected:
+    CategoryListMatcher(const CategoryListMatcher& other) = delete;
+
+    CategoryListMatcher(CategoryListMatcher&& other) = delete;
+
+    CategoryListMatcher& operator=(const CategoryListMatcher& other) = delete;
+
+    CategoryListMatcher& operator=(CategoryListMatcher&& other) = delete;
+
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/category-matcher.cpp'
--- src/scope-harness/matcher/category-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/category-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,334 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/internal/test-utils.h>
+#include <scope-harness/matcher/category-matcher.h>
+#include <scope-harness/matcher/result-matcher.h>
+#include <scope-harness/results/category.h>
+#include <scope-harness/results/result.h>
+
+#include <boost/optional.hpp>
+#include <boost/regex.hpp>
+
+#include <unordered_map>
+
+using namespace std;
+using namespace boost;
+
+namespace sc = unity::scopes;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+namespace
+{
+static void check_variant(MatchResult& matchResult, const results::Category& category,
+    const string& name, const sc::Variant& actualValue, const sc::Variant& expectedValue)
+{
+    if (!(actualValue == expectedValue))
+    {
+        auto actualValueString = actualValue.serialize_json();
+        auto expectedValueString = expectedValue.serialize_json();
+        // serialize_json includes a trailing carriage return
+        actualValueString.pop_back();
+        expectedValueString.pop_back();
+
+        matchResult.failure(
+                "Category with ID '" + category.id() + "' has '" + name
+                        + "' == '" + actualValueString + "' but expected '"
+                        + expectedValueString + "'");
+    }
+}
+
+static void check_string(MatchResult& matchResult, const results::Category& category,
+             const string& name, const string& actualValue,
+             const string& expectedValue)
+{
+    try
+    {
+        if (actualValue != expectedValue)
+        {
+            matchResult.failure(
+                    "Category with ID '" + category.id() + "' has '" + name
+                            + "' == '" + actualValue + "' but expected '"
+                            + expectedValue + "'");
+        }
+    }
+    catch (std::exception& e)
+    {
+        matchResult.failure(
+                "Category with ID '" + category.id()
+                        + "' does not contain expected property '" + name
+                        + "'");
+    }
+}
+}
+
+struct CategoryMatcher::Priv
+{
+    void all(MatchResult& matchResult, const results::Result::List& resultList)
+    {
+        if (resultList.size() != m_results.size())
+        {
+            matchResult.failure(
+                    "Result list contained " + to_string(resultList.size())
+                            + " expected " + to_string(m_results.size()));
+            return;
+        }
+
+        for (size_t row = 0; row < m_results.size(); ++row)
+        {
+            const auto& expectedResult = m_results[row];
+            const auto& actualResult = resultList[row];
+            expectedResult.match(matchResult, actualResult);
+        }
+    }
+
+    void startsWith(MatchResult& matchResult, const results::Result::List&resultList)
+    {
+        if (resultList.size() < m_results.size())
+        {
+            matchResult.failure(
+                    "Result list contained " + to_string(resultList.size())
+                            + " expected at least " + to_string(m_results.size()));
+            return;
+        }
+
+        for (size_t row = 0; row < m_results.size(); ++row)
+        {
+            const auto& expectedResult = m_results[row];
+            const auto& actualResult = resultList[row];
+            expectedResult.match(matchResult, actualResult);
+        }
+    }
+
+    void byUri(MatchResult& matchResult, const results::Result::List& resultList)
+    {
+        for (const auto& expectedResult : m_results)
+        {
+            string expectedUri = expectedResult.getUri();
+            internal::throwIf(expectedUri.empty(), "Cannot match by_uri with empty expected URI");
+
+            regex e(expectedUri);
+            bool matched = false;
+            for (const auto& result : resultList)
+            {
+                if (regex_match(result.uri(), e)) {
+                    matched = true;
+                    expectedResult.match(matchResult, result);
+                    break;
+                }
+            }
+
+            if (!matched)
+            {
+                matchResult.failure(
+                        "Result with URI " + expectedResult.getUri()
+                                + " could not be found");
+            }
+        }
+    }
+
+    string m_id;
+
+    Mode m_mode = Mode::all;
+
+    vector<ResultMatcher> m_results;
+
+    optional<size_t> m_hasAtLeast;
+
+    optional<string> m_title;
+
+    optional<string> m_icon;
+
+    optional<string> m_headerLink;
+
+    optional<sc::Variant> m_renderer;
+
+    optional<sc::Variant> m_components;
+};
+
+CategoryMatcher::CategoryMatcher(const string& id) :
+        p(new Priv)
+{
+    p->m_id = id;
+}
+
+CategoryMatcher::CategoryMatcher(const CategoryMatcher& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+CategoryMatcher::CategoryMatcher(CategoryMatcher&& other)
+{
+    *this = move(other);
+}
+
+CategoryMatcher& CategoryMatcher::operator=(const CategoryMatcher& other)
+{
+    p->m_id = other.p->m_id;
+    p->m_mode = other.p->m_mode;
+    p->m_results = other.p->m_results;
+    p->m_hasAtLeast = other.p->m_hasAtLeast;
+    p->m_title = other.p->m_title;
+    p->m_icon = other.p->m_icon;
+    p->m_headerLink = other.p->m_headerLink;
+    p->m_renderer = other.p->m_renderer;
+    p->m_components = other.p->m_components;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::operator=(CategoryMatcher&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::mode(Mode mode)
+{
+    p->m_mode = mode;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::title(const string& title)
+{
+    p->m_title = title;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::icon(const string& icon)
+{
+    p->m_icon = icon;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::headerLink(const string& headerLink)
+{
+    p->m_headerLink = headerLink;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::hasAtLeast(size_t minimum)
+{
+    p->m_hasAtLeast = minimum;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::renderer(const sc::Variant& renderer)
+{
+    p->m_renderer = renderer;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::components(const sc::Variant& components)
+{
+    p->m_components = components;
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::result(const ResultMatcher& resultMatcher)
+{
+    p->m_results.emplace_back(resultMatcher);
+    return *this;
+}
+
+CategoryMatcher& CategoryMatcher::result(ResultMatcher&& resultMatcher)
+{
+    p->m_results.emplace_back(move(resultMatcher));
+    return *this;
+}
+
+void CategoryMatcher::match(MatchResult& matchResult, const results::Category& category) const
+{
+    auto results = category.results();
+
+    if (p->m_id != category.id())
+    {
+        matchResult.failure("Category ID " + category.id() + " != " + p->m_id);
+    }
+
+    if (p->m_hasAtLeast && results.size() < p->m_hasAtLeast.get())
+    {
+        matchResult.failure(
+                "Category with ID " + category.id() + " contains only "
+                        + to_string(results.size())
+                        + " results. Expected at least "
+                        + to_string(p->m_hasAtLeast.get()));
+    }
+
+    if (p->m_title)
+    {
+        check_string(matchResult, category, "title", category.title(), p->m_title.get());
+    }
+
+    if (p->m_icon)
+    {
+        check_string(matchResult, category, "icon", category.icon(), p->m_icon.get());
+    }
+
+    if (p->m_headerLink)
+    {
+        check_string(matchResult, category, "header_link", category.headerLink(), p->m_headerLink.get());
+    }
+
+    if (p->m_renderer)
+    {
+        check_variant(matchResult, category, "renderer", category.renderer(), p->m_renderer.get());
+    }
+
+    if (p->m_components)
+    {
+        check_variant(matchResult, category, "components", category.components(), p->m_components.get());
+    }
+
+    if (!p->m_results.empty())
+    {
+        switch (p->m_mode)
+        {
+            case Mode::all:
+                p->all(matchResult, results);
+                break;
+            case Mode::starts_with:
+                p->startsWith(matchResult, results);
+                break;
+            case Mode::by_uri:
+                p->byUri(matchResult, results);
+                break;
+        }
+    }
+}
+
+MatchResult CategoryMatcher::match(const results::Category& category) const
+{
+    MatchResult matchResult;
+    match(matchResult, category);
+    return matchResult;
+}
+
+string& CategoryMatcher::getId() const
+{
+    return p->m_id;
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/category-matcher.h'
--- src/scope-harness/matcher/category-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/category-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/matcher/match-result.h>
+
+#include <QtGlobal>
+
+namespace unity
+{
+namespace scopes
+{
+class Variant;
+}
+namespace scopeharness
+{
+namespace results
+{
+class Category;
+}
+namespace matcher
+{
+class ResultMatcher;
+
+class Q_DECL_EXPORT CategoryMatcher final
+{
+public:
+    enum class Mode
+    {
+        all, starts_with, by_uri
+    };
+
+    CategoryMatcher(const std::string& id);
+
+    CategoryMatcher(const CategoryMatcher& other);
+
+    CategoryMatcher(CategoryMatcher&& other);
+
+    CategoryMatcher& operator=(const CategoryMatcher& other);
+
+    CategoryMatcher& operator=(CategoryMatcher&& other);
+
+    ~CategoryMatcher() = default;
+
+    CategoryMatcher& mode(Mode mode);
+
+    CategoryMatcher& title(const std::string& title);
+
+    CategoryMatcher& icon(const std::string& icon);
+
+    CategoryMatcher& headerLink(const std::string& headerLink);
+
+    CategoryMatcher& hasAtLeast(std::size_t minimum);
+
+    CategoryMatcher& renderer(const unity::scopes::Variant& renderer);
+
+    CategoryMatcher& components(const unity::scopes::Variant& components);
+
+    CategoryMatcher& result(const ResultMatcher& resultMatcher);
+
+    CategoryMatcher& result(ResultMatcher&& resultMatcher);
+
+    std::string& getId() const;
+
+    MatchResult match(const results::Category& category) const;
+
+    void match(MatchResult& matchResult, const results::Category& category) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/child-department-matcher.cpp'
--- src/scope-harness/matcher/child-department-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/child-department-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/child-department-matcher.h>
+#include <scope-harness/results/child-department.h>
+
+#include <boost/optional.hpp>
+
+using namespace std;
+using namespace boost;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+namespace
+{
+static void check_string(MatchResult& matchResult, const results::ChildDepartment& department,
+             const string& name, const string& actualValue,
+             const string& expectedValue)
+{
+    if (actualValue != expectedValue)
+    {
+        matchResult.failure(
+                "Child department with ID '" + department.id() + "' has '" + name
+                        + "' == '" + actualValue + "' but expected '"
+                        + expectedValue + "'");
+    }
+}
+
+static void check_bool(MatchResult& matchResult, const results::ChildDepartment& department,
+             const string& name, bool actualValue,
+             bool expectedValue)
+{
+    if (actualValue != expectedValue)
+    {
+        matchResult.failure(
+                "Child department with ID '" + department.id() + "' has '" + name
+                        + "' == " + (actualValue ? "true" : "false") + " but expected "
+                        + (expectedValue ? "true" : "false"));
+    }
+}
+}
+
+struct ChildDepartmentMatcher::Priv
+{
+    string m_id;
+
+    optional<string> m_label;
+
+    optional<bool> m_hasChildren;
+
+    optional<bool> m_isActive;
+};
+
+ChildDepartmentMatcher::ChildDepartmentMatcher(const string& id) :
+        p(new Priv)
+{
+    p->m_id = id;
+}
+
+ChildDepartmentMatcher::~ChildDepartmentMatcher()
+{
+}
+
+ChildDepartmentMatcher::ChildDepartmentMatcher(const ChildDepartmentMatcher& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+ChildDepartmentMatcher::ChildDepartmentMatcher(ChildDepartmentMatcher&& other)
+{
+    *this = move(other);
+}
+
+ChildDepartmentMatcher& ChildDepartmentMatcher::operator=(const ChildDepartmentMatcher& other)
+{
+    p->m_id = other.p->m_id;
+    p->m_label = other.p->m_label;
+    p->m_hasChildren = other.p->m_hasChildren;
+    p->m_isActive = other.p->m_isActive;
+    return *this;
+}
+
+ChildDepartmentMatcher& ChildDepartmentMatcher::operator=(ChildDepartmentMatcher&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+string ChildDepartmentMatcher::getId() const
+{
+    return p->m_id;
+}
+
+ChildDepartmentMatcher& ChildDepartmentMatcher::label(const std::string& label)
+{
+    p->m_label = label;
+    return *this;
+}
+
+ChildDepartmentMatcher& ChildDepartmentMatcher::hasChildren(bool hasChildren)
+{
+    p->m_hasChildren = hasChildren;
+    return *this;
+}
+
+ChildDepartmentMatcher& ChildDepartmentMatcher::isActive(bool isActive)
+{
+    p->m_isActive = isActive;
+    return *this;
+}
+
+MatchResult ChildDepartmentMatcher::match(const results::ChildDepartment& childDepartment) const
+{
+    MatchResult matchResult;
+    match(matchResult, childDepartment);
+    return matchResult;
+}
+
+void ChildDepartmentMatcher::match(MatchResult& matchResult, const results::ChildDepartment& childDepartment) const
+{
+    check_string(matchResult, childDepartment, "id", childDepartment.id(), p->m_id);
+
+    if (p->m_label)
+    {
+        check_string(matchResult, childDepartment, "label", childDepartment.label(), p->m_label.get());
+    }
+
+    if (p->m_hasChildren)
+    {
+        check_bool(matchResult, childDepartment, "has children", childDepartment.hasChildren(), p->m_hasChildren.get());
+    }
+
+    if (p->m_isActive)
+    {
+        check_bool(matchResult, childDepartment, "is active", childDepartment.isActive(), p->m_isActive.get());
+    }
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/child-department-matcher.h'
--- src/scope-harness/matcher/child-department-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/child-department-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/matcher/match-result.h>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace results
+{
+class ChildDepartment;
+}
+namespace matcher
+{
+
+class Q_DECL_EXPORT ChildDepartmentMatcher final
+{
+public:
+    ChildDepartmentMatcher(const std::string& id);
+
+    ChildDepartmentMatcher(const ChildDepartmentMatcher& other);
+
+    ChildDepartmentMatcher(ChildDepartmentMatcher&& other);
+
+    ~ChildDepartmentMatcher();
+
+    ChildDepartmentMatcher& operator=(const ChildDepartmentMatcher& other);
+
+    ChildDepartmentMatcher& operator=(ChildDepartmentMatcher&& other);
+
+    std::string getId() const;
+
+    ChildDepartmentMatcher& label(const std::string& label);
+
+    ChildDepartmentMatcher& hasChildren(bool hasChildren);
+
+    ChildDepartmentMatcher& isActive(bool isActive);
+
+    MatchResult match(const results::ChildDepartment& childDepartment) const;
+
+    void match(MatchResult& matchResult, const results::ChildDepartment& childDepartment) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/department-matcher.cpp'
--- src/scope-harness/matcher/department-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/department-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,307 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/results/department.h>
+#include <scope-harness/matcher/department-matcher.h>
+
+#include <boost/optional.hpp>
+#include <unordered_map>
+
+using namespace std;
+using namespace boost;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+namespace
+{
+static void check_string(MatchResult& matchResult, const results::Department& department,
+             const string& name, const string& actualValue,
+             const string& expectedValue)
+{
+    if (actualValue != expectedValue)
+    {
+        matchResult.failure(
+                "Department with ID '" + department.id() + "' has '" + name
+                        + "' == '" + actualValue + "' but expected '"
+                        + expectedValue + "'");
+    }
+}
+
+static void check_bool(MatchResult& matchResult, const results::Department& department,
+             const string& name, bool actualValue,
+             bool expectedValue)
+{
+    if (actualValue != expectedValue)
+    {
+        matchResult.failure(
+                "Department with ID '" + department.id() + "' has '" + name
+                        + "' == " + (actualValue ? "true" : "false") + " but expected "
+                        + (expectedValue ? "true" : "false"));
+    }
+}
+}
+
+struct DepartmentMatcher::Priv
+{
+    void all(MatchResult& matchResult, const results::Department& department)
+    {
+        if (department.size() != m_children.size())
+        {
+            matchResult.failure(
+                    "Department contained " + to_string(department.size())
+                            + " children, expected " + to_string(m_children.size()));
+            return;
+        }
+
+        for (size_t row = 0; row < m_children.size(); ++row)
+        {
+            const auto& expectedChild = m_children[row];
+            auto actualChild = department.child(row);
+            expectedChild.match(matchResult, actualChild);
+        }
+    }
+
+    void byId(MatchResult& matchResult, const results::Department& department)
+    {
+        unordered_map<string, results::ChildDepartment> childDepartmentsById;
+        for (size_t row = 0; row < department.size(); ++row)
+        {
+            auto child = department.child(row);
+            childDepartmentsById.insert({child.id(), child});
+        }
+
+        for (const auto& expectedChild : m_children)
+        {
+            auto it = childDepartmentsById.find(expectedChild.getId());
+            if (it == childDepartmentsById.end())
+            {
+                matchResult.failure(
+                        "Child department with ID " + expectedChild.getId()
+                                + " could not be found");
+            }
+            else
+            {
+                expectedChild.match(matchResult, it->second);
+            }
+        }
+    }
+
+    void startsWith(MatchResult& matchResult, const results::Department& department)
+    {
+        if (department.size() < m_children.size())
+        {
+            matchResult.failure(
+                    "Department contained " + to_string(department.size())
+                            + " expected at least " + to_string(m_children.size()));
+            return;
+        }
+
+        for (size_t row = 0; row < m_children.size(); ++row)
+        {
+            const auto& expectedChild = m_children[row];
+            auto actualChild = department.child(row);
+            expectedChild.match(matchResult, actualChild);
+        }
+    }
+
+    optional<string> m_id;
+
+    optional<string> m_label;
+
+    optional<string> m_allLabel;
+
+    optional<string> m_parentId;
+
+    optional<string> m_parentLabel;
+
+    optional<bool> m_isRoot;
+
+    optional<bool> m_isHidden;
+
+    optional<size_t> m_hasExactly;
+
+    optional<size_t> m_hasAtLeast;
+
+    Mode m_mode = Mode::all;
+
+    vector<ChildDepartmentMatcher> m_children;
+};
+
+DepartmentMatcher::DepartmentMatcher() :
+        p(new Priv)
+{
+}
+
+DepartmentMatcher::~DepartmentMatcher()
+{
+}
+
+DepartmentMatcher& DepartmentMatcher::mode(Mode mode)
+{
+    p->m_mode = mode;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::hasExactly(size_t childCount)
+{
+    p->m_hasExactly = childCount;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::hasAtLeast(size_t childCount)
+{
+    p->m_hasAtLeast = childCount;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::id(const string& id)
+{
+    p->m_id = id;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::label(const string& label)
+{
+    p->m_label = label;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::allLabel(const string& allLabel)
+{
+    p->m_allLabel = allLabel;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::parentId(const string& parentId)
+{
+    p->m_parentId = parentId;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::parentLabel(const string& parentLabel)
+{
+    p->m_parentLabel = parentLabel;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::isRoot(bool isRoot)
+{
+    p->m_isRoot = isRoot;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::isHidden(bool isHidden)
+{
+    p->m_isHidden = isHidden;
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::child(const ChildDepartmentMatcher& child)
+{
+    p->m_children.emplace_back(child);
+    return *this;
+}
+
+DepartmentMatcher& DepartmentMatcher::child(ChildDepartmentMatcher&& child)
+{
+    p->m_children.emplace_back(child);
+    return *this;
+}
+
+MatchResult DepartmentMatcher::match(const results::Department& department) const
+{
+    MatchResult matchResult;
+    match(matchResult, department);
+    return matchResult;
+}
+
+void DepartmentMatcher::match(MatchResult& matchResult, const results::Department& department) const
+{
+    if (p->m_id)
+    {
+        check_string(matchResult, department, "id", department.id(), p->m_id.get());
+    }
+
+    if (p->m_label)
+    {
+        check_string(matchResult, department, "label", department.label(), p->m_label.get());
+    }
+
+    if (p->m_allLabel)
+    {
+        check_string(matchResult, department, "all label", department.allLabel(), p->m_allLabel.get());
+    }
+
+    if (p->m_parentId)
+    {
+        check_string(matchResult, department, "parent ID", department.parentId(), p->m_parentId.get());
+    }
+
+    if (p->m_parentLabel)
+    {
+        check_string(matchResult, department, "parent label", department.parentLabel(), p->m_parentLabel.get());
+    }
+
+    if (p->m_isRoot)
+    {
+        check_bool(matchResult, department, "is root", department.isRoot(), p->m_isRoot.get());
+    }
+
+    if (p->m_isHidden)
+    {
+        check_bool(matchResult, department, "is hidden", department.isHidden(), p->m_isHidden.get());
+    }
+
+    if (p->m_hasExactly && department.size() != p->m_hasExactly.get())
+    {
+        matchResult.failure(
+                "Expected exactly " + to_string(p->m_hasExactly.get())
+                        + " child departments");
+    }
+
+    if (p->m_hasAtLeast && department.size() < p->m_hasAtLeast.get())
+    {
+        matchResult.failure(
+                "Expected at least " + to_string(p->m_hasAtLeast.get())
+                        + " child departments");
+    }
+
+    if (!p->m_children.empty())
+    {
+        switch (p->m_mode)
+        {
+            case Mode::all:
+                p->all(matchResult, department);
+                break;
+            case Mode::by_id:
+                p->byId(matchResult, department);
+                break;
+            case Mode::starts_with:
+                p->startsWith(matchResult, department);
+                break;
+        }
+    }
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/department-matcher.h'
--- src/scope-harness/matcher/department-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/department-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/child-department-matcher.h>
+
+#pragma once
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace results
+{
+class Department;
+}
+namespace matcher
+{
+
+class Q_DECL_EXPORT DepartmentMatcher final
+{
+public:
+    enum class Mode
+    {
+        all, by_id, starts_with
+    };
+
+    DepartmentMatcher();
+
+    DepartmentMatcher(const DepartmentMatcher& other) = delete;
+
+    DepartmentMatcher(DepartmentMatcher&& other) = delete;
+
+    ~DepartmentMatcher();
+
+    DepartmentMatcher& operator=(const DepartmentMatcher& other) = delete;
+
+    DepartmentMatcher& operator=(DepartmentMatcher&& other) = delete;
+
+    DepartmentMatcher& mode(Mode mode);
+
+    DepartmentMatcher& hasExactly(std::size_t childCount);
+
+    DepartmentMatcher& hasAtLeast(std::size_t childCount);
+
+    DepartmentMatcher& id(const std::string& id);
+
+    DepartmentMatcher& label(const std::string& label);
+
+    DepartmentMatcher& allLabel(const std::string& allLabel);
+
+    DepartmentMatcher& parentId(const std::string& parentId);
+
+    DepartmentMatcher& parentLabel(const std::string& parentLabel);
+
+    DepartmentMatcher& isRoot(bool isRoot);
+
+    DepartmentMatcher& isHidden(bool isHidden);
+
+    DepartmentMatcher& child(const ChildDepartmentMatcher& child);
+
+    DepartmentMatcher& child(ChildDepartmentMatcher&& child);
+
+    MatchResult match(const results::Department& department) const;
+
+    void match(MatchResult& matchResult, const results::Department& department) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/match-result.cpp'
--- src/scope-harness/matcher/match-result.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/match-result.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/match-result.h>
+
+#include <sstream>
+
+using namespace std;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+struct MatchResult::Priv
+{
+    bool m_success = true;
+
+    vector<string> m_failures;
+};
+
+MatchResult::MatchResult() :
+        p(new Priv)
+{
+}
+
+MatchResult::MatchResult(MatchResult&& other)
+{
+    *this = move(other);
+}
+
+MatchResult::MatchResult(const MatchResult& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+MatchResult& MatchResult::operator=(const MatchResult& other)
+{
+    p->m_success = other.p->m_success;
+    p->m_failures= other.p->m_failures;
+    return *this;
+}
+
+MatchResult& MatchResult::operator=(MatchResult&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+void MatchResult::failure(const string& message)
+{
+    p->m_success = false;
+    p->m_failures.emplace_back(message);
+}
+
+bool MatchResult::success() const
+{
+    return p->m_success;
+}
+
+vector<string>& MatchResult::failures() const
+{
+    return p->m_failures;
+}
+
+string MatchResult::concat_failures() const
+{
+    stringstream ss;
+    ss << "Failed expectations:" << endl;
+    for (const auto& failure : p->m_failures)
+    {
+        ss << failure << endl;
+    }
+    return ss.str();
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/match-result.h'
--- src/scope-harness/matcher/match-result.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/match-result.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtGlobal>
+
+#include <vector>
+#include <memory>
+#include <string>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+class Q_DECL_EXPORT MatchResult final
+{
+public:
+    MatchResult();
+
+    MatchResult(MatchResult&& other);
+
+    MatchResult(const MatchResult& other);
+
+    MatchResult& operator=(const MatchResult& other);
+
+    MatchResult& operator=(MatchResult&& other);
+
+    ~MatchResult() = default;
+
+    void failure(const std::string& message);
+
+    bool success() const;
+
+    std::vector<std::string>& failures() const;
+
+    std::string concat_failures() const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/preview-column-matcher.cpp'
--- src/scope-harness/matcher/preview-column-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/preview-column-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/preview-matcher.h>
+#include <scope-harness/matcher/preview-column-matcher.h>
+
+#include <vector>
+
+using namespace std;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+struct PreviewColumnMatcher::Priv
+{
+    vector<PreviewMatcher> m_matchers;
+};
+
+PreviewColumnMatcher::PreviewColumnMatcher() :
+        p(new Priv)
+{
+}
+
+PreviewColumnMatcher::~PreviewColumnMatcher()
+{
+}
+
+PreviewColumnMatcher::PreviewColumnMatcher(const PreviewColumnMatcher& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+PreviewColumnMatcher::PreviewColumnMatcher(PreviewColumnMatcher&& other)
+{
+    *this = move(other);
+}
+
+PreviewColumnMatcher& PreviewColumnMatcher::operator=(const PreviewColumnMatcher& other)
+{
+    p->m_matchers = other.p->m_matchers;
+    return *this;
+}
+
+PreviewColumnMatcher& PreviewColumnMatcher::operator=(PreviewColumnMatcher&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+PreviewColumnMatcher& PreviewColumnMatcher::column(const PreviewMatcher& previewMatcher)
+{
+    p->m_matchers.emplace_back(previewMatcher);
+    return *this;
+}
+
+PreviewColumnMatcher& PreviewColumnMatcher::column(PreviewMatcher&& previewMatcher)
+{
+    p->m_matchers.emplace_back(previewMatcher);
+    return *this;
+}
+
+MatchResult PreviewColumnMatcher::match(const vector<preview::PreviewWidgetList>& preview) const
+{
+    MatchResult matchResult;
+    match(matchResult, preview);
+    return matchResult;
+}
+
+void PreviewColumnMatcher::match(MatchResult& matchResult, const vector<preview::PreviewWidgetList>& preview) const
+{
+    if (p->m_matchers.size() != preview.size())
+    {
+        matchResult.failure(
+                "Incorrect number of preview columns "
+                        + to_string(preview.size()) + ", expected "
+                        + to_string(p->m_matchers.size()));
+        return;
+    }
+
+    for (size_t i = 0; i < p->m_matchers.size(); ++i)
+    {
+        p->m_matchers.at(i).match(matchResult, preview.at(i));
+    }
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/preview-column-matcher.h'
--- src/scope-harness/matcher/preview-column-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/preview-column-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/matcher/match-result.h>
+#include <scope-harness/preview/preview-widget-list.h>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+class PreviewMatcher;
+
+class Q_DECL_EXPORT PreviewColumnMatcher final
+{
+public:
+    PreviewColumnMatcher();
+
+    PreviewColumnMatcher(const PreviewColumnMatcher& other);
+
+    PreviewColumnMatcher(PreviewColumnMatcher&& other);
+
+    ~PreviewColumnMatcher();
+
+    PreviewColumnMatcher& operator=(const PreviewColumnMatcher& other);
+
+    PreviewColumnMatcher& operator=(PreviewColumnMatcher&& other);
+
+    PreviewColumnMatcher& column(const PreviewMatcher& previewMatcher);
+
+    PreviewColumnMatcher& column(PreviewMatcher&& previewMatcher);
+
+    MatchResult match(const std::vector<preview::PreviewWidgetList>& preview) const;
+
+    void match(MatchResult& matchResult, const std::vector<preview::PreviewWidgetList>& preview) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/preview-matcher.cpp'
--- src/scope-harness/matcher/preview-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/preview-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/preview-matcher.h>
+#include <scope-harness/matcher/preview-widget-matcher.h>
+
+using namespace std;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+struct PreviewMatcher::Priv
+{
+    vector<PreviewWidgetMatcher> m_matchers;
+};
+
+PreviewMatcher::PreviewMatcher() :
+        p(new Priv)
+{
+}
+
+PreviewMatcher::~PreviewMatcher()
+{
+}
+
+PreviewMatcher::PreviewMatcher(const PreviewMatcher& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+PreviewMatcher::PreviewMatcher(PreviewMatcher&& other)
+{
+    *this = move(other);
+}
+
+PreviewMatcher& PreviewMatcher::operator=(const PreviewMatcher& other)
+{
+    p->m_matchers = other.p->m_matchers;
+    return *this;
+}
+
+PreviewMatcher& PreviewMatcher::operator=(PreviewMatcher&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+PreviewMatcher& PreviewMatcher::widget(const PreviewWidgetMatcher& previewWidgetMatcher)
+{
+    p->m_matchers.emplace_back(previewWidgetMatcher);
+    return *this;
+}
+
+PreviewMatcher& PreviewMatcher::widget(PreviewWidgetMatcher&& previewWidgetMatcher)
+{
+    p->m_matchers.emplace_back(previewWidgetMatcher);
+    return *this;
+}
+
+MatchResult PreviewMatcher::match(const preview::PreviewWidgetList& previewWidgetList) const
+{
+    MatchResult matchResult;
+    match(matchResult, previewWidgetList);
+    return matchResult;
+}
+
+void PreviewMatcher::match(MatchResult& matchResult, const preview::PreviewWidgetList& previewWidgetList) const
+{
+    if (p->m_matchers.size() != previewWidgetList.size())
+    {
+        matchResult.failure(
+                "Incorrect number of preview widgets "
+                        + to_string(previewWidgetList.size()) + ", expected "
+                        + to_string(p->m_matchers.size()));
+        return;
+    }
+
+    for (size_t i = 0; i < p->m_matchers.size(); ++i)
+    {
+        p->m_matchers.at(i).match(matchResult, previewWidgetList.at(i));
+    }
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/preview-matcher.h'
--- src/scope-harness/matcher/preview-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/preview-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/matcher/match-result.h>
+#include <scope-harness/preview/preview-widget-list.h>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+class PreviewWidgetMatcher;
+
+class Q_DECL_EXPORT PreviewMatcher final
+{
+public:
+    PreviewMatcher();
+
+    ~PreviewMatcher();
+
+    PreviewMatcher(const PreviewMatcher& other);
+
+    PreviewMatcher(PreviewMatcher&& other);
+
+    PreviewMatcher& operator=(const PreviewMatcher& other);
+
+    PreviewMatcher& operator=(PreviewMatcher&& other);
+
+    PreviewMatcher& widget(const PreviewWidgetMatcher& previewWidgetMatcher);
+
+    PreviewMatcher& widget(PreviewWidgetMatcher&& previewWidgetMatcher);
+
+    MatchResult match(const preview::PreviewWidgetList& previewWidgetList) const;
+
+    void match(MatchResult& matchResult, const preview::PreviewWidgetList& previewWidgetList) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/preview-widget-matcher.cpp'
--- src/scope-harness/matcher/preview-widget-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/preview-widget-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/preview-widget-matcher.h>
+#include <scope-harness/preview/preview-widget.h>
+
+#include <unity/scopes/Variant.h>
+
+#include <boost/optional.hpp>
+
+using namespace std;
+using namespace boost;
+namespace sc = unity::scopes;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+namespace
+{
+
+static void check_string(MatchResult& matchResult, const preview::PreviewWidget& previewWidget,
+             const string& name, const string& actualValue,
+             const string& expectedValue)
+{
+    if (actualValue != expectedValue)
+    {
+        matchResult.failure(
+                "PreviewWidget with ID '" + previewWidget.id() + "' has '" + name
+                        + "' == '" + actualValue + "' but expected '"
+                        + expectedValue + "'");
+    }
+}
+
+static void check_variant(MatchResult& matchResult, const preview::PreviewWidget& previewWidget,
+    const string& name, const sc::Variant& actualValue, const sc::Variant& expectedValue)
+{
+    if (!(actualValue == expectedValue))
+    {
+        auto actualValueString = actualValue.serialize_json();
+        auto expectedValueString = expectedValue.serialize_json();
+        // serialize_json includes a trailing carriage return
+        actualValueString.pop_back();
+        expectedValueString.pop_back();
+
+        matchResult.failure(
+                "PreviewWidget with ID '" + previewWidget.id() + "' has '" + name
+                        + "' == '" + actualValueString + "' but expected '"
+                        + expectedValueString + "'");
+    }
+}
+
+}
+
+struct PreviewWidgetMatcher::Priv
+{
+    string m_id;
+
+    optional<string> m_type;
+
+    optional<sc::Variant> m_data;
+};
+
+PreviewWidgetMatcher::PreviewWidgetMatcher(const string& id) :
+        p(new Priv)
+{
+    p->m_id = id;
+}
+
+PreviewWidgetMatcher::PreviewWidgetMatcher(const PreviewWidgetMatcher& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+PreviewWidgetMatcher::PreviewWidgetMatcher(PreviewWidgetMatcher&& other)
+{
+    *this = move(other);
+}
+
+PreviewWidgetMatcher& PreviewWidgetMatcher::operator=(const PreviewWidgetMatcher& other)
+{
+    p->m_id = other.p->m_id;
+    p->m_type = other.p->m_type;
+    p->m_data = other.p->m_data;
+    return *this;
+}
+
+PreviewWidgetMatcher& PreviewWidgetMatcher::operator=(PreviewWidgetMatcher&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+PreviewWidgetMatcher::~PreviewWidgetMatcher()
+{
+}
+
+PreviewWidgetMatcher& PreviewWidgetMatcher::type(const string& type)
+{
+    p->m_type = type;
+    return *this;
+}
+
+PreviewWidgetMatcher& PreviewWidgetMatcher::data(const sc::Variant& data)
+{
+    p->m_data = data;
+    return *this;
+}
+
+PreviewWidgetMatcher& PreviewWidgetMatcher::data(sc::Variant&& data)
+{
+    p->m_data = move(data);
+    return *this;
+}
+
+MatchResult PreviewWidgetMatcher::match(const preview::PreviewWidget& previewWidget) const
+{
+    MatchResult matchResult;
+    match(matchResult, previewWidget);
+    return matchResult;
+}
+
+void PreviewWidgetMatcher::match(MatchResult& matchResult, const preview::PreviewWidget& previewWidget) const
+{
+    check_string(matchResult, previewWidget, "id", previewWidget.id(), p->m_id);
+
+    if (p->m_type)
+    {
+        check_string(matchResult, previewWidget, "type", previewWidget.type(), p->m_type.get());
+    }
+
+    if (p->m_data)
+    {
+        auto dict = previewWidget.data().get_dict();
+        // No point comparing this transitory field
+        dict.erase("session-id");
+        check_variant(matchResult, previewWidget, "data", sc::Variant(dict), p->m_data.get());
+    }
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/preview-widget-matcher.h'
--- src/scope-harness/matcher/preview-widget-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/preview-widget-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/matcher/match-result.h>
+
+namespace unity
+{
+namespace scopes
+{
+class Variant;
+}
+namespace scopeharness
+{
+namespace preview
+{
+class PreviewWidget;
+}
+namespace matcher
+{
+
+class Q_DECL_EXPORT PreviewWidgetMatcher final
+{
+public:
+    PreviewWidgetMatcher(const std::string& id);
+
+    PreviewWidgetMatcher(const PreviewWidgetMatcher& other);
+
+    PreviewWidgetMatcher(PreviewWidgetMatcher&& other);
+
+    PreviewWidgetMatcher& operator=(const PreviewWidgetMatcher& other);
+
+    PreviewWidgetMatcher& operator=(PreviewWidgetMatcher&& other);
+
+    ~PreviewWidgetMatcher();
+
+    PreviewWidgetMatcher& type(const std::string& type);
+
+    PreviewWidgetMatcher& data(const unity::scopes::Variant& data);
+
+    PreviewWidgetMatcher& data(unity::scopes::Variant&& data);
+
+    MatchResult match(const preview::PreviewWidget& previewWidget) const;
+
+    void match(MatchResult& matchResult, const preview::PreviewWidget& previewWidget) const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/result-matcher.cpp'
--- src/scope-harness/matcher/result-matcher.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/result-matcher.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/results/result.h>
+#include <scope-harness/matcher/result-matcher.h>
+
+#include <unity/UnityExceptions.h>
+#include <unity/scopes/Variant.h>
+
+#include <boost/optional.hpp>
+#include <boost/regex.hpp>
+
+using namespace std;
+using namespace boost;
+
+namespace sc = unity::scopes;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+namespace
+{
+static void check_variant(MatchResult& matchResult, const results::Result& result,
+    const string& name, const sc::Variant& actualValue, const sc::Variant& expectedValue)
+{
+    if (!(actualValue == expectedValue))
+    {
+        auto actualValueString = actualValue.serialize_json();
+        auto expectedValueString = expectedValue.serialize_json();
+        // serialize_json includes a trailing carriage return
+        actualValueString.pop_back();
+        expectedValueString.pop_back();
+
+        matchResult.failure(
+                "Result with URI '" + result.uri() + "' has '" + name
+                        + "' == '" + actualValueString + "' but expected '"
+                        + expectedValueString + "'");
+    }
+}
+
+static void check_variant(MatchResult& matchResult, const results::Result& result,
+    const string& name, const sc::Variant& expectedValue)
+{
+    try
+    {
+        const auto& actualValue = result[name];
+        check_variant(matchResult, result, name, actualValue, expectedValue);
+    }
+    catch (unity::InvalidArgumentException& e)
+    {
+        matchResult.failure(
+                "Result with URI '" + result.uri()
+                        + "' missing expected property '" + name + "'");
+    }
+}
+
+
+static void check_string(MatchResult& matchResult, const results::Result& result,
+             const string& name, const string& actualValue,
+             const string& expectedValue)
+{
+    try
+    {
+        if (actualValue != expectedValue)
+        {
+            matchResult.failure(
+                    "Result with URI '" + result.uri() + "' has '" + name
+                            + "' == '" + actualValue + "' but expected '"
+                            + expectedValue + "'");
+        }
+    }
+    catch (std::exception& e)
+    {
+        matchResult.failure(
+                "Result with URI '" + result.uri()
+                        + "' does not contain expected property '" + name
+                        + "'");
+    }
+}
+
+static void check_regex(MatchResult& matchResult, const results::Result& result,
+             const string& name, const string& actualValue,
+             const regex& expectedValue)
+{
+    try
+    {
+        if (!regex_match(actualValue, expectedValue))
+        {
+            matchResult.failure(
+                    "Result with URI '" + result.uri() + "' has '" + name
+                            + "' == '" + actualValue + "' but expected to match '"
+                            + expectedValue.str() + "'");
+        }
+    }
+    catch (std::exception& e)
+    {
+        matchResult.failure(
+                "Result with URI '" + result.uri()
+                        + "' does not contain expected property '" + name
+                        + "'");
+    }
+}
+}
+
+struct ResultMatcher::Priv
+{
+    string m_uri;
+
+    optional<string> m_dndUri;
+
+    optional<string> m_title;
+
+    optional<string> m_art;
+
+    optional<string> m_subtitle;
+
+    optional<string> m_emblem;
+
+    optional<string> m_mascot;
+
+    optional<sc::Variant> m_attributes;
+
+    optional<sc::Variant> m_summary;
+
+    optional<sc::Variant> m_background;
+
+    vector<pair<string, sc::Variant>> m_properties;
+};
+
+ResultMatcher::ResultMatcher(const string& uri) :
+        p(new Priv)
+{
+    p->m_uri = uri;
+}
+
+ResultMatcher::ResultMatcher(const ScopeUri& uri) :
+        p(new Priv)
+{
+    p->m_uri = uri.toString();
+}
+
+ResultMatcher ResultMatcher::any_uri()
+{
+    return ResultMatcher(string());
+}
+
+ResultMatcher::ResultMatcher(const ResultMatcher& other) :
+    p(new Priv)
+{
+    *this = other;
+}
+
+ResultMatcher& ResultMatcher::operator=(const ResultMatcher& other)
+{
+    p->m_uri = other.p->m_uri;
+    p->m_dndUri = other.p->m_dndUri;
+    p->m_title = other.p->m_title;
+    p->m_art = other.p->m_art;
+    p->m_subtitle = other.p->m_subtitle;
+    p->m_emblem = other.p->m_emblem;
+    p->m_mascot = other.p->m_mascot;
+    p->m_attributes = other.p->m_attributes;
+    p->m_summary = other.p->m_summary;
+    p->m_background = other.p->m_background;
+    p->m_properties = other.p->m_properties;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::operator=(ResultMatcher&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::dndUri(const string& dndUri)
+{
+    p->m_dndUri = dndUri;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::title(const string& title)
+{
+    p->m_title = title;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::art(const string& art)
+{
+    p->m_art = art;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::subtitle(const string& subtitle)
+{
+    p->m_subtitle = subtitle;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::emblem(const string& emblem)
+{
+    p->m_emblem = emblem;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::mascot(const string& mascot)
+{
+    p->m_mascot = mascot;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::attributes(const sc::Variant& attributes)
+{
+    p->m_attributes = attributes;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::summary(const sc::Variant& summary)
+{
+    p->m_summary = summary;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::background(const sc::Variant& background)
+{
+    p->m_background = background;
+    return *this;
+}
+
+ResultMatcher& ResultMatcher::property(const string& name, const sc::Variant& value)
+{
+    p->m_properties.emplace_back(make_pair(name, value));
+    return *this;
+}
+
+MatchResult ResultMatcher::match(const results::Result& result) const
+{
+    MatchResult matchResult;
+    match(matchResult, result);
+    return matchResult;
+}
+
+void ResultMatcher::match(MatchResult& matchResult, const results::Result& result) const
+{
+    if(!p->m_uri.empty())
+    {
+        check_regex(matchResult, result, "uri", result.uri(), regex(p->m_uri));
+    }
+    if (p->m_dndUri)
+    {
+        check_string(matchResult, result, "dnd_uri", result.dnd_uri(),
+                     p->m_dndUri.get());
+    }
+    if (p->m_title)
+    {
+        check_string(matchResult, result, "title", result.title(), p->m_title.get());
+    }
+    if (p->m_art)
+    {
+        check_string(matchResult, result, "art", result.art(), p->m_art.get());
+    }
+    if (p->m_subtitle)
+    {
+        check_string(matchResult, result, "subtitle", result.subtitle(), p->m_subtitle.get());
+    }
+    if (p->m_emblem)
+    {
+        check_string(matchResult, result, "emblem", result.emblem(), p->m_emblem.get());
+    }
+    if (p->m_mascot)
+    {
+        check_string(matchResult, result, "mascot", result.mascot(), p->m_mascot.get());
+    }
+    if (p->m_attributes)
+    {
+        check_variant(matchResult, result, "attributes", result.attributes(), p->m_attributes.get());
+    }
+    if (p->m_summary)
+    {
+        check_variant(matchResult, result, "summary", result.summary(), p->m_summary.get());
+    }
+    if (p->m_background)
+    {
+        check_variant(matchResult, result, "background", result.background(), p->m_background.get());
+    }
+
+    for (const auto& property : p->m_properties)
+    {
+        check_variant(matchResult, result, property.first, property.second);
+    }
+}
+
+string ResultMatcher::getUri() const
+{
+    return p->m_uri;
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/result-matcher.h'
--- src/scope-harness/matcher/result-matcher.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/result-matcher.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/matcher/match-result.h>
+#include <scope-harness/matcher/scope-uri.h>
+
+namespace unity
+{
+namespace scopes
+{
+class Variant;
+}
+namespace scopeharness
+{
+namespace results
+{
+class Result;
+}
+namespace matcher
+{
+
+class Q_DECL_EXPORT ResultMatcher final
+{
+public:
+    ResultMatcher(const ScopeUri& uri);
+
+    ResultMatcher(const std::string& uri);
+
+    static ResultMatcher any_uri();
+
+    ~ResultMatcher() = default;
+
+    ResultMatcher(const ResultMatcher& other);
+
+    ResultMatcher& operator=(const ResultMatcher& other);
+
+    ResultMatcher& operator=(ResultMatcher&& other);
+
+    ResultMatcher& dndUri(const std::string& dndUri);
+
+    ResultMatcher& title(const std::string& title);
+
+    ResultMatcher& art(const std::string& art);
+
+    ResultMatcher& subtitle(const std::string& subtitle);
+
+    ResultMatcher& emblem(const std::string& emblem);
+
+    ResultMatcher& mascot(const std::string& mascot);
+
+    ResultMatcher& attributes(const unity::scopes::Variant& attributes);
+
+    ResultMatcher& summary(const unity::scopes::Variant& summary);
+
+    ResultMatcher& background(const unity::scopes::Variant& background);
+
+    ResultMatcher& property(const std::string& name, const unity::scopes::Variant& value);
+
+    MatchResult match(const results::Result& result) const;
+
+    void match(MatchResult& matchResult, const results::Result& result) const;
+
+    std::string getUri() const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/scope-uri.cpp'
--- src/scope-harness/matcher/scope-uri.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/scope-uri.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/matcher/scope-uri.h>
+
+#include <QUrl>
+
+#include <sstream>
+
+using namespace std;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+namespace
+{
+static void paramJoin(stringstream& s, const vector<pair<string, string>>& v)
+{
+    bool first = true;
+    for (const auto& e : v)
+    {
+        if (first)
+        {
+            first = false;
+            s << "\\?";
+        }
+        else
+        {
+            s << "&";
+        }
+        s
+                << QUrl::toPercentEncoding(QString::fromStdString(e.first)).constData()
+                << "="
+                << QUrl::toPercentEncoding(QString::fromStdString(e.second)).constData();
+    }
+}
+}
+
+struct ScopeUri::Priv
+{
+    string m_id;
+
+    string m_department;
+
+    string m_query;
+};
+
+ScopeUri::ScopeUri(const string& id) :
+        p(new Priv)
+{
+    p->m_id = id;
+}
+
+ScopeUri::~ScopeUri()
+{
+}
+
+ScopeUri::ScopeUri(const ScopeUri& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+ScopeUri::ScopeUri(ScopeUri&& other)
+{
+    *this = move(other);
+}
+
+ScopeUri& ScopeUri::operator=(const ScopeUri& other)
+{
+    p->m_id = other.p->m_id;
+    p->m_department = other.p->m_department;
+    p->m_query = other.p->m_query;
+    return *this;
+}
+
+ScopeUri& ScopeUri::operator=(ScopeUri&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+ScopeUri& ScopeUri::department(const std::string& departmentId)
+{
+    p->m_department = departmentId;
+    return *this;
+}
+
+ScopeUri& ScopeUri::query(const std::string& queryString)
+{
+    p->m_query = queryString;
+    return *this;
+}
+
+string ScopeUri::toString() const
+{
+    stringstream result;
+    result << "scope:\\/\\/"
+            << QUrl::toPercentEncoding(QString::fromStdString(p->m_id)).constData();
+    vector<pair<string, string>> params;
+    if (!p->m_department.empty())
+    {
+        params.emplace_back(make_pair("department", p->m_department));
+    }
+    if (!p->m_query.empty())
+    {
+        params.emplace_back(make_pair("q", p->m_query));
+    }
+    paramJoin(result, params);
+    return result.str();
+}
+
+}
+}
+}

=== added file 'src/scope-harness/matcher/scope-uri.h'
--- src/scope-harness/matcher/scope-uri.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/matcher/scope-uri.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QtGlobal>
+
+#include <memory>
+#include <string>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace matcher
+{
+
+class Q_DECL_EXPORT ScopeUri
+{
+public:
+    ScopeUri(const std::string& id);
+
+    ScopeUri(const ScopeUri& other);
+
+    ScopeUri(ScopeUri&& other);
+
+    ~ScopeUri();
+
+    ScopeUri& operator=(const ScopeUri& other);
+
+    ScopeUri& operator=(ScopeUri&& other);
+
+    ScopeUri& department(const std::string& departmentId);
+
+    ScopeUri& query(const std::string& queryString);
+
+    std::string toString() const;
+
+protected:
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added directory 'src/scope-harness/preview'
=== added file 'src/scope-harness/preview/preview-widget-list.cpp'
--- src/scope-harness/preview/preview-widget-list.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/preview/preview-widget-list.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <internal/preview-widget-list-arguments.h>
+#include <preview/preview-widget-list.h>
+
+using namespace std;
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace preview
+{
+
+struct PreviewWidgetList::Priv
+{
+    std::vector<preview::PreviewWidget> previewWidgets;
+};
+
+PreviewWidgetList::PreviewWidgetList(const internal::PreviewWidgetListArguments& arguments) :
+    p(new Priv)
+{
+    p->previewWidgets = arguments.previewWidgets;
+}
+
+
+PreviewWidgetList::PreviewWidgetList(const PreviewWidgetList& other) :
+        p(new Priv)
+{
+    *this = other;
+}
+
+PreviewWidgetList::PreviewWidgetList(PreviewWidgetList&& other)
+{
+    *this = move(other);
+}
+
+PreviewWidgetList::~PreviewWidgetList()
+{
+}
+
+PreviewWidgetList& PreviewWidgetList::operator=(const PreviewWidgetList& other)
+{
+    p->previewWidgets = other.p->previewWidgets;
+    return *this;
+}
+
+PreviewWidgetList& PreviewWidgetList::operator=(PreviewWidgetList&& other)
+{
+    p = move(other.p);
+    return *this;
+}
+
+PreviewWidget PreviewWidgetList::at(std::size_t index) const
+{
+    return p->previewWidgets.at(index);
+}
+
+PreviewWidget PreviewWidgetList::at(const std::string& id) const
+{
+    for (const auto& widget : p->previewWidgets)
+    {
+        if (widget.id() == id)
+        {
+            return widget;
+        }
+    }
+
+    throw domain_error("Widget '" + id + "' not found");
+}
+
+PreviewWidget PreviewWidgetList::operator[](std::size_t index) const
+{
+    return at(index);
+}
+
+PreviewWidget PreviewWidgetList::operator[](const std::string& id) const
+{
+    return at(id);
+}
+
+std::size_t PreviewWidgetList::size() const
+{
+    return p->previewWidgets.size();
+}
+
+}
+}
+}

=== added file 'src/scope-harness/preview/preview-widget-list.h'
--- src/scope-harness/preview/preview-widget-list.h	1970-01-01 00:00:00 +0000
+++ src/scope-harness/preview/preview-widget-list.h	2015-03-04 08:54:34 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <scope-harness/preview/preview-widget.h>
+
+namespace unity
+{
+namespace scopeharness
+{
+namespace internal
+{
+struct PreviewWidgetListArguments;
+}
+namespace view
+{
+class PreviewView;
+}
+namespace preview
+{
+
+class Q_DECL_EXPORT PreviewWidgetList
+{
+public:
+    PreviewWidgetList(const PreviewWidgetList& other);
+
+    PreviewWidgetList(PreviewWidgetList&& other);
+
+    PreviewWidgetList& operator=(const PreviewWidgetList& other);
+
+    PreviewWidgetList& operator=(PreviewWidgetList&& other);
+
+    ~PreviewWidgetList();
+
+    PreviewWidget at(std::size_t index) const;
+
+    PreviewWidget at(const std::string& id) const;
+
+    PreviewWidget operator[](std::size_t index) const;
+
+    PreviewWidget operator[](const std::string& id) const;
+
+    std::size_t size() const;
+
+protected:
+    friend view::PreviewView;
+
+    PreviewWidgetList(const internal::PreviewWidgetListArguments& arguments);
+
+    struct Priv;
+
+    std::shared_ptr<Priv> p;
+};
+
+}
+}
+}

=== added file 'src/scope-harness/preview/preview-widget.cpp'
--- src/scope-harness/preview/preview-widget.cpp	1970-01-01 00:00:00 +0000
+++ src/scope-harness/preview/preview-widget.cpp	2015-03-04 08:54:34 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of version 3 of the GNU Lesser General Public License as published
+ * by the Free Software Foundation.
+ *
+ * This library 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <scope-harness/internal/preview-widget-arguments.h>
+#include <scope-harness/preview/preview-widget.h>
+#include <scope-harness/view/abstract-view.h>
+#include <scope-harness/view/preview-view.h>
+#include <scope-harness/internal/test-utils.h>
+
+#include <unity/shell/scopes/PreviewModelInterface.h>
+#include <unity/shell/scopes/PreviewWidgetModelInterface.h>
+
+#include <Unity/utils.h>
+
+#include <QDebug>
+#include <QSignalSpy>
+
+using namespace std;
+namespace ng = scopes_ng;
+namespace sc = unity::scopes;
+namespace ss = unity::shell::scopes;
+
+namespace unity
+{
+namespace scopeharness
+{
+using namespace internal;
+namespace preview
+{
+
+struct PreviewWidget::Priv
+{
+    unity::shell::scopes::PreviewWidgetModelInterface* m_previewWidgetModel;
+
+    QModelIndex m_index;
+
+    unity::shell::scopes::PreviewModelInterface* m_previewModel;
+
+    weak_ptr<view::ResultsView> m_resultsView;
+
+    weak_ptr<view::PreviewView> m_previewView;
+};
+
+PreviewWidget::PreviewWidget(const internal::PreviewWidgetArguments& arguments) :
+        p(new Priv)
+{
+    p->m_previewWidgetModel = arguments.previewWidgetModel;
+    p->m_previewModel = arguments.previewModel;
+    p->m_index = arguments.index;
+    p->m_resultsView = arguments.resultsView;
+    p->m_previewView = arguments.previewView;