Merge lp:~marcustomlinson/unity-js-scopes/add-harness-tests into lp:unity-js-scopes

[Marcus Tomlinson]

Add initial integration level tests using the scope-harness testing framework

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/51/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/51/console

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

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-js-scopes/add-harness-tests]

108. By Marcus Tomlinson on 2015-11-09

Added missing copyrights

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:108
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/52/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/52/console

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

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-js-scopes/add-harness-tests]

109. By Marcus Tomlinson on 2015-11-09

Add google-mock to dependancies

110. By Marcus Tomlinson on 2015-11-09

Actually, add cmake-extras

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/53/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/54/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/54/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/53/console

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

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/unity-js-scopes/add-harness-tests]

111. By Marcus Tomlinson on 2015-11-09

Add google-mock to dependancies

112. By Marcus Tomlinson on 2015-11-09

Add python3-scope-harness dependancy

113. By Marcus Tomlinson on 2015-11-09

Clean up

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/54/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/54/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/55

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-25 19:03:30 +0000
+++ CMakeLists.txt	2015-11-09 15:16:03 +0000
@@ -69,3 +69,12 @@
         DESTINATION /usr/share/qtcreator/templates/wizards/ubuntu)
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qtc-templates/scope-js
         DESTINATION /usr/ubuntu-sdk-ide/share/qtcreator/templates/wizards/ubuntu)
+
+# Set up the tests
+enable_testing()
+add_subdirectory(tests)
+
+add_custom_target(
+  check
+  ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
+)

=== modified file 'debian/control'
--- debian/control	2015-10-27 14:43:23 +0000
+++ debian/control	2015-11-09 15:16:03 +0000
@@ -5,9 +5,10 @@
 Build-Depends: bzr,
                cmake (>= 2.8.9),
                debhelper (>= 9),
+               g++,
                pkg-config,
                python3,
-               g++,
+               python3-scope-harness,
                libboost-filesystem-dev,
                libunity-scopes-dev,
 Standards-Version: 3.9.5

=== modified file 'src/bindings/CMakeLists.txt'
--- src/bindings/CMakeLists.txt	2015-10-08 20:34:00 +0000
+++ src/bindings/CMakeLists.txt	2015-11-09 15:16:03 +0000
@@ -87,6 +87,22 @@
   ${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NODEJS_ADDON_BIN_NAME}.node
   )
 
+add_custom_command(
+  TARGET ${SCOPE_NODEJS_ADDON_BIN_NAME} POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E make_directory
+    "${CMAKE_BINARY_DIR}/tests/node_modules/unity-js-scopes/lib"
+
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    "${CMAKE_CURRENT_BINARY_DIR}/unity_js_scopes_bindings.node"
+    "${CMAKE_BINARY_DIR}/tests/node_modules/unity-js-scopes"
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    "${CMAKE_CURRENT_SOURCE_DIR}/index.js"
+    "${CMAKE_BINARY_DIR}/tests/node_modules/unity-js-scopes"
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/scope-core.js"
+    "${CMAKE_BINARY_DIR}/tests/node_modules/unity-js-scopes/lib"
+)
+
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/deps/io.js/deps/npm
   DESTINATION /node_modules
   USE_SOURCE_PERMISSIONS

=== modified file 'src/launcher/CMakeLists.txt'
--- src/launcher/CMakeLists.txt	2015-09-30 06:10:51 +0000
+++ src/launcher/CMakeLists.txt	2015-11-09 15:16:03 +0000
@@ -68,5 +68,15 @@
   ${Boost_LIBRARIES}
   )
 
+add_custom_command(
+  TARGET ${LAUNCHER_EXECUTABLE_NAME} POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E make_directory
+    "${CMAKE_BINARY_DIR}/tests/node_modules/unity-js-scopes/bin"
+
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+    "${CMAKE_CURRENT_BINARY_DIR}/unity-js-scopes-launcher"
+    "${CMAKE_BINARY_DIR}/tests/node_modules/unity-js-scopes/bin"
+)
+
 install(TARGETS ${LAUNCHER_EXECUTABLE_NAME}
         RUNTIME DESTINATION /usr/bin)

