Merge lp:~marcustomlinson/qtcreator-plugin-ubuntu/refactor-scope-template into lp:qtcreator-plugin-ubuntu

[Marcus Tomlinson]

Refactored the scope templates to be more simplistic and comprehensible:
* Reduced directory structure to as few folders as possible
* Renamed scope ini file to <scope-name>.ini
* Added a <scope-name>-settings.ini
* Cleaned out unnecessary complexities from source and CMake files
* More descriptive comments and variable names
* Updated tests to use python3-scope-harness
* Removed cmake/ modules folder (SDK now includes cmake-extras)
* Allow scope template to build with gcc > 4.9
* Added "Keywords" key to scope ini

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:432
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~marcustomlinson/qtcreator-plugin-ubuntu/refactor-scope-template/+merge/259083/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/542/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/542/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/qtcreator-plugin-ubuntu/refactor-scope-template]

433. By Marcus Tomlinson on 2015-05-19

Fixed comment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:433
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/543/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/543/rebuild

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

ok

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2015-01-07 10:50:28 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt	2015-05-19 10:38:08 +0000
@@ -1,12 +1,11 @@
 project(%ProjectName:l% CXX)
 cmake_minimum_required(VERSION 2.8.10)
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 
-# We require g++ 4.9, to avoid ABI breakage with earlier version.
+# We require at least g++ 4.9, to avoid ABI breakage with earlier versions.
 set(cxx_version_required 4.9)
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    if (NOT CMAKE_CXX_COMPILER_VERSION MATCHES "^${cxx_version_required}")
-        message(FATAL_ERROR "g++ version must be ${cxx_version_required}!")
+if (CMAKE_COMPILER_IS_GNUCXX)
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${cxx_version_required})
+        message(FATAL_ERROR "g++ version must be at least ${cxx_version_required}!")
     endif()
 endif()
 
@@ -21,17 +20,14 @@
   -DQT_NO_KEYWORDS
 )
 
+# Search for our dependencies
 include(GNUInstallDirs)
 find_package(PkgConfig)
 find_package(Intltool)
-
-# We depend on Boost for string trimming
-find_package(
-  Boost
-  REQUIRED
-)
-
-# Search for our dependencies
+@if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"
+find_package(Qt5Core REQUIRED)
+@endif
+
 pkg_check_modules(
   SCOPE
   libunity-scopes>=0.6.0
@@ -44,19 +40,16 @@
   REQUIRED
 )
 
-@if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"
-find_package(Qt5Core REQUIRED)
-include_directories(${Qt5Core_INCLUDE_DIRS})
-@endif
-
 # Add our dependencies to the include paths
 include_directories(
-  "${CMAKE_SOURCE_DIR}/include"
-  ${Boost_INCLUDE_DIRS}
+  "${CMAKE_SOURCE_DIR}/src"
   ${SCOPE_INCLUDE_DIRS}
+@if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"
+  ${Qt5Core_INCLUDE_DIRS}
+@endif
 )
 
-# Do not remove this line, its required for the correct functionality of the Ubuntu-SDK
+# Do not remove these 2 lines, they are required for the correct functionality of the Ubuntu-SDK
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
 set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
 
@@ -68,44 +61,42 @@
 set(SCOPE_NAME "${PACKAGE_NAME}_%ClickHookName:l%")
 
 # If we need to refer to the scope's name or package in code, these definitions will help
-
 add_definitions(-DPACKAGE_NAME="${PACKAGE_NAME}")
 add_definitions(-DSCOPE_NAME="${SCOPE_NAME}")
 add_definitions(-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}")
 
-#This command figures out the target architecture and puts it into the manifest file
+# This command figures out the target architecture and puts it into the manifest file
 execute_process(
   COMMAND dpkg-architecture -qDEB_HOST_ARCH
   OUTPUT_VARIABLE CLICK_ARCH
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+# Configure and install the click manifest and apparmor files
 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-
-# Install the click manifest
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION "/")
 install(FILES "%ClickHookName:l%.apparmor" DESTINATION "/")
 
 # Make these files show up in QtCreator
 file(GLOB_RECURSE
   _PO_FILES
-  "po/*.po" 
+  "po/*.po"
 )
 add_custom_target(hidden_files
   ALL
   SOURCES
     manifest.json.in
     %ClickHookName:l%.apparmor
-    data/${SCOPE_NAME}.ini.in
+    src/data/%ClickHookName:l%.ini.in
+    src/data/%ClickHookName:l%-settings.ini.in
     po/POTFILES.in
     po/${GETTEXT_PACKAGE}.pot
     ${_PO_FILES}
 )
 
 # Add our main directories
+add_subdirectory(po)
 add_subdirectory(src)
-add_subdirectory(data)
-add_subdirectory(po)
 
 # Set up the tests
 enable_testing()

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/cmake'
=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindGMock.cmake'
--- share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindGMock.cmake	2014-09-03 12:55:33 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindGMock.cmake	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-# Build with system gmock and embedded gtest
-set (GMOCK_INCLUDE_DIRS "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIRS "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
-
-set(GTEST_LIBRARIES gtest)
-set(GTEST_MAIN_LIBRARIES gtest_main)
-set(GMOCK_LIBRARIES gmock gmock_main)
-
-set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})

