Merge lp:~dobey/unity-scope-click/merge-devel into lp:unity-scope-click

[dobey]

- Handle some languages differently when submitting reviews. (LP: #1321154)
- Add runtime dependency on ubuntu-sdk-libs for the frameworks list. (LP: #1320975)
- Support hal+json in the search request.
- Fix issues in autopilot tests.
- Port autopilot tests to python3.
- Add README and HACKING files. (LP: #1226111)
- Translations updates.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/468/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/468/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-utopic-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/469/rebuild

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/merge-devel]

227. By dobey on 2014-05-23

- Handle some languages differently when submitting reviews. (LP: #1321154)
- Add runtime dependency on ubuntu-sdk-libs for the frameworks list. (LP: #1320975)
- Support hal+json in the search request.
- Fix issues in autopilot tests.
- Port autopilot tests to python3.
- Add README and HACKING files. (LP: #1226111)
- Translations updates.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-14 21:50:52 +0000
+++ CMakeLists.txt	2014-05-23 14:58:59 +0000
@@ -35,6 +35,14 @@
 SET (SCOPE_LIB_UNVERSIONED clickscope)
 SET (SCOPE_LIB_NAME ${SCOPE_LIB_UNVERSIONED}-${SCOPE_LIB_API_VERSION})
 
+# Build with system gmock and embedded gtest
+set (GMOCK_INCLUDE_DIR "/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_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
+
+add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+
+# Add our own subdirectories.
 add_subdirectory(autopilot)
 add_subdirectory(libclickscope)
 add_subdirectory(scope)

=== added file 'HACKING'
--- HACKING	1970-01-01 00:00:00 +0000
+++ HACKING	2014-05-23 14:58:59 +0000
@@ -0,0 +1,67 @@
+unity-scope-click hacking guide
+===============================
+
+Getting unity-scope-click
+-------------------------
+
+To get the main development branch of unity-scope-click:
+
+    $ bzr branch lp:unity-scope-click/devel
+
+
+Getting dependencies
+--------------------
+
+To succesfully build the scope there are a few packages required:
+
+    $ sudo apt-get build-dep unity-scope-click
+
+
+Building the scope
+------------------
+
+This scope is built using cmake. Here's an example on how to build it:
+
+    $ mkdir build
+    $ cd build
+    $ cmake ..
+    $ make -j 8
+
+
+Running the unit tests
+----------------------
+
+    $ make check
+
+Or, if you want to run the tests under valgrind:
+
+    $ make check-valgrind
+
+
+Running the autopilot tests
+---------------------------
+
+    $ make test-click-scope-autopilot-fake-servers
+
+
+Running the scope
+-----------------
+
+You will usually run the scope inside a unity8 session, but when developing
+a good way to test it is with unity-scope-tool. Inside the build directory do:
+
+    $ mkdir clickscope
+    $ (cd clickscope;ln -s ../scope/click/libclickscope.so .; ln -s ../data/clickscope.ini .)
+    $ U1_DEBUG=true unity-scope-tool clickscope/clickscope.ini
+
+
+Running the coverage tests
+--------------------------
+
+To run the coverage tests you'll need to install the gcovr and lcov packages.
+Then you need to compile with coverage enabled, like this:
+
+    $ cmake .. -DCMAKE_BUILD_TYPE=coverage
+    $ make coverage-html
+
+The html will be left on the coveragereport directory.

=== modified file 'README'
--- README	2013-07-18 18:25:34 +0000
+++ README	2014-05-23 14:58:59 +0000
@@ -0,0 +1,16 @@
+Readme
+======
+
+unity-scope-click - Click Packages Scope for Unity
+--------------------------------------------------
+
+This scope shows the list of installed applications, and the list of 
+applications available to download from the appstore webservice.
+To authenticate downloads, this scope uses Ubuntu Online Accounts to
+get credentials for the logged in user.
+Since scopes are short lived, ubuntu-download-manager is used to do
+the actual download.
+
+You can find information on how to compile and run this program in 
+the HACKING file, and you can find licensing information in the 
+COPYING file.

=== modified file 'autopilot/CMakeLists.txt'
--- autopilot/CMakeLists.txt	2014-02-06 17:15:05 +0000
+++ autopilot/CMakeLists.txt	2014-05-23 14:58:59 +0000
@@ -13,7 +13,7 @@
   DESTINATION ${PYTHON_PACKAGE_DIR}
 )
 
-add_custom_target(test-click-scope-autopilot-local
-    COMMAND U1_SEARCH_BASE_URL=fake DOWNLOAD_BASE_URL=fake autopilot run ${AUTOPILOT_DIR}
+add_custom_target(test-click-scope-autopilot-fake-servers
+    COMMAND U1_SEARCH_BASE_URL=fake DOWNLOAD_BASE_URL=fake BUILD_DIR=${CMAKE_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )

=== modified file 'autopilot/unityclickscope/fake_servers.py'
--- autopilot/unityclickscope/fake_servers.py	2014-02-01 12:31:42 +0000
+++ autopilot/unityclickscope/fake_servers.py	2014-05-23 14:58:59 +0000
@@ -14,28 +14,28 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import BaseHTTPServer
 import copy
+import http.server
 import json
 import os
 import tempfile
-import urlparse
-
-
-class BaseFakeHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+import urllib.parse
+
+
+class BaseFakeHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
 
     def send_json_reply(self, code, reply_json):
         self.send_response(code)
         self.send_header('Content-Type', 'application/json')
         self.end_headers()
-        self.wfile.write(reply_json)
+        self.wfile.write(reply_json.encode())
 
     def send_file(self, file_path, send_body=True, extra_headers={}):
         with open(file_path) as file_:
             data = file_.read()
             self.send_response(200)
             self.send_header('Content-Length', str(len(data)))
-            for key, value in extra_headers.iteritems():
+            for key, value in extra_headers.items():
                 self.send_header(key, value)
             self.end_headers()
             if send_body:
@@ -45,7 +45,7 @@
         self.send_file(file_path, send_body=False, extra_headers=extra_headers)
 
 
-class FakeSearchServer(BaseHTTPServer.HTTPServer, object):
+class FakeSearchServer(http.server.HTTPServer, object):
 
     def __init__(self, server_address):
         super(FakeSearchServer, self).__init__(
@@ -102,7 +102,7 @@
     }
 
     def do_GET(self):
-        parsed_path = urlparse.urlparse(self.path)
+        parsed_path = urllib.parse.urlparse(self.path)
         if parsed_path.path.startswith(self._SEARCH_PATH):
             self.send_json_reply(200, self._get_fake_search_response())
         elif parsed_path.path.startswith('/extra/'):
@@ -131,7 +131,7 @@
             raise NotImplementedError(package)
 
 
-class FakeDownloadServer(BaseHTTPServer.HTTPServer, object):
+class FakeDownloadServer(http.server.HTTPServer, object):
 
     def __init__(self, server_address):
         super(FakeDownloadServer, self).__init__(
@@ -141,7 +141,7 @@
 class FakeDownloadRequestHandler(BaseFakeHTTPRequestHandler):
 
     def do_HEAD(self):
-        parsed_path = urlparse.urlparse(self.path)
+        parsed_path = urllib.parse.urlparse(self.path)
         if parsed_path.path.startswith('/download/'):
             self._send_dummy_file_headers(parsed_path.path[10:])
         else:
@@ -156,7 +156,7 @@
     def _make_dummy_file(self, name):
         dummy_file = tempfile.NamedTemporaryFile(
             prefix='dummy', suffix='.click', delete=False)
-        dummy_file.write('Dummy click file.')
-        dummy_file.write(name)
+        dummy_file.write('Dummy click file.'.encode())
+        dummy_file.write(name.encode())
         dummy_file.close()
         return dummy_file.name

=== modified file 'autopilot/unityclickscope/test_click_scope.py'
--- autopilot/unityclickscope/test_click_scope.py	2014-05-13 05:52:34 +0000
+++ autopilot/unityclickscope/test_click_scope.py	2014-05-23 14:58:59 +0000
@@ -15,14 +15,15 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import os
+import shutil
 import subprocess
-import os
 
 import dbusmock
 import fixtures
 from autopilot.introspection import dbus as autopilot_dbus
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, MatchesAny
+from testtools.matchers import Equals
 from unity8 import process_helpers
 from unity8.shell import tests as unity_tests
 from unity8.shell.emulators import dash
@@ -106,15 +107,40 @@
     def _restart_scope(self):
         logging.info('Restarting click scope.')
         os.system('pkill -f -9 clickscope.ini')
-        lib_path = '/usr/lib/$DEB_HOST_MULTIARCH/'
-        scoperunner_path = os.path.join(lib_path, 'unity-scopes/scoperunner')
-        clickscope_config_ini_path = os.path.join(
-            lib_path, 'unity-scopes/clickscope/clickscope.ini')
         os.system(
             "dpkg-architecture -c "
             "'{scoperunner} \"\" {clickscope}' &".format(
-                scoperunner=scoperunner_path,
-                clickscope=clickscope_config_ini_path))
+                scoperunner=self._get_scoperunner_path(),
+                clickscope=self._get_scope_ini_path()))
+
+    def _get_scoperunner_path(self):
+        return os.path.join(
+            self._get_installed_unity_scopes_lib_dir(), 'scoperunner')
+
+    def _get_installed_unity_scopes_lib_dir(self):
+        return os.path.join('/usr/lib/$DEB_HOST_MULTIARCH/', 'unity-scopes')
+
+    def _get_scope_ini_path(self):
+        build_dir = os.environ.get('BUILD_DIR', None)
+        if build_dir is not None:
+            return self._get_built_scope_ini_path(build_dir)
+        else:
+            return os.path.join(
+                self._get_installed_unity_scopes_lib_dir(),
+                'clickscope', 'clickscope.ini')
+
+    def _get_built_scope_ini_path(self, build_dir):
+        # The ini and the so files need to be on the same directory.
+        # We copy them to a temp directory.
+        temp_dir_fixture = fixtures.TempDir()
+        self.useFixture(temp_dir_fixture)
+        shutil.copy(
+            os.path.join(build_dir, 'data', 'clickscope.ini'),
+            temp_dir_fixture.path)
+        shutil.copy(
+            os.path.join(build_dir, 'scope', 'click', 'libclickscope.so'),
+            temp_dir_fixture.path)
+        return os.path.join(temp_dir_fixture.path, 'clickscope.ini')
 
     def _unlock_screen(self):
         self.main_window.get_greeter().swipe()
@@ -125,18 +151,10 @@
         return scope
 
     def search(self, query):
-        # TODO move this to the unity8 main view emulator.
-        # --elopio - 2013-12-27
         search_indicator = self._proxy.select_single(
             'SearchIndicator', objectName='search')
         self.touch.tap_object(search_indicator)
-        page_header = self._proxy.select_single(
-            'PageHeader', objectName='pageHeader')
-        search_container = page_header.select_single(
-                'QQuickItem', objectName='searchContainer')
-        search_container.state.wait_for(
-            MatchesAny(Equals('narrowActive'), Equals('active')))
-        self.keyboard.type(query)
+        self.dash.enter_search_query(query)
 
     def open_app_preview(self, category, name):
         self.search(name)
@@ -182,7 +200,6 @@
 class ClickScopeTestCaseWithCredentials(BaseClickScopeTestCase):
 
     def setUp(self):
-#        self.skipTest('segfaults. TODO in following branches.')
         self.add_u1_credentials()
         super(ClickScopeTestCaseWithCredentials, self).setUp()
         self.scope = self.open_scope()
@@ -191,7 +208,12 @@
     def add_u1_credentials(self):
         account_manager = credentials.AccountManager()
         account = account_manager.add_u1_credentials(
-            '[e-mail]', 'dummy')
+            '[e-mail]',
+            'name=Ubuntu+One+%40+bollo&'
+            'consumer_secret=*********&'
+            'token=**************&'
+            'consumer_key=*******&'
+            'token_secret=************')
         self.addCleanup(account_manager.delete_account, account)
 
     def test_install_with_credentials_must_start_download(self):
@@ -211,9 +233,13 @@
 
     def get_details(self):
         """Return the details of the application whose preview is open."""
-        card_header = self.select_single('CardHeader', objectName='cardHeader')
+        header_widget = self.select_single('PreviewWidget', objectName='hdr')
+        title_label = header_widget.select_single(
+            'Label', objectName='titleLabel')
+        subtitle_label = header_widget.select_single(
+            'Label', objectName='subtitleLabel')
         return dict(
-            title=card_header.title, subtitle=card_header.subtitle)
+            title=title_label.text, subtitle=subtitle_label.text)
 
     def install(self):
         parent = self.get_parent()

=== modified file 'autopilot/unityclickscope/test_fixture_setup.py'
--- autopilot/unityclickscope/test_fixture_setup.py	2014-01-28 05:21:19 +0000
+++ autopilot/unityclickscope/test_fixture_setup.py	2014-05-23 14:58:59 +0000
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import httplib
-import urlparse
+import http.client
+import urllib.parse
 
 import testscenarios
 import testtools
@@ -39,14 +39,14 @@
         fake_server = self.fixture()
         self.addCleanup(self._assert_server_not_running)
         self.useFixture(fake_server)
-        self.netloc = urlparse.urlparse(fake_server.url).netloc
-        connection = httplib.HTTPConnection(self.netloc)
+        self.netloc = urllib.parse.urlparse(fake_server.url).netloc
+        connection = http.client.HTTPConnection(self.netloc)
         self.addCleanup(connection.close)
         self._do_request(connection)
         self.assertEqual(connection.getresponse().status, 200)
 
     def _assert_server_not_running(self):
-        connection = httplib.HTTPConnection(self.netloc)
+        connection = http.client.HTTPConnection(self.netloc)
         self.assertRaises(Exception, self._do_request, connection)
 
     def _do_request(self, connection):

=== modified file 'debian/control'
--- debian/control	2014-05-05 19:40:20 +0000
+++ debian/control	2014-05-23 14:58:59 +0000
@@ -26,6 +26,7 @@
          packagekit-tools,
          ubuntu-download-manager,
          ubuntu-purchase-service,
+         ubuntu-sdk-libs,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: unity (<< 7.0),
@@ -39,12 +40,12 @@
 Package: unity-scope-click-autopilot
 Architecture: all
 Depends: libautopilot-qt (>= 1.4),
-         python-autopilot,
-         python-dbus,
-         python-dbusmock,
-         python-fixtures,
-         python-testscenarios,
-         python-testtools,
+         python3-autopilot,
+         python3-dbus,
+         python3-dbusmock,
+         python3-fixtures,
+         python3-testscenarios,
+         python3-testtools,
          ubuntu-ui-toolkit-autopilot,
          unity8-autopilot,
          ${misc:Depends},

=== modified file 'libclickscope/CMakeLists.txt'
--- libclickscope/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ libclickscope/CMakeLists.txt	2014-05-23 14:58:59 +0000
@@ -1,1 +1,2 @@
 add_subdirectory(click)
+add_subdirectory(tests)

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ libclickscope/click/CMakeLists.txt	2014-05-23 14:58:59 +0000
@@ -9,15 +9,16 @@
 )
 
 add_library(${SCOPE_LIB_NAME} STATIC
+  configuration.cpp
   key_file_locator.cpp
+  network_access_manager.cpp
+  smartconnect.cpp
 )
 
 include_directories(
   ${JSON_CPP_INCLUDE_DIRS}
 )
 
-qt5_use_modules (${SCOPE_LIB_NAME} Network)
-
 target_link_libraries (${SCOPE_LIB_NAME}
   ${JSON_CPP_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}

=== renamed file 'scope/click/configuration.cpp' => 'libclickscope/click/configuration.cpp'
--- scope/click/configuration.cpp	2014-05-01 21:04:23 +0000
+++ libclickscope/click/configuration.cpp	2014-05-23 14:58:59 +0000
@@ -40,6 +40,15 @@
 
 namespace click {
 
+/* NOTE: The list of languages we need to use the full language code for.
+ * Please keep this list in a-z order.
+ */
+const std::vector<const char*> Configuration::FULL_LANG_CODES = {
+    "pt_BR",
+    "zh_CN",
+    "zh_TW",
+};
+
 std::vector<std::string> Configuration::list_folder(const std::string& folder, const std::string& pattern)
 {
     std::vector<std::string> result;
@@ -121,4 +130,10 @@
     return result;
 }
 
+bool Configuration::is_full_lang_code(const std::string& language)
+{
+    return std::find(FULL_LANG_CODES.begin(), FULL_LANG_CODES.end(), language)
+        != FULL_LANG_CODES.end();
+}
+
 } // namespace click

=== renamed file 'scope/click/configuration.h' => 'libclickscope/click/configuration.h'
--- scope/click/configuration.h	2014-05-01 21:04:23 +0000
+++ libclickscope/click/configuration.h	2014-05-23 14:58:59 +0000
@@ -43,6 +43,7 @@
     constexpr static const char* FRAMEWORKS_PATTERN {"*.framework"};
     constexpr static const int FRAMEWORKS_EXTENSION_LENGTH = 10; // strlen(".framework")
     constexpr static const char* LANGUAGE_ENVVAR {"LANGUAGE"};
+    static const std::vector<const char*> FULL_LANG_CODES;
 
     virtual std::vector<std::string> get_available_frameworks();
     virtual std::string get_architecture();
@@ -50,6 +51,7 @@
     virtual std::string get_language_base();
     virtual std::string get_language();
     virtual std::string get_accept_languages();
+    static bool is_full_lang_code(const std::string& language);
 
     virtual ~Configuration() {}
 protected:

=== renamed file 'scope/click/network_access_manager.cpp' => 'libclickscope/click/network_access_manager.cpp'
=== renamed file 'scope/click/network_access_manager.h' => 'libclickscope/click/network_access_manager.h'
=== renamed file 'scope/click/smartconnect.cpp' => 'libclickscope/click/smartconnect.cpp'
=== renamed file 'scope/click/smartconnect.h' => 'libclickscope/click/smartconnect.h'
=== added file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/CMakeLists.txt	2014-05-23 14:58:59 +0000
@@ -0,0 +1,54 @@
+set (LIBCLICKSCOPE_TESTS_TARGET libclick-scope-tests)
+find_package(Threads)
+
+# Qt5 bits
+SET (CMAKE_INCLUDE_CURRENT_DIR ON)
+SET (CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core REQUIRED)
+
+include_directories (
+  ${CMAKE_SOURCE_DIR}/libclickscope
+  ${JSON_CPP_INCLUDE_DIRS}
+  ${GTEST_INCLUDE_DIR}
+  ${GMOCK_INCLUDE_DIR}
+)
+
+add_executable (${LIBCLICKSCOPE_TESTS_TARGET}
+  mock_network_access_manager.h
+
+  test_configuration.cpp
+  test_smartconnect.cpp
+)
+
+qt5_use_modules(${LIBCLICKSCOPE_TESTS_TARGET} Core)
+
+target_link_libraries(${LIBCLICKSCOPE_TESTS_TARGET}
+  ${SCOPE_LIB_NAME}
+
+  ${UNITY_SCOPES_LDFLAGS}
+  ${UBUNTUONE_LDFLAGS}
+  ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
+  ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+  ${JSON_CPP_LDFLAGS}
+
+  gmock
+  gmock_main
+
+  ${CMAKE_THREAD_LIBS_INIT}
+)
+
+add_custom_target (test-libclickscope
+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
+)
+
+add_custom_target (test-libclickscope-valgrind
+  COMMAND valgrind --tool=memcheck ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
+)
+
+add_custom_target (test-libclickscope-leaks
+  COMMAND valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
+)

=== renamed file 'scope/tests/mock_network_access_manager.h' => 'libclickscope/tests/mock_network_access_manager.h'
=== renamed file 'scope/tests/test_configuration.cpp' => 'libclickscope/tests/test_configuration.cpp'
--- scope/tests/test_configuration.cpp	2014-05-01 21:04:23 +0000
+++ libclickscope/tests/test_configuration.cpp	2014-05-23 14:58:59 +0000
@@ -172,3 +172,15 @@
     EXPECT_EQ(Configuration().get_accept_languages(), "en");
     ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
 }
+
+TEST(Configuration, isFullLangCodeTestAllFullLangCodes)
+{
+    for (auto lang: Configuration::FULL_LANG_CODES) {
+        EXPECT_TRUE(Configuration::is_full_lang_code(lang));
+    }
+}
+
+TEST(Configuration, isFullLangCodeReturnsFalseForEN)
+{    
+    ASSERT_FALSE(Configuration::is_full_lang_code("en_US"));
+}

=== renamed file 'scope/tests/test_smartconnect.cpp' => 'libclickscope/tests/test_smartconnect.cpp'
--- scope/tests/test_smartconnect.cpp	2014-03-08 03:05:28 +0000
+++ libclickscope/tests/test_smartconnect.cpp	2014-05-23 14:58:59 +0000
@@ -27,7 +27,7 @@
  * files in the program, then also delete it here.
  */
 
-#include "click/smartconnect.h"
+#include <click/smartconnect.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

=== modified file 'po/ar.po'
--- po/ar.po	2014-05-13 06:36:54 +0000
+++ po/ar.po	2014-05-23 14:58:59 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-05-01 19:32+0000\n"
+"PO-Revision-Date: 2014-05-16 23:33+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:17+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
@@ -65,12 +65,12 @@
 #. TRANSLATORS: Do NOT translate ${title} here.
 #: ../scope/click/preview.cpp:602
 msgid "Uninstall ${title}?"
-msgstr ""
+msgstr "إزالة تثبيت ${title}؟"
 
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "إلغاء"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"

=== modified file 'po/de.po'
--- po/de.po	2014-05-13 06:36:54 +0000
+++ po/de.po	2014-05-23 14:58:59 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-04-29 21:45+0000\n"
+"PO-Revision-Date: 2014-05-20 13:54+0000\n"
 "Last-Translator: Phillip Sz <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:53+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
@@ -70,7 +70,7 @@
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"

=== modified file 'po/fr.po'
--- po/fr.po	2014-05-13 06:36:54 +0000
+++ po/fr.po	2014-05-23 14:58:59 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-05-05 20:05+0000\n"
+"PO-Revision-Date: 2014-05-16 19:24+0000\n"
 "Last-Translator: Anne <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:17+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
@@ -65,12 +65,12 @@
 #. TRANSLATORS: Do NOT translate ${title} here.
 #: ../scope/click/preview.cpp:602
 msgid "Uninstall ${title}?"
-msgstr ""
+msgstr "Désinstaller ${title} ?"
 
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"

=== modified file 'po/gd.po'
--- po/gd.po	2014-05-13 06:36:54 +0000
+++ po/gd.po	2014-05-23 14:58:59 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-05-01 13:41+0000\n"
-"Last-Translator: GunChleoc <Unknown>\n"
+"PO-Revision-Date: 2014-05-16 13:26+0000\n"
+"Last-Translator: Akerbeltz <[e-mail]>\n"
 "Language-Team: Gaelic; Scottish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:17+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
@@ -67,12 +67,12 @@
 #. TRANSLATORS: Do NOT translate ${title} here.
 #: ../scope/click/preview.cpp:602
 msgid "Uninstall ${title}?"
-msgstr ""
+msgstr "A bheil thu airson ${title} a dhì-stàladh?"
 
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "Sguir dheth"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"

=== modified file 'po/he.po'
--- po/he.po	2014-05-13 06:36:54 +0000
+++ po/he.po	2014-05-23 14:58:59 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-05-01 14:52+0000\n"
+"PO-Revision-Date: 2014-05-18 07:02+0000\n"
 "Last-Translator: Yaron <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-19 06:50+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
@@ -60,26 +60,26 @@
 
 #: ../scope/click/preview.cpp:599
 msgid "Confirmation"
-msgstr ""
+msgstr "אימות"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
 #: ../scope/click/preview.cpp:602
 msgid "Uninstall ${title}?"
-msgstr ""
+msgstr "האם להסיר את ${title}?"
 
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "ביטול"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"
-msgstr ""
+msgstr "התקנה"
 
 #: ../scope/click/query.cpp:95
 msgid "My apps"
-msgstr ""
+msgstr "היישומים שלי"
 
 #: ../scope/click/query.cpp:189
 msgid "Available"
-msgstr ""
+msgstr "זמין"

=== modified file 'po/it.po'
--- po/it.po	2014-05-13 06:36:54 +0000
+++ po/it.po	2014-05-23 14:58:59 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-04-30 12:04+0000\n"
+"PO-Revision-Date: 2014-05-23 06:48+0000\n"
 "Last-Translator: Claudio Arseni <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-23 09:16+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
@@ -65,12 +65,12 @@
 #. TRANSLATORS: Do NOT translate ${title} here.
 #: ../scope/click/preview.cpp:602
 msgid "Uninstall ${title}?"
-msgstr ""
+msgstr "Rimuovere ${title}?"
 
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"

=== modified file 'po/nb.po'
--- po/nb.po	2014-05-13 06:36:54 +0000
+++ po/nb.po	2014-05-23 14:58:59 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-05-01 11:24+0000\n"
+"PO-Revision-Date: 2014-05-19 03:40+0000\n"
 "Last-Translator: Åka Sikrom <Unknown>\n"
 "Language-Team: Norwegian Bokmal <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:53+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
@@ -65,12 +65,12 @@
 #. TRANSLATORS: Do NOT translate ${title} here.
 #: ../scope/click/preview.cpp:602
 msgid "Uninstall ${title}?"
-msgstr ""
+msgstr "Vil du avinstallere ${title}?"
 
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"

=== modified file 'po/ru.po'
--- po/ru.po	2014-05-13 06:36:54 +0000
+++ po/ru.po	2014-05-23 14:58:59 +0000
@@ -8,78 +8,78 @@
 "Project-Id-Version: unity-scope-click\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-05-09 15:06-0400\n"
-"PO-Revision-Date: 2014-05-01 05:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-16 16:25+0000\n"
+"Last-Translator: Zonov Roman <Unknown>\n"
 "Language-Team: Russian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-13 06:36+0000\n"
-"X-Generator: Launchpad (build 17002)\n"
+"X-Launchpad-Export-Date: 2014-05-17 07:17+0000\n"
+"X-Generator: Launchpad (build 17007)\n"
 
 #: ../data/clickscope.ini.in.in.h:1
 msgid "Apps"
-msgstr ""
+msgstr "Приложения"
 
 #: ../data/clickscope.ini.in.in.h:2
 msgid "Scope for searching the click app store"
-msgstr ""
+msgstr "Критерии поиска в магазине приложений"
 
 #: ../scope/click/preview.cpp:272
 msgid "Download Error"
-msgstr ""
+msgstr "Ошибка загрузки"
 
 #: ../scope/click/preview.cpp:273
 msgid "Download or install failed. Please try again."
-msgstr ""
+msgstr "Загрузка или установка не удалась. Пожалуйста, попробуйте снова."
 
 #. TODO see bug LP: #1289434
 #: ../scope/click/preview.cpp:275
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #: ../scope/click/preview.cpp:280
 msgid "Login Error"
-msgstr ""
+msgstr "Ошибка входа"
 
 #: ../scope/click/preview.cpp:281
 msgid "Please log in to your Ubuntu One account."
-msgstr ""
+msgstr "Войдите в учётную запись Ubuntu One."
 
 #: ../scope/click/preview.cpp:283
 msgid "Go to Accounts"
-msgstr ""
+msgstr "Перейти к списку учётных записей"
 
 #: ../scope/click/preview.cpp:506
 msgid "Open"
-msgstr ""
+msgstr "Открыть"
 
 #: ../scope/click/preview.cpp:514 ../scope/click/preview.cpp:615
 msgid "Uninstall"
-msgstr ""
+msgstr "Удалить"
 
 #: ../scope/click/preview.cpp:599
 msgid "Confirmation"
-msgstr ""
+msgstr "Подтверждение"
 
 #. TRANSLATORS: Do NOT translate ${title} here.
 #: ../scope/click/preview.cpp:602
 msgid "Uninstall ${title}?"
-msgstr ""
+msgstr "Удалить ${title}?"
 
 #. TODO: see bug LP: #1289434
 #: ../scope/click/preview.cpp:611
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #: ../scope/click/preview.cpp:663
 msgid "Install"
-msgstr ""
+msgstr "Установить"
 
 #: ../scope/click/query.cpp:95
 msgid "My apps"
-msgstr ""
+msgstr "Мои приложения"
 
 #: ../scope/click/query.cpp:189
 msgid "Available"
-msgstr ""
+msgstr "Доступно"

=== modified file 'scope/click/CMakeLists.txt'
--- scope/click/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ scope/click/CMakeLists.txt	2014-05-23 14:58:59 +0000
@@ -9,16 +9,13 @@
 )
 
 add_library(${SCOPE_LIB_UNVERSIONED} SHARED
-  configuration.cpp
   download-manager.cpp
   index.cpp
   interface.cpp
-  network_access_manager.cpp
   query.cpp
   reviews.cpp
   scope.cpp
   scope_activation.cpp
-  smartconnect.cpp
   package.cpp
   preview.cpp
   ubuntuone_credentials.cpp
@@ -35,7 +32,6 @@
 qt5_use_modules (${SCOPE_LIB_UNVERSIONED} Network)
 
 target_link_libraries (${SCOPE_LIB_UNVERSIONED}
-  -L${CMAKE_BINARY_DIR}/libclickscope
   ${SCOPE_LIB_NAME}
   ${JSON_CPP_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}

=== modified file 'scope/click/download-manager.h'
--- scope/click/download-manager.h	2014-03-22 00:08:31 +0000
+++ scope/click/download-manager.h	2014-05-23 14:58:59 +0000
@@ -30,7 +30,6 @@
 #ifndef CLICK_DOWNLOAD_MANAGER_H
 #define CLICK_DOWNLOAD_MANAGER_H
 
-#include "network_access_manager.h"
 #include "ubuntuone_credentials.h"
 
 #include <QDebug>
@@ -38,6 +37,8 @@
 #include <QObject>
 #include <QString>
 
+#include <click/network_access_manager.h>
+
 #include <ubuntu/download_manager/manager.h>
 
 using Ubuntu::DownloadManager::Download;

=== modified file 'scope/click/index.cpp'
--- scope/click/index.cpp	2014-04-16 21:13:28 +0000
+++ scope/click/index.cpp	2014-05-23 14:58:59 +0000
@@ -34,11 +34,12 @@
 #include <cstdlib>
 #include <sstream>
 
+#include <click/smartconnect.h>
+
 #include "download-manager.h"
 #include "index.h"
 #include "interface.h"
 #include "application.h"
-#include "smartconnect.h"
 
 namespace json = Json;
 
@@ -87,30 +88,45 @@
 
 }
 
-std::string Index::build_index_query(std::string query)
+std::string Index::build_index_query(const std::string& query)
 {
     std::stringstream result;
 
     result << query;
+    return result.str();
+}
+
+std::map<std::string, std::string> Index::build_headers()
+{
+    std::stringstream frameworks;
     for (auto f: configuration->get_available_frameworks()) {
-        result << ",framework:" << f;
+        frameworks << "," << f;
     }
-    result << ",architecture:" << configuration->get_architecture();
 
-    return result.str();
+    return std::map<std::string, std::string> {
+        {"Accept", "application/hal+json,application/json"},
+        {"X-Ubuntu-Frameworks", frameworks.str()},
+        {"X-Ubuntu-Architecture", configuration->get_architecture()}
+    };
 }
 
 click::web::Cancellable Index::search (const std::string& query, std::function<void(click::PackageList)> callback)
 {
     click::web::CallParams params;
-    std::string built_query(build_index_query(query));
+    const std::string built_query(build_index_query(query));
     params.add(click::QUERY_ARGNAME, built_query.c_str());
     QSharedPointer<click::web::Response> response(client->call(
-        get_base_url() + click::SEARCH_PATH, params));
+        get_base_url() + click::SEARCH_PATH, "GET", false, build_headers(), "", params));
 
     QObject::connect(response.data(), &click::web::Response::finished, [=](QString reply) {
-        click::PackageList pl = click::package_list_from_json(reply.toUtf8().constData());
-        qDebug() << "found packages:" << pl.size();
+        Json::Reader reader;
+        Json::Value root;
+
+        click::PackageList pl;
+        if (reader.parse(reply.toUtf8().constData(), root)) {
+            pl = click::package_list_from_json_node(root);
+            qDebug() << "found packages:" << pl.size();
+        }
         callback(pl);
     });
     QObject::connect(response.data(), &click::web::Response::error, [=](QString /*description*/) {

=== modified file 'scope/click/index.h'
--- scope/click/index.h	2014-04-16 21:13:28 +0000
+++ scope/click/index.h	2014-05-23 14:58:59 +0000
@@ -34,7 +34,8 @@
 #include <string>
 #include <functional>
 
-#include "configuration.h"
+#include <click/configuration.h>
+
 #include "package.h"
 #include "webclient.h"
 
@@ -63,7 +64,9 @@
 protected:
     QSharedPointer<web::Client> client;
     QSharedPointer<Configuration> configuration;
-    virtual std::string build_index_query(std::string query);
+    virtual std::string build_index_query(const std::string& query);
+    virtual std::map<std::string, std::string> build_headers();
+
 public:
     enum class Error {NoError, CredentialsError, NetworkError};
     Index(const QSharedPointer<click::web::Client>& client,

=== modified file 'scope/click/package.cpp'
--- scope/click/package.cpp	2014-04-09 20:25:13 +0000
+++ scope/click/package.cpp	2014-05-23 14:58:59 +0000
@@ -66,12 +66,58 @@
             lhs.framework == rhs.framework;
 }
 
+Package package_from_json_node(const Json::Value& item)
+{
+    Package p;
+    p.name = item[Package::JsonKeys::name].asString();
+    p.title = item[Package::JsonKeys::title].asString();
+    p.price = item[Package::JsonKeys::price].asDouble();
+    p.icon_url = item[Package::JsonKeys::icon_url].asString();
+    p.url = item[Package::JsonKeys::links][Package::JsonKeys::self][Package::JsonKeys::href].asString();
+    if (p.url.empty()) {
+        p.url = item[Package::JsonKeys::resource_url].asString();
+    }
+    return p;
+}
+
+PackageList package_list_from_json_node(const Json::Value& root)
+{
+    PackageList pl;
+    if (root.isObject() && root.isMember(Package::JsonKeys::embedded))
+    {
+        auto const emb = root[Package::JsonKeys::embedded];
+        if (emb.isObject() && emb.isMember(Package::JsonKeys::ci_package))
+        {
+            auto const pkg = emb[Package::JsonKeys::ci_package];
+            for (uint i = 0; i < pkg.size(); i++)
+            {
+                Package p;
+                const json::Value item = pkg[i];
+                p = package_from_json_node(item);
+                pl.push_back(p);
+            }
+        }
+    }
+    else if (root.isArray())
+    {
+        qDebug() << "Fell back to old array mode.";
+        qDebug() << root.size() << "packages returned.";
+        for (uint i = 0; i < root.size(); i++)
+        {
+            
+            Package p;
+            const json::Value item = root[i];
+            p = package_from_json_node(item);
+            pl.push_back(p);
+        }
+    }
+    return pl;
+}
+
 PackageList package_list_from_json(const std::string& json)
 {
     std::istringstream is(json);
 
-    PackageList pl;
-
     json::Reader reader;
     json::Value root;
 
@@ -79,18 +125,7 @@
         throw std::runtime_error(reader.getFormattedErrorMessages());
     }
 
-    for (uint i = 0; i < root.size(); i++)
-    {
-        Package p;
-        json::Value item = root[i];
-        p.name = item[Package::JsonKeys::name].asString();
-        p.title = item[Package::JsonKeys::title].asString();
-        p.price = item[Package::JsonKeys::price].asDouble();
-        p.icon_url = item[Package::JsonKeys::icon_url].asString();
-        p.url = item[Package::JsonKeys::resource_url].asString();
-        pl.push_back(p);
-    }
-    return pl;
+    return package_list_from_json_node(root);
 }
 
 PackageDetails PackageDetails::from_json(const std::string &json)

=== modified file 'scope/click/package.h'
--- scope/click/package.h	2014-04-09 20:25:13 +0000
+++ scope/click/package.h	2014-05-23 14:58:59 +0000
@@ -46,6 +46,11 @@
     {
         JsonKeys() = delete;
 
+        constexpr static const char* embedded {"_embedded"};
+        constexpr static const char* links{"_links"};
+        constexpr static const char* self{"self"};
+        constexpr static const char* href{"href"};
+        constexpr static const char* ci_package {"clickindex:package"};
         constexpr static const char* name{"name"};
         constexpr static const char* title{"title"};
         constexpr static const char* price{"price"};
@@ -84,7 +89,9 @@
 
 typedef std::list<Package> PackageList;
 
+Package package_from_json_node(const Json::Value& item);
 PackageList package_list_from_json(const std::string& json);
+PackageList package_list_from_json_node(const Json::Value& root);
 
 struct PackageDetails
 {

=== modified file 'scope/click/preview.h'
--- scope/click/preview.h	2014-04-29 03:17:38 +0000
+++ scope/click/preview.h	2014-05-23 14:58:59 +0000
@@ -31,11 +31,12 @@
 #define CLICKPREVIEW_H
 
 #include "index.h"
-#include "network_access_manager.h"
 #include "download-manager.h"
 #include "qtbridge.h"
 #include "reviews.h"
 
+#include <click/network_access_manager.h>
+
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/PreviewQueryBase.h>
 #include <unity/scopes/PreviewWidget.h>

=== modified file 'scope/click/query.cpp'
--- scope/click/query.cpp	2014-05-13 19:32:29 +0000
+++ scope/click/query.cpp	2014-05-23 14:58:59 +0000
@@ -44,6 +44,7 @@
 #include<vector>
 #include<set>
 #include<sstream>
+#include <cassert>
 
 #include <click/click-i18n.h>
 
@@ -116,19 +117,19 @@
 
 struct click::Query::Private
 {
-    Private(const std::string& query, click::Index& index, const scopes::SearchMetadata& metadata)
+    Private(const unity::scopes::CannedQuery& query, click::Index& index, const scopes::SearchMetadata& metadata)
         : query(query),
           index(index),
           meta(metadata)
     {
     }
-    std::string query;
+    unity::scopes::CannedQuery query;
     click::Index& index;
     scopes::SearchMetadata meta;
     click::web::Cancellable search_operation;
 };
 
-click::Query::Query(std::string const& query, click::Index& index, scopes::SearchMetadata const& metadata)
+click::Query::Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata)
     : impl(new Private(query, index, metadata))
 {
 }
@@ -140,7 +141,7 @@
 
 void click::Query::cancelled()
 {
-    qDebug() << "cancelling search of" << QString::fromStdString(impl->query);
+    qDebug() << "cancelling search of" << QString::fromStdString(impl->query.query_string());
     impl->search_operation.cancel();
 }
 
@@ -196,47 +197,49 @@
 
     run_under_qt([=]()
     {
-        qDebug() << "starting search of" << QString::fromStdString(impl->query);
-
-        impl->search_operation = impl->index.search(impl->query, [=](PackageList packages){
-            qDebug("callback here");
-            foreach (auto p, packages) {
-                qDebug() << "pushing result" << QString::fromStdString(p.name);
-                try {
-                    scopes::CategorisedResult res(category);
-                    if (locallyInstalledApps.count(p.name) > 0) {
-                        qDebug() << "already installed" << QString::fromStdString(p.name);
-                        continue;
+            auto search_cb = [this, searchReply, category, locallyInstalledApps](PackageList packages) {
+                qDebug("search callback");
+
+                // handle packages data
+                foreach (auto p, packages) {
+                    qDebug() << "pushing result" << QString::fromStdString(p.name);
+                    try {
+                        scopes::CategorisedResult res(category);
+                        if (locallyInstalledApps.count(p.name) > 0) {
+                            qDebug() << "already installed" << QString::fromStdString(p.name);
+                            continue;
+                        }
+                        res.set_title(p.title);
+                        res.set_art(p.icon_url);
+                        res.set_uri(p.url);
+                        res[click::Query::ResultKeys::NAME] = p.name;
+                        res[click::Query::ResultKeys::INSTALLED] = false;
+
+                        this->push_result(searchReply, res);
+                    } catch(const std::exception& e){
+                        qDebug() << "PackageDetails::loadJson: Exception thrown while decoding JSON: " << e.what() ;
+                    } catch(...){
+                        qDebug() << "no reason to catch";
                     }
-                    res.set_title(p.title);
-                    res.set_art(p.icon_url);
-                    res.set_uri(p.url);
-                    res[click::Query::ResultKeys::NAME] = p.name;
-                    res[click::Query::ResultKeys::INSTALLED] = false;
-
-                    this->push_result(searchReply, res);
-                } catch(const std::exception& e){
-                    qDebug() << "PackageDetails::loadJson: Exception thrown while decoding JSON: " << e.what() ;
-                } catch(...){
-                    qDebug() << "no reason to catch";
                 }
-            }
-            qDebug() << "search completed";
-            this->finished(searchReply);
-        });
+                qDebug() << "search completed";
+                this->finished(searchReply);
+        };
 
+            qDebug() << "starting search of" << QString::fromStdString(impl->query.query_string());
+            impl->search_operation = impl->index.search(impl->query.query_string(), search_cb);
     });
-
 }
 
 void click::Query::run(scopes::SearchReplyProxy const& searchReply)
 {
+    auto query = impl->query.query_string();
     std::string categoryTemplate = CATEGORY_APPS_SEARCH;
-    if (impl->query.empty()) {
+    if (query.empty()) {
         categoryTemplate = CATEGORY_APPS_DISPLAY;
     }
     auto localResults = clickInterfaceInstance().find_installed_apps(
-                impl->query);
+                query);
 
     push_local_results(
         searchReply, 

=== modified file 'scope/click/query.h'
--- scope/click/query.h	2014-05-02 00:01:43 +0000
+++ scope/click/query.h	2014-05-23 14:58:59 +0000
@@ -38,6 +38,7 @@
 #include <QSharedPointer>
 #include <set>
 
+
 namespace click
 {
 
@@ -69,7 +70,7 @@
         constexpr static const char* VERSION{"version"};
     };
 
-    Query(std::string const& query, click::Index& index, scopes::SearchMetadata const& metadata);
+    Query(unity::scopes::CannedQuery const& query, click::Index& index, scopes::SearchMetadata const& metadata);
     virtual ~Query();
 
     virtual void cancelled() override;

=== modified file 'scope/click/reviews.cpp'
--- scope/click/reviews.cpp	2014-05-07 21:22:59 +0000
+++ scope/click/reviews.cpp	2014-05-23 14:58:59 +0000
@@ -139,8 +139,15 @@
     root["review_text"] = review.review_text;
 
     root["arch_tag"] = click::Configuration().get_architecture();
-    // NOTE: We only use the base language code for reviews.
-    root["language"] = click::Configuration().get_language_base();
+    /* NOTE: We only use the base language code for reviews, except for
+     * codes in the click::Configuration::FULL_LANG_CODES vector.
+     */
+    auto language = click::Configuration().get_language();
+    if (click::Configuration::is_full_lang_code(language)) {
+        root["language"] = language;
+    } else {
+        root["language"] = click::Configuration().get_language_base();
+    }
 
     // NOTE: "summary" is a required field, but we don't have one. Use "".
     root["summary"] = "Review";

=== modified file 'scope/click/scope.cpp'
--- scope/click/scope.cpp	2014-05-13 19:32:29 +0000
+++ scope/click/scope.cpp	2014-05-23 14:58:59 +0000
@@ -31,13 +31,13 @@
 #include "scope.h"
 #include "query.h"
 #include "preview.h"
-#include "network_access_manager.h"
 #include "interface.h"
 #include "scope_activation.h"
 
 #include <QSharedPointer>
 
 #include <click/key_file_locator.h>
+#include <click/network_access_manager.h>
 #include <click/click-i18n.h>
 
 namespace
@@ -88,7 +88,7 @@
 
 scopes::SearchQueryBase::UPtr click::Scope::search(unity::scopes::CannedQuery const& q, scopes::SearchMetadata const& metadata)
 {
-    return scopes::SearchQueryBase::UPtr(new click::Query(q.query_string(), *index, metadata));
+    return scopes::SearchQueryBase::UPtr(new click::Query(q, *index, metadata));
 }
 
 

=== modified file 'scope/click/scope.h'
--- scope/click/scope.h	2014-04-29 03:17:38 +0000
+++ scope/click/scope.h	2014-05-23 14:58:59 +0000
@@ -30,12 +30,13 @@
 #ifndef CLICK_SCOPE_H
 #define CLICK_SCOPE_H
 
+#include <click/network_access_manager.h>
+
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/ActivationQueryBase.h>
 
 #include "index.h"
-#include "network_access_manager.h"
 #include "webclient.h"
 
 namespace scopes = unity::scopes;

=== modified file 'scope/click/webclient.cpp'
--- scope/click/webclient.cpp	2014-05-13 15:34:17 +0000
+++ scope/click/webclient.cpp	2014-05-23 14:58:59 +0000
@@ -30,11 +30,12 @@
 #include <QBuffer>
 #include <QDebug>
 
-#include "configuration.h"
+#include <click/configuration.h>
+#include <click/smartconnect.h>
+#include <click/network_access_manager.h>
+
 #include "webclient.h"
-#include "smartconnect.h"
 
-#include "network_access_manager.h"
 
 void click::web::CallParams::add(const std::string& key, const std::string& value)
 {

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-05-14 21:50:52 +0000
+++ scope/tests/CMakeLists.txt	2014-05-23 14:58:59 +0000
@@ -1,13 +1,6 @@
 set (CLICKSCOPE_TESTS_TARGET click-scope-tests)
 find_package(Threads)
 
-# Build with system gmock and embedded gtest
-set (GMOCK_INCLUDE_DIR "/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_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
-
 # Qt5 bits
 SET (CMAKE_INCLUDE_CURRENT_DIR ON)
 SET (CMAKE_AUTOMOC ON)
@@ -25,15 +18,12 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_data.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp)
 
 add_executable (${CLICKSCOPE_TESTS_TARGET}
-  mock_network_access_manager.h
   mock_webclient.h
-  test_configuration.cpp
   test_download_manager.cpp
   test_index.cpp
   test_interface.cpp
   test_query.cpp
   test_reviews.cpp
-  test_smartconnect.cpp
   test_webclient.cpp
 
   ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
@@ -43,6 +33,7 @@
 
 target_link_libraries(${CLICKSCOPE_TESTS_TARGET}
   ${SCOPE_LIB_UNVERSIONED}
+  ${SCOPE_LIB_NAME}
 
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}

=== modified file 'scope/tests/fake_json.h'
--- scope/tests/fake_json.h	2014-04-23 20:38:12 +0000
+++ scope/tests/fake_json.h	2014-05-23 14:58:59 +0000
@@ -54,28 +54,40 @@
         ]
 )foo";
 
-const std::string FAKE_JSON_SEARCH_RESULT_ONE = R"foo(
-        [
-          {
-            "name": "org.example.awesomelauncher",
-            "title": "Awesome Launcher",
-            "description": "This is an awesome launcher.",
-            "price": 1.99,
-            "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
-            "resource_url": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
-          }
-        ]
+const std::string FAKE_JSON_SEARCH_RESULT_ONE = R"foo({
+        "_embedded": {
+            "clickindex:package": [
+                {
+                    "name": "org.example.awesomelauncher",
+                    "title": "Awesome Launcher",
+                    "description": "This is an awesome launcher.",
+                    "price": 1.99,
+                    "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
+                    "_links": {
+                        "self": {
+                            "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                        }
+                    }
+                }
+            ]
+        }
+    }
 )foo";
 
-const std::string FAKE_JSON_SEARCH_RESULT_MANY = R"foo(
-        [
+const std::string FAKE_JSON_SEARCH_RESULT_MANY = R"foo({
+        "_embedded": {
+            "clickindex:package": [
           {
             "name": "org.example.awesomelauncher",
             "title": "Awesome Launcher",
             "description": "This is an awesome launcher.",
             "price": 1.99,
             "icon_url": "http://software-center.ubuntu.com/site_media/appmedia/2012/09/SPAZ.png",
-            "resource_url": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+            "_links": {
+                "self": {
+                    "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomelauncher"
+                }
+            }
           },
           {
             "name": "org.example.fantastiqueapp",
@@ -83,7 +95,11 @@
             "description": "This is a fantasticc app.",
             "price": 0.0,
             "icon_url": "http://assets.ubuntu.com/sites/ubuntu/504/u/img/ubuntu/features/icon-find-more-apps-64x64.png",
-            "resource_url": "http://search.apps.ubuntu.com/api/v1/package/org.example.fantasticapp"
+            "_links": {
+                "self": {
+                    "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.fantasticapp"
+                }
+            }
           },
           {
             "name": "org.example.awesomewidget",
@@ -91,9 +107,15 @@
             "description": "This is an awesome widget.",
             "price": 1.99,
             "icon_url": "http://assets.ubuntu.com/sites/ubuntu/504/u/img/ubuntu/features/icon-photos-and-videos-64x64.png",
-            "resource_url": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomewidget"
+            "_links": {
+                "self": {
+                    "href": "http://search.apps.ubuntu.com/api/v1/package/org.example.awesomewidget"
+                }
+            }
           }
         ]
+        }
+    }
 )foo";
 
 const std::string FAKE_JSON_PACKAGE_DETAILS = R"foo(

=== modified file 'scope/tests/test_download_manager.cpp'
--- scope/tests/test_download_manager.cpp	2014-03-22 00:08:31 +0000
+++ scope/tests/test_download_manager.cpp	2014-05-23 14:58:59 +0000
@@ -42,8 +42,8 @@
 #include <gtest/gtest.h>
 
 #include <click/download-manager.h>
+#include <tests/mock_network_access_manager.h>
 
-#include "mock_network_access_manager.h"
 #include "mock_ubuntuone_credentials.h"
 #include "mock_ubuntu_download_manager.h"
 

=== modified file 'scope/tests/test_index.cpp'
--- scope/tests/test_index.cpp	2014-05-20 14:52:13 +0000
+++ scope/tests/test_index.cpp	2014-05-23 14:58:59 +0000
@@ -30,7 +30,8 @@
 #include "click/index.h"
 #include "click/webclient.h"
 
-#include "mock_network_access_manager.h"
+#include <tests/mock_network_access_manager.h>
+
 #include "mock_ubuntuone_credentials.h"
 #include "mock_webclient.h"
 #include "fake_json.h"
@@ -51,7 +52,8 @@
         click::Index(client, configuration)
     {
     }
-    MOCK_METHOD1(build_index_query, std::string(std::string));
+    MOCK_METHOD1(build_index_query, std::string(const std::string&));
+    MOCK_METHOD0(build_headers, std::map<std::string, std::string>());
 };
 
 class MockConfiguration : public click::Configuration {
@@ -73,6 +75,8 @@
         clientPtr.reset(new NiceMock<MockClient>(namPtr));
         configPtr.reset(new MockConfiguration());
         indexPtr.reset(new MockableIndex(clientPtr, configPtr));
+        // register default value for build_headers() mock
+        DefaultValue<std::map<std::string, std::string>>::Set(std::map<std::string, std::string>());
     }
 public:
     MOCK_METHOD1(search_callback, void(click::PackageList));
@@ -452,6 +456,7 @@
 class ExhibitionistIndex : public click::Index {
 public:
     using click::Index::build_index_query;
+    using click::Index::build_headers;
     ExhibitionistIndex(const QSharedPointer<click::web::Client>& client,
                        const QSharedPointer<click::Configuration> configuration) :
         click::Index(client, configuration)
@@ -480,19 +485,19 @@
 };
 
 
-TEST_F(QueryStringTest, testBuildQueryAddsArchitecture)
+TEST_F(QueryStringTest, testBuildHeadersAddsArchitecture)
 {
     EXPECT_CALL(*configPtr, get_architecture()).Times(1).WillOnce(Return(fake_arch));
     EXPECT_CALL(*configPtr, get_available_frameworks()).Times(1).WillOnce(Return(fake_frameworks));
-    auto index_query = indexPtr->build_index_query("fake");
-    EXPECT_NE(std::string::npos, index_query.find("architecture:" + fake_arch));
+    auto hdrs = indexPtr->build_headers();
+    EXPECT_EQ(fake_arch, hdrs["X-Ubuntu-Architecture"]);
 }
 
-TEST_F(QueryStringTest, testBuildQueryAddsFramework)
+TEST_F(QueryStringTest, testBuildHeadersAddsFramework)
 {
     EXPECT_CALL(*configPtr, get_architecture()).Times(1).WillOnce(Return(fake_arch));
     EXPECT_CALL(*configPtr, get_available_frameworks()).Times(1).WillOnce(Return(fake_frameworks));
-    auto index_query = indexPtr->build_index_query("fake");
-    EXPECT_NE(std::string::npos, index_query.find("framework:" + fake_fwk_1));
-    EXPECT_NE(std::string::npos, index_query.find("framework:" + fake_fwk_2));
+    auto hdrs = indexPtr->build_headers();
+    EXPECT_NE(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_1));
+    EXPECT_NE(std::string::npos, hdrs["X-Ubuntu-Frameworks"].find(fake_fwk_2));
 }

=== modified file 'scope/tests/test_query.cpp'
--- scope/tests/test_query.cpp	2014-05-20 14:52:13 +0000
+++ scope/tests/test_query.cpp	2014-05-23 14:58:59 +0000
@@ -38,7 +38,7 @@
 #include "click/index.h"
 #include "click/application.h"
 
-#include "mock_network_access_manager.h"
+#include <tests/mock_network_access_manager.h>
 
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/CategorisedResult.h>
@@ -78,7 +78,7 @@
 
 class MockQueryBase : public click::Query {
 public:
-    MockQueryBase(const std::string query, click::Index& index,
+    MockQueryBase(const unity::scopes::CannedQuery& query, click::Index& index,
                   scopes::SearchMetadata const& metadata) : click::Query(query, index, metadata)
     {
 
@@ -92,7 +92,7 @@
 
 class MockQuery : public MockQueryBase {
 public:
-    MockQuery(const std::string query, click::Index& index,
+    MockQuery(const unity::scopes::CannedQuery& query, click::Index& index,
               scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, metadata)
     {
 
@@ -114,7 +114,7 @@
 
 class MockQueryRun : public MockQueryBase {
 public:
-    MockQueryRun(const std::string query, click::Index& index,
+    MockQueryRun(const unity::scopes::CannedQuery& query, click::Index& index,
                  scopes::SearchMetadata const& metadata) : MockQueryBase(query, index, metadata)
     {
 
@@ -145,7 +145,8 @@
     MockIndex mock_index;
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
-    MockQuery q(FAKE_QUERY, mock_index, metadata);
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, metadata);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(1);
     scopes::SearchReplyProxy reply;
 
@@ -163,7 +164,8 @@
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
-    MockQuery q(FAKE_QUERY, mock_index, metadata);
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, metadata);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -184,7 +186,8 @@
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
-    MockQuery q(FAKE_QUERY, mock_index, metadata);
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, metadata);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");
@@ -204,7 +207,8 @@
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
-    MockQuery q(FAKE_QUERY, mock_index, metadata);
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, metadata);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _)).Times(0);
 
     EXPECT_CALL(q, register_category(_, _, _, _, _)).WillOnce(Return(nullptr));
@@ -222,7 +226,8 @@
     MockIndex mock_index(packages);
     scopes::SearchMetadata metadata("en_EN", "phone");
     std::set<std::string> no_installed_packages;
-    MockQueryRun q(FAKE_QUERY, mock_index, metadata);
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQueryRun q(query, mock_index, metadata);
     auto reply = scopes::SearchReplyProxy();
     EXPECT_CALL(q, push_local_results(_, _, _));
     EXPECT_CALL(q, add_available_apps(reply, no_installed_packages, _));
@@ -243,7 +248,8 @@
     std::set<std::string> one_installed_package {
         "org.example.app2"
     };
-    MockQuery q(FAKE_QUERY, mock_index, metadata);
+    const unity::scopes::CannedQuery query("foo.scope", FAKE_QUERY, "");
+    MockQuery q(query, mock_index, metadata);
     EXPECT_CALL(mock_index, do_search(FAKE_QUERY, _));
 
     scopes::CategoryRenderer renderer("{}");

=== modified file 'scope/tests/test_reviews.cpp'
--- scope/tests/test_reviews.cpp	2014-04-29 03:17:38 +0000
+++ scope/tests/test_reviews.cpp	2014-05-23 14:58:59 +0000
@@ -30,8 +30,9 @@
 #include <click/reviews.h>
 #include <click/webclient.h>
 
+#include <tests/mock_network_access_manager.h>
+
 #include "fake_json.h"
-#include "mock_network_access_manager.h"
 #include "mock_ubuntuone_credentials.h"
 #include "mock_webclient.h"
 
@@ -274,8 +275,8 @@
     review.package_version = "0.1";
 
     ASSERT_EQ(setenv(click::Configuration::LANGUAGE_ENVVAR,
-                     "zh_TW.UTF-8", 1), 0);
-    std::string expected_language = "\"language\":\"zh\"";
+                     "es_AR.UTF-8", 1), 0);
+    std::string expected_language = "\"language\":\"es\"";
     EXPECT_CALL(*clientPtr, callImpl(_, "POST", true, _,
                                      HasSubstr(expected_language), _))
             .Times(1)
@@ -286,6 +287,32 @@
     ASSERT_EQ(unsetenv(click::Configuration::LANGUAGE_ENVVAR), 0);
 }
 
+TEST_F(ReviewsTest, testSubmitReviewLanguageCorrectForFullLangCodes)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = responseForReply(reply.asSharedPtr());
+
+    click::Review review;
+    review.rating = 3;
+    review.review_text = "A review.";
+    review.package_name = "com.example.test";
+    review.package_version = "0.1";
+
+    for (std::string lang: click::Configuration::FULL_LANG_CODES) {
+        ASSERT_EQ(setenv(click::Configuration::LANGUAGE_ENVVAR,
+                         lang.c_str(), 1), 0);
+        std::string expected_language = "\"language\":\"" + lang + "\"";
+        EXPECT_CALL(*clientPtr, callImpl(_, "POST", true, _,
+                                         HasSubstr(expected_language), _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+        auto submit_op = reviewsPtr->submit_review(review,
+                                                   [](click::Reviews::Error){});
+        ASSERT_EQ(unsetenv(click::Configuration::LANGUAGE_ENVVAR), 0);
+    }
+}
+
 TEST_F(ReviewsTest, testGetBaseUrl)
 {
     const char *value = getenv(click::REVIEWS_BASE_URL_ENVVAR.c_str());

=== modified file 'scope/tests/test_webclient.cpp'
--- scope/tests/test_webclient.cpp	2014-05-13 14:11:42 +0000
+++ scope/tests/test_webclient.cpp	2014-05-23 14:58:59 +0000
@@ -28,10 +28,11 @@
  */
 #include <QDebug>
 
-#include "click/configuration.h"
-#include "click/webclient.h"
-
-#include "mock_network_access_manager.h"
+#include <click/configuration.h>
+#include <click/webclient.h>
+
+#include <tests/mock_network_access_manager.h>
+
 #include "mock_ubuntuone_credentials.h"
 
 #include <gtest/gtest.h>