=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2015-11-09 15:16:03 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(owm_scope)

=== added directory 'tests/owm_scope'
=== added file 'tests/owm_scope/CMakeLists.txt'
--- tests/owm_scope/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/CMakeLists.txt	2015-11-09 15:16:03 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(scope)
+add_subdirectory(tests)

=== added directory 'tests/owm_scope/scope'
=== added file 'tests/owm_scope/scope/CMakeLists.txt'
--- tests/owm_scope/scope/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/scope/CMakeLists.txt	2015-11-09 15:16:03 +0000
@@ -0,0 +1,11 @@
+configure_file(
+  "owm_scope.ini"
+  "${CMAKE_CURRENT_BINARY_DIR}/owm_scope.ini"
+  @ONLY COPYONLY
+)
+
+configure_file(
+  "owm_scope.js"
+  "${CMAKE_CURRENT_BINARY_DIR}/owm_scope.js"
+  @ONLY COPYONLY
+)

=== added file 'tests/owm_scope/scope/owm_scope.ini'
--- tests/owm_scope/scope/owm_scope.ini	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/scope/owm_scope.ini	2015-11-09 15:16:03 +0000
@@ -0,0 +1,5 @@
+[ScopeConfig]
+ScopeRunner=../../node_modules/unity-js-scopes/bin/unity-js-scopes-launcher %S %R
+DisplayName=OpenWeatherMap Test Scope
+Description=This is an OpenWeatherMap test scope
+Author=WebApps <[e-mail]>