=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindIntltool.cmake'
--- share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindIntltool.cmake	2015-04-13 09:11:18 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/cmake/FindIntltool.cmake	1970-01-01 00:00:00 +0000
@@ -1,265 +0,0 @@
-# Copyright (C) 2014 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# This package provides macros that wrap the intltool programs.
-# 
-# An example of common usage is:
-#
-# For an ini file:
-#
-# intltool_merge_translations(
-#   "foo.ini.in"
-#   "${CMAKE_CURRENT_BINARY_DIR}/foo.ini"
-#   ALL
-#   UTF8
-# )
-#
-# Inside po/CMakeLists.txt:
-#
-# intltool_update_potfile(
-#     ALL
-#     GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
-# )
-#
-# intltool_install_translations(
-#     ALL
-#     GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
-# )
-
-find_package(Gettext REQUIRED)
-
-find_program(INTLTOOL_UPDATE_EXECUTABLE intltool-update)
-
-if(INTLTOOL_UPDATE_EXECUTABLE)
-    execute_process(
-        COMMAND ${INTLTOOL_UPDATE_EXECUTABLE} --version
-        OUTPUT_VARIABLE intltool_update_version
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (intltool_update_version MATCHES "^intltool-update \\(.*\\) [0-9]")
-        string(
-            REGEX REPLACE "^intltool-update \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1"
-            INTLTOOL_UPDATE_VERSION_STRING "${intltool_update_version}"
-        )
-    endif()
-    unset(intltool_update_version)
-endif()
-
-find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
-
-if(INTLTOOL_MERGE_EXECUTABLE)
-    execute_process(
-        COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --version
-        OUTPUT_VARIABLE intltool_merge_version
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (intltool_update_version MATCHES "^intltool-merge \\(.*\\) [0-9]")
-        string(
-            REGEX REPLACE "^intltool-merge \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1"
-            INTLTOOL_MERGE_VERSION_STRING "${intltool_merge_version}"
-        )
-    endif()
-    unset(intltool_merge_version)
-endif()
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(
-    Intltool
-    REQUIRED_VARS
-      INTLTOOL_UPDATE_EXECUTABLE
-      INTLTOOL_MERGE_EXECUTABLE
-    VERSION_VAR
-      INTLTOOL_UPDATE_VERSION_STRING
-    HANDLE_COMPONENTS
-)
-
-function(APPEND_EACH LISTNAME GLUE OUTPUT)
-    set(_tmp_list "")
-    foreach(VAL ${${LISTNAME}})
-        list(APPEND _tmp_list "${GLUE}${VAL}")
-    endforeach(VAL ${${LISTNAME}})
-    set(${OUTPUT} "${_tmp_list}" PARENT_SCOPE)
-endfunction()
-
-function(INTLTOOL_UPDATE_POTFILE)
-    set(_options ALL)
-    set(_oneValueArgs GETTEXT_PACKAGE OUTPUT_FILE PO_DIRECTORY)
-
-    cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "" ${ARGN})
-    
-    set(_POT_FILE "${PROJECT}.pot")
-
-    set(_GETTEXT_PACKAGE "")
-    if(_ARG_GETTEXT_PACKAGE)
-        set(_POT_FILE "${_ARG_GETTEXT_PACKAGE}.pot")
-        set(_GETTEXT_PACKAGE --gettext-package="${_ARG_GETTEXT_PACKAGE}")
-    endif()
-
-    set(_OUTPUT_FILE "")
-    if(_ARG_OUTPUT_FILE)
-        set(_POT_FILE "${_ARG_OUTPUT_FILE}")
-        set(_OUTPUT_FILE --output-file="${_ARG_OUTPUT_FILE}")
-    endif()
-
-    set(_PO_DIRECTORY "${CMAKE_SOURCE_DIR}/po")
-    if(_ARG_PO_DIRECTORY)
-        set(_PO_DIRECTORY "${_ARG_PO_DIRECTORY}")
-    endif()
-    
-    file(
-        GLOB_RECURSE _CODE_SOURCES
-        ${CMAKE_SOURCE_DIR}/*.cpp
-        ${CMAKE_SOURCE_DIR}/*.cc
-        ${CMAKE_SOURCE_DIR}/*.cxx
-        ${CMAKE_SOURCE_DIR}/*.vala
-        ${CMAKE_SOURCE_DIR}/*.c
-        ${CMAKE_SOURCE_DIR}/*.h
-        ${CMAKE_SOURCE_DIR}/*.ini.in
-    )
-
-    add_custom_command(
-        OUTPUT
-          "${_PO_DIRECTORY}/${_POT_FILE}"
-        COMMAND ${INTLTOOL_UPDATE_EXECUTABLE} --pot ${_OUTPUT_FILE} ${_GETTEXT_PACKAGE}
-        DEPENDS
-          "${_PO_DIRECTORY}/POTFILES.in"
-          ${_CODE_SOURCES}
-        WORKING_DIRECTORY ${_PO_DIRECTORY}
-    )
-    
-    _GETTEXT_GET_UNIQUE_TARGET_NAME(${_POT_FILE} _UNIQUE_TARGET_NAME)
-
-    if(_ARG_ALL)
-        add_custom_target(
-          ${_UNIQUE_TARGET_NAME}
-          ALL
-          DEPENDS
-            "${_PO_DIRECTORY}/${_POT_FILE}"
-        )
-    else()
-        add_custom_target(
-          ${_UNIQUE_TARGET_NAME}
-          DEPENDS
-            "${_PO_DIRECTORY}/${_POT_FILE}"
-        )
-    endif()
-endfunction()
-
-function(INTLTOOL_INSTALL_TRANSLATIONS)
-    set(_options ALL)
-    set(_oneValueArgs GETTEXT_PACKAGE POT_FILE)
-
-    cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "" ${ARGN})
-
-    set(_POT_FILE "${PROJECT}.pot")
-
-    if(_ARG_GETTEXT_PACKAGE)
-        set(_POT_FILE "${_ARG_GETTEXT_PACKAGE}.pot")
-    endif()
-
-    if(_ARG_OUTPUT_FILE)
-        set(_POT_FILE "${_ARG_OUTPUT_FILE}")
-    endif()
-
-    file(
-        GLOB _PO_FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/*.po
-    )
-
-    get_filename_component(_ABS_POT_FILE ${_POT_FILE} ABSOLUTE)
-
-    foreach(_PO_FILE ${_PO_FILES})
-        add_custom_command(
-           OUTPUT
-             ${_PO_FILE}
-           COMMAND
-             ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_PO_FILE} ${_ABS_POT_FILE}
-           DEPENDS
-             ${_ABS_POT_FILE}
-        )
-    endforeach()
-
-    if(_ARG_ALL)
-        gettext_create_translations(
-          ${_POT_FILE}
-          ALL
-          ${_PO_FILES}
-        )
-    else()
-        gettext_create_translations(
-          ${_POT_FILE}
-          ${_PO_FILES}
-        )
-    endif()
-endfunction()
-
-function(INTLTOOL_MERGE_TRANSLATIONS FILENAME OUTPUT_FILE)
-    set(_options ALL UTF8 PASS_THROUGH)
-    set(_oneValueArgs PO_DIRECTORY)
-
-    cmake_parse_arguments(_ARG "${_options}" "${_oneValueArgs}" "" ${ARGN})
-
-    get_filename_component(_ABS_FILENAME ${FILENAME} ABSOLUTE)
-
-    set(_PO_DIRECTORY "${CMAKE_SOURCE_DIR}/po")
-    if(_ARG_PO_DIRECTORY)
-        set(_PO_DIRECTORY "${_ARG_PO_DIRECTORY}")
-    endif()
-
-    set(_UTF8 "")
-    if(_ARG_UTF8)
-        set(_UTF8 "--utf8")
-    endif()
-
-    set(_PASS_THROUGH "")
-    if(_ARG_PASS_THROUGH)
-        set(_PASS_THROUGH "--pass-through")
-    endif()
-    
-    file(
-        GLOB_RECURSE _PO_FILES
-        ${_PO_DIRECTORY}/*.po
-    )
-
-    add_custom_command(
-        OUTPUT
-          ${OUTPUT_FILE}
-        COMMAND
-          ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style --quiet ${_UTF8} ${_PASS_THROUGH} ${_PO_DIRECTORY} ${FILENAME} ${OUTPUT_FILE}
-        DEPENDS
-          ${_ABS_FILENAME}
-          ${_PO_FILES}
-        WORKING_DIRECTORY
-          ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-    
-    get_filename_component(_OUTPUT_NAME ${OUTPUT_FILE} NAME)
-    _GETTEXT_GET_UNIQUE_TARGET_NAME(${_OUTPUT_NAME} _UNIQUE_TARGET_NAME)
-
-    if(_ARG_ALL)
-        add_custom_target(
-          ${_UNIQUE_TARGET_NAME}
-          ALL
-          DEPENDS
-            ${OUTPUT_FILE}
-        )
-    else()
-        add_custom_target(
-          ${_UNIQUE_TARGET_NAME}
-          DEPENDS
-            ${OUTPUT_FILE}
-        )
-    endif()
-endfunction()

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/data'
=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/data/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/data/CMakeLists.txt	2014-11-21 14:45:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/data/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-# Install the scope images
-install(
-  FILES
-    "icon.png"
-    "logo.png"
-    "screenshot.png"
-  DESTINATION
-    "${SCOPE_INSTALL_DIR}"
-)

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/include'
=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/include/api'
=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/include/api/config.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/api/config.h	2014-10-27 16:24:10 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/include/api/config.h	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#ifndef API_CONFIG_H_
-#define API_CONFIG_H_
-
-#include <memory>
-#include <string>
-
-namespace api {
-
-struct Config {
-    typedef std::shared_ptr<Config> Ptr;
-
-@if "%ContentType%".substring(0, "network".length) === "network"
-    /*
-     * The root of all API request URLs
-     */
-    std::string apiroot { "http://api.openweathermap.org" };
-
-    /*
-     * The custom HTTP user agent string for this library
-     */
-    std::string user_agent { "example-network-scope 0.1; (foo)" };
-@endif
-};
-
-}
-
-#endif /* API_CONFIG_H_ */

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope'
=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/po/POTFILES.in'
--- share/qtcreator/templates/wizards/ubuntu/scope/po/POTFILES.in	2015-01-07 10:50:28 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/po/POTFILES.in	2015-05-19 10:38:08 +0000
@@ -1,11 +1,11 @@
-[type: gettext/ini] data/%ProjectName:l%.%ClickDomain:l%_%ClickHookName:l%.ini.in
-include/api/config.h
-include/api/client.h
-include/scope/preview.h
-include/scope/localization.h
-include/scope/query.h
-include/scope/scope.h
-src/api/client.cpp
-src/scope/query.cpp
-src/scope/scope.cpp
-src/scope/preview.cpp
+[type: gettext/ini] src/data/%ClickHookName:l%.ini.in
+[type: gettext/ini] src/data/%ClickHookName:l%-settings.ini.in
+src/client.cpp
+src/client.h
+src/localization.h
+src/preview.cpp
+src/preview.h
+src/query.cpp
+src/query.h
+src/scope.cpp
+src/scope.h

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/src/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/CMakeLists.txt	2014-11-21 14:45:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/CMakeLists.txt	2015-05-19 10:38:08 +0000
@@ -1,66 +1,64 @@
 
-# Put the ini file in the build directory next to the scope
-# .so file so test tools can find both easily.
+# Put the ini files in the build directory next to the scope
+# .so file so that the test tools can find them.
 intltool_merge_translations(
-  "${CMAKE_SOURCE_DIR}/data/${SCOPE_NAME}.ini.in"
+  "data/%ClickHookName:l%.ini.in"
   "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
   ALL
   UTF8
 )
+intltool_merge_translations(
+  "data/%ClickHookName:l%-settings.ini.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}-settings.ini"
+  ALL
+  UTF8
+)
 
-# Install the scope ini file
+# Install the scope ini files
 install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
-  DESTINATION ${SCOPE_INSTALL_DIR}
+  FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
+    "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}-settings.ini"
+  DESTINATION
+    ${SCOPE_INSTALL_DIR}
 )
 
+# Put the logo file in the build directory next to the scope
+# .ini file so that the test tools can find it.
 configure_file(
-  "${CMAKE_SOURCE_DIR}/data/logo.png"
+  "data/logo.png"
   "${CMAKE_CURRENT_BINARY_DIR}/logo.png"
   @ONLY
   COPYONLY
 )
 
-# The sources to build the scope
-set(SCOPE_SOURCES
-  api/client.cpp
-  scope/preview.cpp
-  scope/query.cpp
-  scope/scope.cpp
+# Install the scope images
+install(
+  FILES
+    "data/icon.png"
+    "data/logo.png"
+    "data/screenshot.png"
+  DESTINATION
+    ${SCOPE_INSTALL_DIR}
 )
 
-# Find all the headers
+# Find all the sources
 file(GLOB_RECURSE
-  SCOPE_HEADERS
-  "${CMAKE_SOURCE_DIR}/include/*.h" 
-)
-
-# Build an object library for the scope code
-add_library(
-  scope-static OBJECT
-  ${SCOPE_SOURCES}
-  ${SCOPE_HEADERS}
-)
-
-# Ensure we export all the symbols
-set_target_properties(
-  scope-static
-  PROPERTIES
-    LINK_FLAGS "-Wl,--export-all-symbols"
+  SCOPE_SOURCES
+  "*.cpp"
+  "*.h"
 )
 
 # Build a shared library containing our scope code.
-# This will be the actual plugin that is loaded.
 add_library(
   scope SHARED
-  $<TARGET_OBJECTS:scope-static>
+  ${SCOPE_SOURCES}
 )
 
 # Link against the object library and our external library dependencies
 target_link_libraries(
   scope
   ${SCOPE_LDFLAGS}
-  ${Boost_LIBRARIES}
 )
 
 @if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/src/api'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/api/client.cpp	2014-12-15 10:12:40 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/client.cpp	2015-05-19 10:38:08 +0000
@@ -1,4 +1,4 @@
-#include <api/client.h>
+#include <client.h>
 
 @if "%ContentType%".substring(0, "network-netcpp".length) === "network-netcpp"
 #include <core/net/error.h>
@@ -18,7 +18,6 @@
 @endif
 @endif
 
-using namespace api;
 using namespace std;
 
 Client::Client(Config::Ptr config) :
@@ -495,6 +494,6 @@
     cancelled_ = true;
 }
 