=== added file 'tests/owm_scope/scope/owm_scope.js'
--- tests/owm_scope/scope/owm_scope.js	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/scope/owm_scope.js	2015-11-09 15:16:03 +0000
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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.
+ *
+ * unity-js-scopes is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+var scopes = require('unity-js-scopes')
+var http = require('http');
+
+var query_host = process.env.NETWORK_SCOPE_APIROOT ? process.env.NETWORK_SCOPE_APIROOT : "api.openweathermap.org";
+var query_host_port = process.env.NETWORK_SCOPE_APIPORT ? process.env.NETWORK_SCOPE_APIPORT : 80;
+var current_weather_path = "/data/2.5/weather?units=metric&APPID=2b12bf09b4e0ab0c1aa5e32a9a3f0cdc&q="
+var forecast_weather_path = "/data/2.5/forecast/daily?units=metric&cnt=7&APPID=2b12bf09b4e0ab0c1aa5e32a9a3f0cdc&q="
+
+var CURRENT_TEMPLATE = {
+    "schema-version": 1,
+    "template": {
+        "category-layout": "grid",
+        "card-size": "medium"
+    },
+    "components": {
+        "title": "title",
+        "art": {
+            "field": "art"
+        },
+        "subtitle": "subtitle"
+    }
+}
+
+var FORECAST_TEMPLATE = {
+    "schema-version": 1,
+    "template": {
+        "category-layout": "grid",
+        "card-layout": "horizontal",
+        "card-size": "small"
+    },
+    "components": {
+        "title": "title",
+        "art" : {
+            "field": "art"
+        },
+        "subtitle": "subtitle"
+    }
+}
+
+scopes.self.initialize(
+    {}
+    ,
+    {
+        run: function() {
+            console.log('Running...')
+        },
+        start: function(scope_id) {
+            console.log('Starting scope id: '
+                        + scope_id
+                        + ', '
+                        + scopes.self.scope_directory)
+        },
+        search: function(canned_query, metadata) {
+            return new scopes.lib.SearchQuery(
+                canned_query,
+                metadata,
+                // run
+                function(search_reply) {
+                    var qs = canned_query.query_string();
+                    if (!qs) {
+                        qs = "London,uk"
+                    }
+
+                    var current_weather_cb = function(response) {
+                        var res = '';
+
+                        // Another chunk of data has been recieved, so append it to res
+                        response.on('data', function(chunk) {
+                            res += chunk;
+                        });
+
+                        // The whole response has been recieved
+                        response.on('end', function() {
+                            r = JSON.parse(res);
+
+                            var category_renderer = new scopes.lib.CategoryRenderer(JSON.stringify(CURRENT_TEMPLATE));
+                            var category = search_reply.register_category("current", r.name + ", " + r.sys.country, "", category_renderer);
+
+                            var categorised_result = new scopes.lib.CategorisedResult(category);
+                            categorised_result.set_uri(r.id.toString());
+                            categorised_result.set_title(r.main.temp.toString() + "°C");
+                            categorised_result.set_art("http://openweathermap.org/img/w/" + r.weather[0].icon + ".png");
+                            categorised_result.set("subtitle", r.weather[0].description);
+                            categorised_result.set("description", "A description of the result");
+
+                            search_reply.push(categorised_result);
+
+                            // Now call back into the API for a 7 day forecast
+                            http.request({host: query_host, port: query_host_port, path: forecast_weather_path + qs}, forecase_weather_cb).end();
+                        });
+                    }
+
+                    var forecase_weather_cb = function(response) {
+                        var res = '';
+
+                        // Another chunk of data has been recieved, so append it to res
+                        response.on('data', function(chunk) {
+                            res += chunk;
+                        });
+
+                        // The whole response has been recieved
+                        response.on('end', function() {
+                            try {
+                                r = JSON.parse(res);
+
+                                var category_renderer = new scopes.lib.CategoryRenderer(JSON.stringify(FORECAST_TEMPLATE));
+                                var category = search_reply.register_category("forecast", "7 day forecast", "", category_renderer);
+
+                                for (i = 0; i < r.list.length; i++) {
+                                    var categorised_result = new scopes.lib.CategorisedResult(category);
+                                    categorised_result.set_uri(r.list[i].weather[0].id.toString());
+                                    categorised_result.set_title(r.list[i].temp.min.toString() + "°C to "
+                                                               + r.list[i].temp.max.toString() + "°C");
+                                    categorised_result.set_art("http://openweathermap.org/img/w/" + r.list[i].weather[0].icon + ".png");
+                                    categorised_result.set("subtitle", r.list[i].weather[0].description);
+                                    categorised_result.set("description", "A description of the result");
+
+                                    search_reply.push(categorised_result);
+                                }
+
+                                // We are done, call finished() on our search_reply
+                                search_reply.finished();
+                            }
+                            catch(e) {
+                                // Forecast not available
+                                console.log("Forecast for '" + qs + "' is unavailable: " + e)
+
+                                // We are done, call finished() on our search_reply
+                                search_reply.finished();
+                            }
+                        });
+                    }
+
+                    http.request({host: query_host, port: query_host_port, path: current_weather_path + qs}, current_weather_cb).end();
+                },
+                // cancelled
+                function() {
+                });
+        },
+        preview: function(result, action_metadata) {
+            return new scopes.lib.PreviewQuery(
+                result,
+                action_metadata,
+                // run
+                function(preview_reply) {
+                    var layout1col = new scopes.lib.ColumnLayout(1);
+                    var layout2col = new scopes.lib.ColumnLayout(2);
+                    var layout3col = new scopes.lib.ColumnLayout(3);
+                    layout1col.add_column(["image", "header", "summary"]);
+
+                    layout2col.add_column(["image"]);
+                    layout2col.add_column(["header", "summary"]);
+
+                    layout3col.add_column(["image"]);
+                    layout3col.add_column(["header", "summary"]);
+                    layout3col.add_column([]);
+
+                    preview_reply.register_layout([layout1col, layout2col, layout3col]);
+
+                    var header = new scopes.lib.PreviewWidget("header", "header");
+                    header.add_attribute_mapping("title", "title");
+                    header.add_attribute_mapping("subtitle", "subtitle");
+
+                    var image = new scopes.lib.PreviewWidget("image", "image");
+                    image.add_attribute_mapping("source", "art");
+
+                    var description = new scopes.lib.PreviewWidget("summary", "text");
+                    description.add_attribute_mapping("text", "description");
+
+                    preview_reply.push([image, header, description ]);
+                    preview_reply.finished();
+                },
+                // cancelled
+                function() {
+                });
+        }
+    }
+);
+