-Config::Ptr Client::config() {
+Client::Config::Ptr Client::config() {
     return config_;
 }

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/include/api/client.h' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/client.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/api/client.h	2014-10-29 15:28:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/client.h	2015-05-19 10:38:08 +0000
@@ -1,11 +1,10 @@
-#ifndef API_CLIENT_H_
-#define API_CLIENT_H_
-
-#include <api/config.h>
+#ifndef CLIENT_H_
+#define CLIENT_H_
 
 #include <atomic>
 #include <deque>
 #include <map>
+#include <memory>
 #include <string>
 @if "%ContentType%".substring(0, "network".length) === "network"
 #include <core/net/http/request.h>
@@ -22,8 +21,6 @@
 @endif
 @endif
 
-namespace api {
-
 /**
  * Provide a nice way to access the HTTP API.
  *
@@ -32,6 +29,19 @@
 class Client {
 public:
 
+    /**
+     * Client configuration
+     */
+    struct Config {
+        typedef std::shared_ptr<Config> Ptr;
+
+        // The root of all API request URLs
+        std::string apiroot { "http://api.openweathermap.org" };
+
+        // The custom HTTP user agent string for this library
+        std::string user_agent { "example-network-scope 0.1; (foo)" };
+    };
+
 @if "%ContentType%" == "empty"
     /**
      * Result struct
@@ -163,6 +173,4 @@
     std::atomic<bool> cancelled_;
 };
 
-}
-
-#endif // API_CLIENT_H_
+#endif // CLIENT_H_

=== added directory 'share/qtcreator/templates/wizards/ubuntu/scope/src/data'
=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/src/data/displayName-settings.ini.in'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/data/displayName-settings.ini.in	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/data/displayName-settings.ini.in	2015-05-19 10:38:08 +0000
@@ -0,0 +1,21 @@
+@if "%ContentType%".substring(0, "network".length) === "network"
+# Below are some example settings. You can access your scope's
+# settings by calling settings() from the Query::run() method.
+# E.g. auto location = settings().at("location").get_string();
+
+#[location]
+#type = string
+#defaultValue = London,uk
+#_displayName = Default Location
+
+#[units]
+#type = list
+#_displayName = Temperature Units
+#_displayValues = Metric;Imperial
+#defaultValue = 0
+
+#[forecast]
+#type = boolean
+#defaultValue = true
+#_displayName = Show Forecast
+@endif

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini.in' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/data/displayName.ini.in'
--- share/qtcreator/templates/wizards/ubuntu/scope/data/displayName.ini.in	2014-11-21 14:45:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/data/displayName.ini.in	2015-05-19 10:38:08 +0000
@@ -4,6 +4,7 @@
 Art=screenshot.png
 Author=Firstname Lastname
 Icon=icon.png
+Keywords=weather
 
 [Appearance]
 PageHeader.Logo=logo.png

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/data/icon.png' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/data/icon.png'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/data/logo.png' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/data/logo.png'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/data/screenshot.png' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/data/screenshot.png'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/localization.h' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/localization.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/localization.h	2014-10-13 13:33:36 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/localization.h	2015-05-19 10:38:08 +0000
@@ -1,5 +1,5 @@
-#ifndef SCOPE_LOCALIZATION_H_
-#define SCOPE_LOCALIZATION_H_
+#ifndef LOCALIZATION_H_
+#define LOCALIZATION_H_
 
 #include <libintl.h>
 #include <string>
@@ -18,5 +18,5 @@
     }
 }
 
-#endif // SCOPE_LOCALIZATION_H_
+#endif // LOCALIZATION_H_
 

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/preview.cpp' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/preview.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/preview.cpp	2014-12-15 10:12:40 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/preview.cpp	2015-05-19 10:38:08 +0000
@@ -1,4 +1,4 @@
-#include <scope/preview.h>
+#include <preview.h>
 
 #include <unity/scopes/ColumnLayout.h>
 #include <unity/scopes/PreviewWidget.h>
@@ -11,10 +11,9 @@
 namespace sc = unity::scopes;
 
 using namespace std;
-using namespace scope;
 
 Preview::Preview(const sc::Result &result, const sc::ActionMetadata &metadata) :
-        sc::PreviewQueryBase(result, metadata) {
+    sc::PreviewQueryBase(result, metadata) {
 }
 
 void Preview::cancelled() {
@@ -32,36 +31,36 @@
     // However, we recommend that scopes define layouts for the best visual appearance.
 
     // Single column layout
-    layout1col.add_column( { "image", "header", "summary" });
+    layout1col.add_column( { "image_widget", "header_widget", "summary_widget" } );
 
     // Two column layout
-    layout2col.add_column( { "image" });
-    layout2col.add_column( { "header", "summary" });
+    layout2col.add_column( { "image_widget" } );
+    layout2col.add_column( { "header_widget", "summary_widget" } );
 
     // Three cokumn layout
-    layout3col.add_column( { "image" });
-    layout3col.add_column( { "header", "summary" });
-    layout3col.add_column( { });
+    layout3col.add_column( { "image_widget" });
+    layout3col.add_column( { "header_widget", "summary_widget" } );
+    layout3col.add_column( { } );
 
     // Register the layouts we just created
-    reply->register_layout( { layout1col, layout2col, layout3col });
+    reply->register_layout( { layout1col, layout2col, layout3col } );
+
+    // Define the image section
+    sc::PreviewWidget image("image_widget", "image");
+    // It has a single "source" property, mapped to the result's "art" property
+    image.add_attribute_mapping("source", "art");
 
     // Define the header section
-    sc::PreviewWidget header("header", "header");
-    // It has title and a subtitle properties
+    sc::PreviewWidget header("header_widget", "header");
+    // It has a "title" and a "subtitle" property
     header.add_attribute_mapping("title", "title");
     header.add_attribute_mapping("subtitle", "subtitle");
 
-    // Define the image section
-    sc::PreviewWidget image("image", "image");
-    // It has a single source property, mapped to the result's art property
-    image.add_attribute_mapping("source", "art");
-
     // Define the summary section
-    sc::PreviewWidget description("summary", "text");
-    // It has a text property, mapped to the result's description property
-    description.add_attribute_mapping("text", "description");
+    sc::PreviewWidget summary("summary_widget", "text");
+    // It has a "text" property, mapped to the result's "description" property
+    summary.add_attribute_mapping("text", "description");
 
     // Push each of the sections
-    reply->push( { image, header, description });
+    reply->push( { image, header, summary } );
 }

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/preview.h' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/preview.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/preview.h	2014-09-03 14:56:27 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/preview.h	2015-05-19 10:38:08 +0000
@@ -1,5 +1,5 @@
-#ifndef SCOPE_PREVIEW_H_
-#define SCOPE_PREVIEW_H_
+#ifndef PREVIEW_H_
+#define PREVIEW_H_
 
 #include <unity/scopes/PreviewQueryBase.h>
 
@@ -9,8 +9,6 @@
 }
 }
 
-namespace scope {
-
 /**
  * Represents an individual preview request.
  *
@@ -32,6 +30,4 @@
     void run(unity::scopes::PreviewReplyProxy const& reply) override;
 };
 
-}
-
-#endif // SCOPE_PREVIEW_H_
+#endif // PREVIEW_H_

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/query.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/query.cpp	2014-12-15 10:12:40 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/query.cpp	2015-05-19 10:38:08 +0000
@@ -1,7 +1,5 @@
-#include <boost/algorithm/string/trim.hpp>
-
-#include <scope/localization.h>
-#include <scope/query.h>
+#include <query.h>
+#include <localization.h>
 
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CategorisedResult.h>
@@ -10,18 +8,16 @@
 #include <unity/scopes/SearchReply.h>
 
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 
 namespace sc = unity::scopes;
-namespace alg = boost::algorithm;
 
 using namespace std;
-using namespace api;
-using namespace scope;
 
 @if "%ContentType%" == "empty"
 /**
- * Define the layout for theresults
+ * Define the layout for the results.
  *
  * The icon size is medium, and ask for the card layout
  * itself to be horizontal. I.e. the text will be placed
@@ -49,13 +45,36 @@
 
 @if "%ContentType%".substring(0, "network".length) === "network"
 /**
- * Define the layout for the forecast results
+ * Define the larger "current weather" layout.
+ *
+ * The icons are larger.
+ */
+const static string CURRENT_TEMPLATE =
+        R"(
+{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "medium"
+  },
+  "components": {
+    "title": "title",
+    "art" : {
+      "field": "art"
+    },
+    "subtitle": "subtitle"
+  }
+}
+)";
+
+/**
+ * Define the layout for the forecast results.
  *
  * The icon size is small, and ask for the card layout
  * itself to be horizontal. I.e. the text will be placed
  * next to the image.
  */
-const static string WEATHER_TEMPLATE =
+const static string FORECAST_TEMPLATE =
         R"(
 {
   "schema-version": 1,
@@ -73,33 +92,10 @@
   }
 }
 )";
-
-/**
- * Define the larger "current weather" layout.
- *
- * The icons are larger.
- */
-const static string CITY_TEMPLATE =
-        R"(
-{
-  "schema-version": 1,
-  "template": {
-    "category-layout": "grid",
-    "card-size": "medium"
-  },
-  "components": {
-    "title": "title",
-    "art" : {
-      "field": "art"
-    },
-    "subtitle": "subtitle"
-  }
-}
-)";
 @endif
 
 Query::Query(const sc::CannedQuery &query, const sc::SearchMetadata &metadata,
-        Config::Ptr config) :
+        Client::Config::Ptr config) :
         sc::SearchQueryBase(query, metadata), client_(config) {
 }
 
@@ -113,8 +109,8 @@
         // Start by getting information about the query
         const sc::CannedQuery &query(sc::SearchQueryBase::query());
 
-        // Trim the query string of whitespace
-        string query_string = alg::trim_copy(query.query_string());
+        // Get the query string
+        string query_string = query.query_string();
 
         // the Client is the helper class that provides the results
         // without mixing APIs and scopes code.
@@ -168,8 +164,10 @@
         // Start by getting information about the query
         const sc::CannedQuery &query(sc::SearchQueryBase::query());
 
-        // Trim the query string of whitespace
-        string query_string = alg::trim_copy(query.query_string());
+        // Get the query string
+        string query_string = query.query_string();
+
+        /// Populate current weather category
 
         // the Client is the helper class that provides the results
         // without mixing APIs and scopes code.
@@ -190,7 +188,7 @@
 
         // Register a category for the current weather, with the title we just built
         auto location_cat = reply->register_category("current", ss.str(), "",
-                sc::CategoryRenderer(CITY_TEMPLATE));
+                                                     sc::CategoryRenderer(CURRENT_TEMPLATE));
 
         {
             // Create a single result for the current weather category
@@ -218,6 +216,8 @@
             }
         }
 
+        /// Populate weather forecast category
+
         Client::Forecast forecast;
         if (query_string.empty()) {
             // If there is no search string, get the forecast for London
@@ -228,8 +228,8 @@
         }
 
         // Register a category for the forecast