=== added directory 'tests/owm_scope/tests'
=== added file 'tests/owm_scope/tests/CMakeLists.txt'
--- tests/owm_scope/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/tests/CMakeLists.txt	2015-11-09 15:16:03 +0000
@@ -0,0 +1,22 @@
+file(GLOB_RECURSE
+  TEST_FIXTURES
+  "server/*.json"
+  "*.py"
+)
+
+# Make these files show up in QtCreator
+add_custom_target(hidden_test_fixtures ALL
+  SOURCES ${TEST_FIXTURES}
+)
+
+# Where to find the scope ini file
+set(TEST_SCOPE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../scope")
+
+# Where to find the test server binary
+set(FAKE_SERVER "${CMAKE_CURRENT_SOURCE_DIR}/server/server.py")
+
+# Register the test with CTest
+add_test(
+  owm_scope-tests
+  "${CMAKE_CURRENT_SOURCE_DIR}/test-scope.py" "owm_scope" "${TEST_SCOPE_DIRECTORY}/owm_scope.ini" "${FAKE_SERVER}"
+)

=== added directory 'tests/owm_scope/tests/server'
=== added directory 'tests/owm_scope/tests/server/forecast'
=== added file 'tests/owm_scope/tests/server/forecast/London,uk.json'
--- tests/owm_scope/tests/server/forecast/London,uk.json	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/tests/server/forecast/London,uk.json	2015-11-09 15:16:03 +0000
@@ -0,0 +1,1 @@
+{"cod":"200","message":0.1117,"city":{"id":2643743,"name":"London","coord":{"lon":-0.12574,"lat":51.50853},"country":"GB","population":0,"sys":{"population":0}},"cnt":7,"list":[{"dt":1407412800,"temp":{"day":23.33,"min":18.84,"max":25.09,"night":18.84,"eve":24.17,"morn":20.76},"pressure":1018.23,"humidity":83,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":1.87,"deg":295,"clouds":12,"rain":0.5},{"dt":1407499200,"temp":{"day":19.44,"min":15.54,"max":20.86,"night":15.54,"eve":18.28,"morn":16.21},"pressure":1010.57,"humidity":97,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":4.01,"deg":143,"clouds":92,"rain":8},{"dt":1407585600,"temp":{"day":18.78,"min":13.19,"max":19.58,"night":13.19,"eve":18.95,"morn":14.03},"pressure":1010.78,"humidity":83,"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"speed":5.46,"deg":281,"clouds":32},{"dt":1407672000,"temp":{"day":18.09,"min":13.46,"max":18.09,"night":13.46,"eve":16.58,"morn":13.91},"pressure":1002.33,"humidity":67,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.68,"deg":162,"clouds":92,"rain":4},{"dt":1407758400,"temp":{"day":17.38,"min":15.39,"max":17.38,"night":16.3,"eve":17.03,"morn":15.39},"pressure":1008.2,"humidity":0,"weather":[{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"}],"speed":13.52,"deg":245,"clouds":74,"rain":12.63},{"dt":1407844800,"temp":{"day":18.44,"min":16.17,"max":18.44,"night":16.83,"eve":18.02,"morn":16.17},"pressure":1009.94,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.93,"deg":251,"clouds":60,"rain":5.25},{"dt":1407931200,"temp":{"day":18.8,"min":16.67,"max":19.02,"night":16.77,"eve":19.02,"morn":16.67},"pressure":1013.17,"humidity":0,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":9.88,"deg":275,"clouds":85,"rain":1.35}]}

=== added file 'tests/owm_scope/tests/server/forecast/Manchester,uk.json'
--- tests/owm_scope/tests/server/forecast/Manchester,uk.json	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/tests/server/forecast/Manchester,uk.json	2015-11-09 15:16:03 +0000
@@ -0,0 +1,1 @@
+{"cod":"200","message":0.0056,"city":{"id":2643123,"name":"Manchester","coord":{"lon":-2.23743,"lat":53.480949},"country":"GB","population":0,"sys":{"population":0}},"cnt":7,"list":[{"dt":1407412800,"temp":{"day":17.91,"min":11.96,"max":18.83,"night":11.96,"eve":18.01,"morn":16.13},"pressure":1014.82,"humidity":77,"weather":[{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"}],"speed":3.32,"deg":303,"clouds":0},{"dt":1407499200,"temp":{"day":18.59,"min":12.33,"max":18.59,"night":12.33,"eve":14.55,"morn":14.69},"pressure":1008.22,"humidity":79,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":3.46,"deg":163,"clouds":92,"rain":11},{"dt":1407585600,"temp":{"day":15.8,"min":10.79,"max":17.11,"night":10.79,"eve":16.89,"morn":13.19},"pressure":1005.76,"humidity":92,"weather":[{"id":803,"main":"Clouds","description":"broken clouds","icon":"04d"}],"speed":5.61,"deg":279,"clouds":56},{"dt":1407672000,"temp":{"day":15.29,"min":12.21,"max":15.98,"night":12.41,"eve":15.98,"morn":12.21},"pressure":995.36,"humidity":95,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.75,"deg":137,"clouds":92,"rain":5},{"dt":1407758400,"temp":{"day":15.73,"min":12.99,"max":15.73,"night":13.8,"eve":15.23,"morn":12.99},"pressure":990.16,"humidity":0,"weather":[{"id":500,"main":"Rain","description":"light rain","icon":"10d"}],"speed":9.02,"deg":239,"clouds":99,"rain":1.15},{"dt":1407844800,"temp":{"day":17.64,"min":14.08,"max":17.64,"night":14.08,"eve":14.92,"morn":14.12},"pressure":992.52,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":10.36,"deg":240,"clouds":45,"rain":4.84},{"dt":1407931200,"temp":{"day":14.35,"min":13.37,"max":15.52,"night":13.77,"eve":15.52,"morn":13.37},"pressure":999.39,"humidity":0,"weather":[{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"}],"speed":7.79,"deg":285,"clouds":92,"rain":5.98}]}

=== added file 'tests/owm_scope/tests/server/server.py'
--- tests/owm_scope/tests/server/server.py	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/tests/server/server.py	2015-11-09 15:16:03 +0000
@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2015 Canonical Ltd.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# 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 library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301  USA
+
+import http.server
+import os
+import socketserver
+import sys
+from urllib.parse import urlparse,parse_qs
+
+def read_file(path):
+    file = os.path.join(os.path.dirname(__file__), path)
+    if os.path.isfile(file):
+        with open(file, 'r') as fp:
+            content = fp.read()
+    else:
+        content = ''
+
+    return content
+
+class MyRequestHandler(http.server.BaseHTTPRequestHandler):
+    def do_GET(self):
+        sys.stderr.write("GET: %s\n" % self.path)
+        sys.stderr.flush()
+
+        parse = urlparse(self.path)
+        path = parse.path
+        query = parse_qs(parse.query)
+        
+        if path == '/data/2.5/weather':
+            self.send_response(200)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+
+            mode = 'json'
+            if 'mode' in query:
+                mode = query['mode'][0]
+
+            self.wfile.write(bytes(read_file('weather/%s.%s' % (query['q'][0], mode)), 'UTF-8'))
+        elif path == '/data/2.5/forecast/daily':
+            self.send_response(200)
+            self.send_header("Content-type", "text/html")
+            self.end_headers()
+
+            mode = 'json'
+            if 'mode' in query:
+                mode = query['mode'][0]
+
+            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")
+            self.end_headers()
+            self.wfile.write(bytes('ERROR', 'UTF-8'))
+
+if __name__ == "__main__":
+    Handler = MyRequestHandler
+    httpd = socketserver.TCPServer(("127.0.0.1", 0), Handler)
+
+    sys.stdout.write('%d\n' % httpd.server_address[1])
+    sys.stdout.flush()
+
+    httpd.serve_forever()

=== added directory 'tests/owm_scope/tests/server/weather'
=== added file 'tests/owm_scope/tests/server/weather/London,uk.json'
--- tests/owm_scope/tests/server/weather/London,uk.json	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/tests/server/weather/London,uk.json	2015-11-09 15:16:03 +0000
@@ -0,0 +1,1 @@
+{"coord":{"lon":-0.13,"lat":51.51},"sys":{"type":1,"id":5091,"message":0.29,"country":"GB","sunrise":1407386057,"sunset":1407440289},"weather":[{"id":801,"main":"Clouds","description":"few clouds","icon":"02d"}],"base":"cmc stations","main":{"temp":21.83,"pressure":1014,"humidity":53,"temp_min":20,"temp_max":24},"wind":{"speed":1.5,"deg":0},"clouds":{"all":20},"dt":1407408276,"id":2643743,"name":"London","cod":200}

=== added file 'tests/owm_scope/tests/server/weather/Manchester,uk.json'
--- tests/owm_scope/tests/server/weather/Manchester,uk.json	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/tests/server/weather/Manchester,uk.json	2015-11-09 15:16:03 +0000
@@ -0,0 +1,1 @@
+{"coord":{"lon":-2.24,"lat":53.48},"sys":{"type":1,"id":5060,"message":0.2423,"country":"GB","sunrise":1407386141,"sunset":1407441219},"weather":[{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"}],"base":"cmc stations","main":{"temp":17.35,"pressure":1016,"humidity":77,"temp_min":17,"temp_max":18},"wind":{"speed":2.6,"deg":20,"var_beg":330,"var_end":80},"clouds":{"all":40},"dt":1407408600,"id":2643123,"name":"Manchester","cod":200}

=== added file 'tests/owm_scope/tests/test-scope.py'
--- tests/owm_scope/tests/test-scope.py	1970-01-01 00:00:00 +0000
+++ tests/owm_scope/tests/test-scope.py	2015-11-09 15:16:03 +0000
@@ -0,0 +1,150 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2015 Canonical Ltd.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# 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 library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301  USA
+
+from scope_harness import (
+    CategoryListMatcher, CategoryListMatcherMode, CategoryMatcher,
+    Parameters, ResultMatcher, ScopeHarness
+)
+from scope_harness.testing import *
+import unittest, sys, os
+from subprocess import Popen, PIPE
+
+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"] = "localhost"
+        os.environ["NETWORK_SCOPE_APIPORT"] = 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
+
+
+    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.83°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("18.84°C to 25.09°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("15.54°C to 20.86°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("802") \
+                    .title("13.19°C to 19.58°C") \
+                    .art("http://openweathermap.org/img/w/03d.png") \
+                    .subtitle("scattered clouds") ) \
+                .result(ResultMatcher("501") \
+                    .title("13.46°C to 18.09°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("502") \
+                    .title("15.39°C to 17.38°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("heavy intensity rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("16.17°C to 18.44°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("500") \
+                    .title("16.67°C to 19.02°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+
+
+    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.35°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("11.96°C to 18.83°C") \
+                    .art("http://openweathermap.org/img/w/01d.png") \
+                    .subtitle("sky is clear") ) \
+                .result(ResultMatcher("501") \
+                    .title("12.33°C to 18.59°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("803") \
+                    .title("10.79°C to 17.11°C") \
+                    .art("http://openweathermap.org/img/w/04d.png") \
+                    .subtitle("broken clouds") ) \
+                .result(ResultMatcher("501") \
+                    .title("12.21°C to 15.98°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("500") \
+                    .title("12.99°C to 15.73°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("light rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("14.08°C to 17.64°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) \
+                .result(ResultMatcher("501") \
+                    .title("13.37°C to 15.52°C") \
+                    .art("http://openweathermap.org/img/w/10d.png") \
+                    .subtitle("moderate rain") ) ) \
+            .match(self.view.categories)
+        self.assertMatchResult(match)
+
+
+if __name__ == '__main__':
+    SCOPE_NAME = sys.argv[1]
+    SCOPE_INI = sys.argv[2]
+    FAKE_SERVER = sys.argv[3]
+
+    unittest.main(argv = sys.argv[:1])