-        auto forecast_cat = reply->register_category("forecast",
-                _("7 day forecast"), "", sc::CategoryRenderer(WEATHER_TEMPLATE));
+        auto forecast_cat = reply->register_category("forecast", _("7 day forecast"), "",
+                                                     sc::CategoryRenderer(FORECAST_TEMPLATE));
 
         // For each of the forecast days
         for (const auto &weather : forecast.weather) {

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/query.h' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/query.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/query.h	2014-09-03 14:56:27 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/query.h	2015-05-19 10:38:08 +0000
@@ -1,13 +1,11 @@
-#ifndef SCOPE_QUERY_H_
-#define SCOPE_QUERY_H_
+#ifndef QUERY_H_
+#define QUERY_H_
 
-#include <api/client.h>
+#include <client.h>
 
 #include <unity/scopes/SearchQueryBase.h>
 #include <unity/scopes/ReplyProxyFwd.h>
 
-namespace scope {
-
 /**
  * Represents an individual query.
  *
@@ -18,7 +16,7 @@
 class Query: public unity::scopes::SearchQueryBase {
 public:
     Query(const unity::scopes::CannedQuery &query,
-            const unity::scopes::SearchMetadata &metadata, api::Config::Ptr config);
+            const unity::scopes::SearchMetadata &metadata, Client::Config::Ptr config);
 
     ~Query() = default;
 
@@ -27,10 +25,8 @@
     void run(const unity::scopes::SearchReplyProxy &reply) override;
 
 private:
-    api::Client client_;
+    Client client_;
 };
 
-}
-
-#endif // SCOPE_QUERY_H_
+#endif // QUERY_H_
 

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/src/scope/scope.cpp	2014-10-27 16:24:10 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/scope.cpp	2015-05-19 10:38:08 +0000
@@ -1,7 +1,7 @@
-#include <scope/localization.h>
-#include <scope/preview.h>
-#include <scope/query.h>
-#include <scope/scope.h>
+#include <preview.h>
+#include <query.h>
+#include <scope.h>
+#include <localization.h>
 
 #include <iostream>
 #include <sstream>
@@ -9,11 +9,9 @@
 
 namespace sc = unity::scopes;
 using namespace std;
-using namespace api;
-using namespace scope;
 
 void Scope::start(string const&) {
-    config_ = make_shared<Config>();
+    config_ = make_shared<Client::Config>();
 
     setlocale(LC_ALL, "");
     string translation_directory = ScopeBase::scope_directory()

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/include/scope/scope.h' => 'share/qtcreator/templates/wizards/ubuntu/scope/src/scope.h'
--- share/qtcreator/templates/wizards/ubuntu/scope/include/scope/scope.h	2014-09-03 14:56:27 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/src/scope.h	2015-05-19 10:38:08 +0000
@@ -1,7 +1,7 @@
-#ifndef SCOPE_SCOPE_H_
-#define SCOPE_SCOPE_H_
+#ifndef SCOPE_H_
+#define SCOPE_H_
 
-#include <api/config.h>
+#include <client.h>
 
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/QueryBase.h>
@@ -9,8 +9,6 @@
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/PreviewQueryBase.h>
 
-namespace scope {
-
 /**
  * Defines the lifecycle of scope plugin, and acts as a factory
  * for Query and Preview objects.
@@ -45,9 +43,7 @@
             unity::scopes::SearchMetadata const&) override;
 
 protected:
-    api::Config::Ptr config_;
+    Client::Config::Ptr config_;
 };
 
-}
-
-#endif // SCOPE_SCOPE_H_
+#endif // SCOPE_H_

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt	2014-10-27 16:24:10 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/CMakeLists.txt	2015-05-19 10:38:08 +0000
@@ -19,14 +19,22 @@
 )
 
 # Where to find the scope ini file and .so
-add_definitions(
-  -DTEST_SCOPE_DIRECTORY="${CMAKE_BINARY_DIR}/src"
-)
+set(TEST_SCOPE_DIRECTORY "${CMAKE_BINARY_DIR}/src")
 
-@if "%ContentType%".substring(0, "network".length) === "network"
 file(GLOB_RECURSE
   TEST_FIXTURES
-  "server/*" 
+@if "%ContentType%" == "empty"
+  "unit/*.py"
+@elsif "%ContentType%" == "network-netcpp-json"
+  "server/*.json"
+  "*.py"
+@elsif "%ContentType%" == "network-netcpp-qjson"
+  "server/*.json"
+  "*.py"
+@elsif "%ContentType%" == "network-netcpp-qxml"
+  "server/*.xml"
+  "*.py"
+@endif
 )
 
 # Make this file show up in QtCreator
@@ -34,10 +42,9 @@
   SOURCES ${TEST_FIXTURES}
 )
 
+@if "%ContentType%".substring(0, "network".length) === "network"
 # Where to find the test server binary
-add_definitions(
-  -DFAKE_SERVER="${CMAKE_CURRENT_SOURCE_DIR}/server/server.py"
-)
+set(FAKE_SERVER "${CMAKE_CURRENT_SOURCE_DIR}/server/server.py")
 @endif
 
 # Add the unit tests

=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/London,uk.json' => 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/London,uk.json'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/London,uk.xml' => 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/London,uk.xml'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/Manchester,uk.json' => 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/Manchester,uk.json'
=== renamed file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily/Manchester,uk.xml' => 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/Manchester,uk.xml'
=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/forecast/daily'
=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/server/server.py'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/server/server.py	2014-10-29 16:46:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/server/server.py	2015-05-19 10:38:08 +0000
@@ -44,7 +44,7 @@
             if 'mode' in query:
                 mode = query['mode'][0]
 
-            self.wfile.write(bytes(read_file('forecast/daily/%s.%s' % (query['q'][0], mode)), 'UTF-8'))
+            self.wfile.write(bytes(read_file('forecast/%s.%s' % (query['q'][0], mode)), 'UTF-8'))
         else:
             self.send_response(404)
             self.send_header("Content-type", "text/html")

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/CMakeLists.txt	2014-10-29 15:28:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/CMakeLists.txt	2015-05-19 10:38:08 +0000
@@ -1,31 +1,13 @@
 
-# Our test executable.
-# It includes the object code from the scope
-add_executable(
-  scope-unit-tests
-  scope/test-scope.cpp
-  $<TARGET_OBJECTS:scope-static>
-)
-
-# Link against the scope, and all of our test lib dependencies
-target_link_libraries(
-  scope-unit-tests
-  ${GTEST_BOTH_LIBRARIES}
-  ${GMOCK_LIBRARIES}
-  ${SCOPE_LDFLAGS}
-  ${TEST_LDFLAGS}
-  ${Boost_LIBRARIES}
-)
-
-@if "%ContentType%".substring(0, "network-netcpp-q".length) === "network-netcpp-q"
-qt5_use_modules(
-  scope-unit-tests
-  Core
-)
-@endif
+# This command ensures that test-scope.py has execute permission
+execute_process(COMMAND chmod +x "${CMAKE_CURRENT_SOURCE_DIR}/test-scope.py")
 
 # Register the test with CTest
 add_test(
   scope-unit-tests
-  scope-unit-tests
+@if "%ContentType%" == "empty"
+  "${CMAKE_CURRENT_SOURCE_DIR}/test-scope.py" "${SCOPE_NAME}" "${TEST_SCOPE_DIRECTORY}/${SCOPE_NAME}.ini"
+@elsif "%ContentType%".substring(0, "network".length) === "network"
+  "${CMAKE_CURRENT_SOURCE_DIR}/test-scope.py" "${SCOPE_NAME}" "${TEST_SCOPE_DIRECTORY}/${SCOPE_NAME}.ini" "${FAKE_SERVER}"
+@endif
 )

=== removed directory 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope'
=== removed file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp	2014-10-27 16:24:10 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/scope/test-scope.cpp	1970-01-01 00:00:00 +0000
@@ -1,232 +0,0 @@
-#include <scope/scope.h>
-
-#include <core/posix/exec.h>
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-#include <string>
-#include <unity/scopes/SearchReply.h>
-#include <unity/scopes/SearchReplyProxyFwd.h>
-#include <unity/scopes/Variant.h>
-#include <unity/scopes/testing/Category.h>
-#include <unity/scopes/testing/MockSearchReply.h>
-#include <unity/scopes/testing/TypedScopeFixture.h>
-
-using namespace std;
-using namespace testing;
-using namespace scope;
-
-namespace posix = core::posix;
-namespace sc = unity::scopes;
-namespace sct = unity::scopes::testing;
-
-/**
- * Keep the tests in an anonymous namespace
- */
-namespace {
-
-/**
- * Custom matcher to check the properties of search results
- */
-MATCHER_P2(ResultProp, prop, value, "") {
-    if (arg.contains(prop)) {
-        *result_listener << "result[" << prop << "] is " << arg[prop].serialize_json();
-    } else {
-        *result_listener << "result[" << prop << "] is not set";
-    }
-    return arg.contains(prop) && arg[prop] == sc::Variant(value);
-}
-
-/**
- * Custom matcher to check the presence of departments
- */
-MATCHER_P(IsDepartment, department, "") {
-    return arg->serialize() == department->serialize();
-}
-
-typedef sct::TypedScopeFixture<Scope> TypedScopeFixtureScope;
-
-class TestScope: public TypedScopeFixtureScope {
-protected:
-@if "%ContentType%".substring(0, "network".length) === "network"
-    void SetUp() override
-    {
-        // Start up Python-based fake OpenWeatherMap server
-        fake_server_ = posix::exec("/usr/bin/python3", { FAKE_SERVER }, { },
-                posix::StandardStream::stdout);
-
-        // Check it's running
-        ASSERT_GT(fake_server_.pid(), 0);
-        string port;
-        // The server will print out the random port it is using
-        fake_server_.cout() >> port;
-        // Check we have a port
-        ASSERT_FALSE(port.empty());
-
-        // Build up the API root
-        string apiroot = "http://127.0.0.1:" + port;
-        // Override the API root that the scope will use
-        setenv("NETWORK_SCOPE_APIROOT", apiroot.c_str(), true);
-
-        // Do the parent SetUp
-        TypedScopeFixture::set_scope_directory(TEST_SCOPE_DIRECTORY);
-        TypedScopeFixtureScope::SetUp();
-    }
-
-    /**
-     * Start by assuming the server is invalid
-     */
-    posix::ChildProcess fake_server_ = posix::ChildProcess::invalid();
- @endif
-};
-
-TEST_F(TestScope, empty_search_string) {
-@if "%ContentType%".substring(0, "network".length) === "network"
-    const sc::CategoryRenderer renderer;
-    NiceMock<sct::MockSearchReply> reply;
-
-    // Build a query with an empty search string
-    sc::CannedQuery query(SCOPE_NAME, "", "");
-
-    // Expect the current weather category
-    EXPECT_CALL(reply, register_category("current", "London, GB", "", _)).Times(1)
-            .WillOnce(Return(make_shared<sct::Category>("current", "London, GB", "", renderer)));
-
-    // With one result
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "21.8°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/02d.png"),
-            ResultProp("subtitle", "few clouds")
-            )))).WillOnce(
-            Return(true));
-
-    // Expect the forecast category
-    EXPECT_CALL(reply, register_category("forecast", "7 day forecast", "", _)).Times(1)
-            .WillOnce(Return(make_shared<sct::Category>("forecast", "7 day forecast", "", renderer)));
-
-    // With seven results
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "25.1°C to 18.8°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "light rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "20.9°C to 15.5°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "moderate rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "19.6°C to 13.2°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/03d.png"),
-            ResultProp("subtitle", "scattered clouds")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "18.1°C to 13.5°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "moderate rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "17.4°C to 15.4°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "heavy intensity rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "18.4°C to 16.2°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "moderate rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "19°C to 16.7°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "light rain")
-        )))).WillOnce(Return(true));
-
-    sc::SearchReplyProxy reply_proxy(&reply, [](sc::SearchReply*) {}); // note: this is a std::shared_ptr with empty deleter
-    sc::SearchMetadata meta_data("en_EN", "phone");
-
-    // Create a query object
-    auto search_query = scope->search(query, meta_data);
-    ASSERT_NE(nullptr, search_query);
-
-    // Run the search
-    search_query->run(reply_proxy);
-
-    // Google Mock will make assertions when the mocks are destructed.
-@endif
-}
-
-TEST_F(TestScope, search) {
-@if "%ContentType%".substring(0, "network".length) === "network"
-    const sc::CategoryRenderer renderer;
-    NiceMock<sct::MockSearchReply> reply;
-
-    // Build a query with a non-empty search string
-    sc::CannedQuery query(SCOPE_NAME, "Manchester,uk", "");
-
-    // Expect the current weather category
-    EXPECT_CALL(reply, register_category("current", "Manchester, GB", "", _)).Times(1)
-            .WillOnce(Return(make_shared<sct::Category>("current", "Manchester, GB", "", renderer)));
-
-    // With one result
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "17.4°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/03d.png"),
-            ResultProp("subtitle", "scattered clouds")
-            )))).WillOnce(
-            Return(true));
-
-    // Expect the forecast category
-    EXPECT_CALL(reply, register_category("forecast", "7 day forecast", "", _)).Times(1)
-            .WillOnce(Return(make_shared<sct::Category>("forecast", "7 day forecast", "", renderer)));
-
-    // With seven results
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "18.8°C to 12°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/01d.png"),
-            ResultProp("subtitle", "sky is clear")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "18.6°C to 12.3°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "moderate rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "17.1°C to 10.8°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/04d.png"),
-            ResultProp("subtitle", "broken clouds")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "16°C to 12.2°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "moderate rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "15.7°C to 13°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "light rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "17.6°C to 14.1°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "moderate rain")
-        )))).WillOnce(Return(true));
-    EXPECT_CALL(reply, push(Matcher<sc::CategorisedResult const&>(AllOf(
-            ResultProp("title", "15.5°C to 13.4°C"),
-            ResultProp("art", "http://openweathermap.org/img/w/10d.png"),
-            ResultProp("subtitle", "moderate rain")
-        )))).WillOnce(Return(true));
-
-    sc::SearchReplyProxy reply_proxy(&reply, [](sc::SearchReply*) {}); // note: this is a std::shared_ptr with empty deleter
-    sc::SearchMetadata meta_data("en_EN", "phone");
-
-    // Create a query object
-    auto search_query = scope->search(query, meta_data);
-    ASSERT_NE(nullptr, search_query);
-
-    // Run the search
-    search_query->run(reply_proxy);
-
-    // Google Mock will make assertions when the mocks are destructed.
-@endif
-}
-
-} // namespace

=== added file 'share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py'
--- share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/tests/unit/test-scope.py	2015-05-19 10:38:08 +0000
@@ -0,0 +1,290 @@
+#!/usr/bin/env python3
+
+from scope_harness import *
+from scope_harness.testing import *
+import unittest, sys, os
+from subprocess import Popen, PIPE
+
+@if "%ContentType%".substring(0, "network".length) === "network"
+class AppsTest (ScopeHarnessTestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.process = Popen(["/usr/bin/python3", FAKE_SERVER], stdout=PIPE)
+        port = cls.process.stdout.readline().decode("utf-8").rstrip('\n')
+        os.environ["NETWORK_SCOPE_APIROOT"] = "http://127.0.0.1:" + port
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.process.terminate()
+
+
+    def start_harness(self):
+        self.harness = ScopeHarness.new_from_scope_list(Parameters([SCOPE_INI]))
+        self.view = self.harness.results_view
+        self.view.active_scope = SCOPE_NAME
+
+
+@if "%ContentType%" == "network-netcpp-qxml"
+    def test_surfacing_results(self):
+        self.start_harness()
+        self.view.search_query = ''
+
+        match = CategoryListMatcher() \
+            .has_exactly(2) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("current") \
+                .title("London, GB") \
+                .has_at_least(1) \
+                .result(ResultMatcher("2643743") \
+                    .title("21.8°C") \
+                    .art("http://openweathermap.org/img/w/02d.png") \
+                    .subtitle("few clouds") ) ) \
+            .category(CategoryMatcher("forecast") \
+                .title("7 day forecast") \
+                .has_at_least(7) \
+                .result(ResultMatcher("1000000") \
+                    .title("25.1°C to 18.8°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) \
+                .result(ResultMatcher("1000001") \
+                    .title("20.9°C to 15.5°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("1000002") \
+                    .title("19.6°C to 13.2°C") \
+                    .art("http://openweathermap.org/img/w/03d.png") \
+                    .subtitle("scattered clouds") ) \
+                .result(ResultMatcher("1000003") \
+                    .title("18.1°C to 13.5°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("1000004") \
+                    .title("17.4°C to 15.4°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("heavy intensity rain") ) \
+                .result(ResultMatcher("1000005") \
+                    .title("18.4°C to 16.2°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("1000006") \
+                    .title("19°C to 16.7°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+@else
+    def test_surfacing_results(self):
+        self.start_harness()
+        self.view.search_query = ''
+
+        match = CategoryListMatcher() \
+            .has_exactly(2) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("current") \
+                .title("London, GB") \
+                .has_at_least(1) \
+                .result(ResultMatcher("5091") \
+                    .title("21.8°C") \
+                    .art("http://openweathermap.org/img/w/02d.png") \
+                    .subtitle("few clouds") ) ) \
+            .category(CategoryMatcher("forecast") \
+                .title("7 day forecast") \
+                .has_at_least(7) \
+                .result(ResultMatcher("500") \
+                    .title("25.1°C to 18.8°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("20.9°C to 15.5°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("802") \
+                    .title("19.6°C to 13.2°C") \
+                    .art("http://openweathermap.org/img/w/03d.png") \
+                    .subtitle("scattered clouds") ) \
+                .result(ResultMatcher("501") \
+                    .title("18.1°C to 13.5°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("502") \
+                    .title("17.4°C to 15.4°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("heavy intensity rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("18.4°C to 16.2°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("500") \
+                    .title("19°C to 16.7°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+@endif
+
+
+@if "%ContentType%" == "network-netcpp-qxml"
+    def test_search_results(self):
+        self.start_harness()
+        self.view.search_query = 'Manchester,uk'
+
+        match = CategoryListMatcher() \
+            .has_exactly(2) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("current") \
+                .title("Manchester, GB") \
+                .has_at_least(1) \
+                .result(ResultMatcher("2643123") \
+                    .title("17.4°C") \
+                    .art("http://openweathermap.org/img/w/03d.png") \
+                    .subtitle("scattered clouds") ) ) \
+            .category(CategoryMatcher("forecast") \
+                .title("7 day forecast") \
+                .has_at_least(7) \
+                .result(ResultMatcher("1000000") \
+                    .title("18.8°C to 12°C") \
+                    .art("http://openweathermap.org/img/w/01d.png") \
+                    .subtitle("sky is clear") ) \
+                .result(ResultMatcher("1000001") \
+                    .title("18.6°C to 12.3°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("1000002") \
+                    .title("17.1°C to 10.8°C") \
+                    .art("http://openweathermap.org/img/w/04d.png") \
+                    .subtitle("broken clouds") ) \
+                .result(ResultMatcher("1000003") \
+                    .title("16°C to 12.2°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("1000004") \
+                    .title("15.7°C to 13°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) \
+                .result(ResultMatcher("1000005") \
+                    .title("17.6°C to 14.1°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("1000006") \
+                    .title("15.5°C to 13.4°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+@else
+    def test_search_results(self):
+        self.start_harness()
+        self.view.search_query = 'Manchester,uk'
+
+        match = CategoryListMatcher() \
+            .has_exactly(2) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("current") \
+                .title("Manchester, GB") \
+                .has_at_least(1) \
+                .result(ResultMatcher("5060") \
+                    .title("17.4°C") \
+                    .art("http://openweathermap.org/img/w/03d.png") \
+                    .subtitle("scattered clouds") ) ) \
+            .category(CategoryMatcher("forecast") \
+                .title("7 day forecast") \
+                .has_at_least(7) \
+                .result(ResultMatcher("800") \
+                    .title("18.8°C to 12°C") \
+                    .art("http://openweathermap.org/img/w/01d.png") \
+                    .subtitle("sky is clear") ) \
+                .result(ResultMatcher("501") \
+                    .title("18.6°C to 12.3°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("803") \
+                    .title("17.1°C to 10.8°C") \
+                    .art("http://openweathermap.org/img/w/04d.png") \
+                    .subtitle("broken clouds") ) \
+                .result(ResultMatcher("501") \
+                    .title("16°C to 12.2°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("500") \
+                    .title("15.7°C to 13°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("17.6°C to 14.1°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("15.5°C to 13.4°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+@endif
+
+
+if __name__ == '__main__':
+    SCOPE_NAME = sys.argv[1]
+    SCOPE_INI = sys.argv[2]
+    FAKE_SERVER = sys.argv[3]
+
+    unittest.main(argv = sys.argv[:1])
+
+@elsif "%ContentType%" == "empty"
+class AppsTest (ScopeHarnessTestCase):
+    def start_harness(self):
+        self.harness = ScopeHarness.new_from_scope_list(Parameters([SCOPE_INI]))
+        self.view = self.harness.results_view
+        self.view.active_scope = SCOPE_NAME
+
+
+    def test_surfacing_results(self):
+        self.start_harness()
+        self.view.search_query = ''
+
+        match = CategoryListMatcher() \
+            .has_exactly(1) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("results") \
+                .title("2 results") \
+                .has_at_least(2) \
+                .result(ResultMatcher("uri") \
+                    .title("default") \
+                    .art("art.png") \
+                    .subtitle("subtitle") ) \
+                .result(ResultMatcher("uri2") \
+                    .title("default") \
+                    .art("art2.png") \
+                    .subtitle("subtitle2") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+
+
+    def test_search_results(self):
+        self.start_harness()
+        self.view.search_query = 'test'
+
+        match = CategoryListMatcher() \
+            .has_exactly(1) \
+            .mode(CategoryListMatcherMode.BY_ID) \
+            .category(CategoryMatcher("results") \
+                .title("2 results") \
+                .has_at_least(2) \
+                .result(ResultMatcher("uri") \
+                    .title("test") \
+                    .art("art.png") \
+                    .subtitle("subtitle") ) \
+                .result(ResultMatcher("uri2") \
+                    .title("test") \
+                    .art("art2.png") \
+                    .subtitle("subtitle2") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+
+
+if __name__ == '__main__':
+    SCOPE_NAME = sys.argv[1]
+    SCOPE_INI = sys.argv[2]
+
+    unittest.main(argv = sys.argv[:1])
+
+@endif

=== modified file 'share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2015-01-15 12:51:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/scope/wizard.xml	2015-05-19 10:38:08 +0000
@@ -9,37 +9,31 @@
     <displayname>Unity Scope (cmake)</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
-        <file source="cmake/FindGMock.cmake"/>
-        <file source="cmake/FindIntltool.cmake"/>
-
-        <file source="data/CMakeLists.txt"/>
-        <file source="data/displayName.ini.in" target="data/%ProjectName:l%.%ClickDomain:l%_%ClickHookName:l%.ini.in"/>
-        <file source="data/icon.png" binary="true"/>
-        <file source="data/logo.png" binary="true"/>
-        <file source="data/screenshot.png" binary="true"/>
-
-        <file source="include/api/config.h"/>
-        <file source="include/api/client.h"/>
-        <file source="include/scope/localization.h"/>
-        <file source="include/scope/preview.h"/>
-        <file source="include/scope/query.h"/>
-        <file source="include/scope/scope.h"/>
-
         <file source="src/CMakeLists.txt"/>
-        <file source="src/api/client.cpp"/>
-        <file source="src/scope/query.cpp"/>
-        <file source="src/scope/scope.cpp" openeditor="true"/>
-        <file source="src/scope/preview.cpp"/>
+        <file source="src/data/displayName.ini.in" target="src/data/%ClickHookName:l%.ini.in"/>
+        <file source="src/data/displayName-settings.ini.in" target="src/data/%ClickHookName:l%-settings.ini.in"/>
+        <file source="src/data/icon.png" binary="true"/>
+        <file source="src/data/logo.png" binary="true"/>
+        <file source="src/data/screenshot.png" binary="true"/>
+        <file source="src/client.cpp"/>
+        <file source="src/client.h"/>
+        <file source="src/localization.h"/>
+        <file source="src/preview.cpp"/>
+        <file source="src/preview.h"/>
+        <file source="src/query.cpp"/>
+        <file source="src/query.h"/>
+        <file source="src/scope.cpp" openeditor="true"/>
+        <file source="src/scope.h"/>
 
         <file source="po/CMakeLists.txt"/>
         <file source="po/displayName.pot" target="po/%ProjectName:l%.pot"/>
         <file source="po/Makefile.in.in"/>
         <file source="po/POTFILES.in"/>
 
-        <file source="tests/server/forecast/daily/Manchester,uk.json"/>
-        <file source="tests/server/forecast/daily/Manchester,uk.xml"/>
-        <file source="tests/server/forecast/daily/London,uk.json"/>
-        <file source="tests/server/forecast/daily/London,uk.xml"/>
+        <file source="tests/server/forecast/Manchester,uk.json"/>
+        <file source="tests/server/forecast/Manchester,uk.xml"/>
+        <file source="tests/server/forecast/London,uk.json"/>
+        <file source="tests/server/forecast/London,uk.xml"/>
         <file source="tests/server/weather/Manchester,uk.json"/>
         <file source="tests/server/weather/Manchester,uk.xml"/>
         <file source="tests/server/weather/London,uk.json"/>
@@ -47,7 +41,7 @@
         <file source="tests/server/server.py"/>
         <file source="tests/CMakeLists.txt"/>
         <file source="tests/unit/CMakeLists.txt"/>
-        <file source="tests/unit/scope/test-scope.cpp"/>
+        <file source="tests/unit/test-scope.py"/>
 
         <file source="CMakeLists.txt" openproject="true"/>
         <file source="displayName.apparmor" target="%ClickHookName:l%.apparmor"/>