Merge lp:~abreu-alexandre/unity-webapps-qml/rtm-tools-api into lp:unity-webapps-qml/rtm-14.09

[Alexandre Abreu]

Backport RTM changed to add a tools api

Backport RTM changed to add a tools api

[lp:~abreu-alexandre/unity-webapps-qml/rtm-tools-api]

144. By Alexandre Abreu on 2015-03-19

tweaks

145. By Alexandre Abreu on 2015-03-27

Backport tests

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2015-01-16 16:12:44 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2015-03-27 19:32:46 +0000
@@ -115,8 +115,6 @@
                 return;
             }
 
-            this._log ('WebApps API message received: ' + json.stringify(msg));
-
             var self = this;
             var args = json.parse(msg.args);
             args = args.map (function (arg) {
@@ -154,6 +152,8 @@
                     return;
                 }
 
+                this._log ('WebApps API message being dispatch: ' + apiCallName);
+                
                 this._dispatchApiCall (message.name, params);
 
             } else if (target === UnityWebAppsUtils.UBUNTU_WEBAPPS_BINDING_OBJECT_METHOD_CALL_MESSAGE) {

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.pro'
--- src/Ubuntu/UnityWebApps/UnityWebApps.pro	2015-03-06 15:15:15 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.pro	2015-03-27 19:32:46 +0000
@@ -70,6 +70,9 @@
 download_api_binding_backend_js_files.path = $$installPath/bindings/download-manager/backend/
 download_api_binding_backend_js_files.files = ./bindings/download-manager/backend/download-api.js
 
+tools_api_binding_backend_js_files.path = $$installPath/bindings/tools/backend/
+tools_api_binding_backend_js_files.files = ./bindings/tools/backend/tools.js
+
 INSTALLS += qmldir_file \
     qml_files \
     js_files \
@@ -77,5 +80,5 @@
     alarm_binding_backend_js_files \
     online_accounts_binding_backend_js_files \
     runtime_api_binding_backend_js_files \
-    download_api_binding_backend_js_files
-
+    download_api_binding_backend_js_files \
+    tools_api_binding_backend_js_files

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-03-06 15:15:15 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-03-27 19:32:46 +0000
@@ -28,6 +28,7 @@
 import "./bindings/online-accounts/backend/online-accounts.js" as OnlineAccountsApiBackend
 import "./bindings/online-accounts/backend/online-accounts-client.js" as OnlineAccountsClientApiBackend
 import "./bindings/download-manager/backend/download-api.js" as DownloadApiBackend
+import "./bindings/tools/backend/tools.js" as ToolsApiBackend
 
 /*!
     \qmltype UnityWebApps
@@ -493,6 +494,8 @@
         if (settings.injectExtraContentShareCapabilities) {
             policy.add("launchEmbeddedUI");
             policy.add("ContentHub.onShareRequested");
+            policy.add("ToolsApi.getHmacHash");
+            policy.add("ToolsApi.sendHttpRequest");
         }
         return policy;
     }
@@ -786,6 +789,8 @@
                 return DownloadApiBackend.createDownloadApi(UnityBackends.backendDelegate)
             }),
 
+            ToolsApi: ToolsApiBackend.createToolsApi(UnityBackends.backendDelegate),
+
             Launcher: {
                 setCount: function (count) {
                     if (!initialized)

=== added directory 'src/Ubuntu/UnityWebApps/bindings/tools'
=== added directory 'src/Ubuntu/UnityWebApps/bindings/tools/backend'
=== added file 'src/Ubuntu/UnityWebApps/bindings/tools/backend/tools.js'
--- src/Ubuntu/UnityWebApps/bindings/tools/backend/tools.js	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/bindings/tools/backend/tools.js	2015-03-27 19:32:46 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright 20145 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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-webapps-qml 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/>.
+ */
+
+.import Ubuntu.UnityWebApps 0.2 as UnityWebAppsBridge
+
+
+/**
+ *
+ * Tools API backend binding
+ *
+ */
+function createToolsApi(backendDelegate) {
+    var PLUGIN_URI = 'Ubuntu.UnityWebApps';
+    var VERSION = 0.2;
+
+    var toolsApiInstance = UnityWebAppsBridge.ToolsApi;
+
+    function isValidAlgorithm(algorithm) {
+        var algos = ["MD5", "SHA1", "SHA256", "SHA512"]
+        return algos.some(function(e) { return e === algorithm; })
+    };
+
+    function stringToCryptoAlgorithm(algorithm) {
+        var assoc = {
+            "MD5": toolsApiInstance.MD5
+            , "SHA1": toolsApiInstance.SHA1
+            , "SHA256": toolsApiInstance.SHA256
+            , "SHA512": toolsApiInstance.SHA512
+        };
+        return assoc[algorithm]
+    };
+
+    return {
+        getHmacHash: function(message, algorithm, key, callback) {
+            if ( ! isValidAlgorithm(algorithm)) {
+                callback({errorMsg: "Invalid algorithm",
+                             result: null});
+                return;
+            }
+            callback({errorMsg: "",
+                 result: toolsApiInstance.getHmacHash(
+                             message, stringToCryptoAlgorithm(algorithm), key)});
+        },
+        sendHttpRequest: function(url, location, request, payload, callback) {
+            if ( ! toolsApiInstance.areCompatibleCorsUrl(url, location)) {
+                console.error('sendHttpRequest: incompatible CORS request urls')
+                return;
+            }
+
+            var xmlrequest = new XMLHttpRequest();
+
+            var verb = payload && payload.length !== 0
+                    ? "POST" : "GET"
+
+            xmlrequest.open(verb, url, true);
+
+            xmlrequest.onreadystatechange = function() {
+                if (xmlrequest.readyState === XMLHttpRequest.DONE) {
+                    callback({
+                        errorMsg: xmlrequest.statusText,
+                        success: xmlrequest.status == 200,
+                        response: xmlrequest.responseText
+                    });
+                }
+            };
+
+            for (var header in request.headers) {
+                if (request.headers.hasOwnProperty(header)) {
+                    xmlrequest.setRequestHeader(header, request.headers[header])
+                }
+            }
+
+            xmlrequest.setRequestHeader(
+                "Content-Length",
+                String(payload.length));
+
+            xmlrequest.send(payload);
+        }
+    };
+}

=== added directory 'src/Ubuntu/UnityWebApps/bindings/tools/client'
=== added file 'src/Ubuntu/UnityWebApps/bindings/tools/client/tools.js'
--- src/Ubuntu/UnityWebApps/bindings/tools/client/tools.js	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/bindings/tools/client/tools.js	2015-03-27 19:32:46 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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-webapps-qml 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/>.
+ */
+
+
+/**
+ * Tools gives access to various helpers/tools.
+
+ * @module Tools
+ */
+function createToolsApi(backendBridge) {
+    var PLUGIN_URI = 'Tools';
+
+/**
+ * The Tools object
+
+ * @class Tools
+ * @constructor
+ * @example
+
+       var api = external.getUnityObject('1.0');
+       api.Tools.getHmacHash(hmac, algorithm, key, function(result) {
+         console.log('Application name: ' + result);
+       });
+ */
+    return {
+        /**
+           Enumeration of the available types of CryptographicAlgorithm.
+
+             Values:
+
+               MD5: MD5 hash function
+
+               SHA1: SHA1 hash function
+
+               SHA256: SHA-256 hash function
+
+               SHA512: SHA-512 hash function
+
+           @static
+           @property CryptographicAlgorithm {Object}
+
+           @example
+
+               var api = external.getUnityObject('1.0');
+               var algorithm = api.Tools.CryptographicAlgorithm;
+               // use algorithm.MD5, algorithm.SHA-1, ...
+         */
+        CryptographicAlgorithm: {
+            MD5: "MD5",
+
+            SHA1: "SHA1",
+
+            SHA256: "SHA256",
+
+            SHA512: "SHA512"
+        },
+
+        /**
+         * Generates a .
+         *
+         * @method getHmacHash
+         * @param message {Function (Application)}
+         * @param algorithm {CryptographicAlgorithm}
+         * @param key {Function (Application)}
+         * @param callback {Function (Application)}
+         */
+        getHmacHash: function(message, algorithm, key, callback) {
+            if (! callback || typeof(callback) !== 'function') {
+                return;
+            }
+            backendBridge.call('ToolsApi.getHmacHash'
+                               , [message, algorithm, key]
+                               , callback);
+        },
+
+        /**
+         * @internal
+         */
+        __private__: {
+            sendHttpRequest: function(url, request, payload, callback) {
+                if (! callback || typeof(callback) !== 'function') {
+                    return;
+                }
+                var location = window && window.location ? window.location.href : ""
+                backendBridge.call('ToolsApi.sendHttpRequest'
+                                   , [url, location, request, payload]
+                                   , callback);
+            }
+        }
+    };
+};

=== modified file 'src/Ubuntu/UnityWebApps/plugin/plugin.pro'
--- src/Ubuntu/UnityWebApps/plugin/plugin.pro	2014-07-07 18:59:19 +0000
+++ src/Ubuntu/UnityWebApps/plugin/plugin.pro	2015-03-27 19:32:46 +0000
@@ -41,6 +41,7 @@
     callback.cpp \
     abstract-item-model-adaptor.cpp \
     application-api.cpp \
+    tools-api.cpp \
     application-signal-to-qt-bridge.cpp
 
 HEADERS += \
@@ -59,6 +60,7 @@
     callback.h \
     abstract-item-model-adaptor.h \
     application-api.h \
+    tools-api.h \
     application-signal-to-qt-bridge.h
 
 DEFINES += \

=== modified file 'src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp'
--- src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp	2014-07-07 18:59:19 +0000
+++ src/Ubuntu/UnityWebApps/plugin/qml-plugin.cpp	2015-03-27 19:32:46 +0000
@@ -30,6 +30,7 @@
 #include "unity-webapps-app-infos.h"
 
 #include "application-api.h"
+#include "tools-api.h"
 #include "abstract-item-model-adaptor.h"
 #include "callback.h"
 
@@ -43,6 +44,14 @@
     return new ApplicationApi();
 }
 
+static QObject *createToolsApi(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+
+    return new ToolsApi();
+}
+
 void WebappsQmlPlugin::registerTypes(const char *uri)
 {
     // bindings
@@ -60,7 +69,9 @@
     // TODO bump version
     qmlRegisterType<AbstractItemModelAdaptor> (uri, 0, 1, "AbstractItemModelAdaptor");
 
-    //
+    // Application Api entry point
     qmlRegisterSingletonType<ApplicationApi>(uri, 0, 1, "ApplicationApi", createApplicationApi);
+
+    // Tools Api entry point
+    qmlRegisterSingletonType<ToolsApi>(uri, 0, 2, "ToolsApi", createToolsApi);
 }
-

=== added file 'src/Ubuntu/UnityWebApps/plugin/tools-api.cpp'
--- src/Ubuntu/UnityWebApps/plugin/tools-api.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/plugin/tools-api.cpp	2015-03-27 19:32:46 +0000
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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-webapps-qml 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/>.
+ */
+
+#include "tools-api.h"
+
+#include <QCryptographicHash>
+#include <QDebug>
+#include <QMessageAuthenticationCode>
+#include <QUrl>
+#include <QString>
+#include <QFileInfo>
+#include <QFile>
+
+
+namespace {
+
+bool enumToQtCryptoAlgorithm(
+        ToolsApi::CryptographicAlgorithm algorithm,
+        QCryptographicHash::Algorithm & out)
+{
+    switch(algorithm)
+    {
+    case ToolsApi::MD5:
+        out = QCryptographicHash::Md5;
+        return true;
+        break;
+    case ToolsApi::SHA1:
+        out = QCryptographicHash::Sha1;
+        return true;
+        break;
+    case ToolsApi::SHA256:
+        out = QCryptographicHash::Sha256;
+        return true;
+        break;
+    case ToolsApi::SHA512:
+        out = QCryptographicHash::Sha512;
+        return true;
+        break;
+    }
+    return false;
+}
+
+QString getSecondLevelDomain(const QUrl& url)
+{
+    QString tld = url.topLevelDomain();
+    QString host = url.host().left(url.host().length() - tld.length());
+    QStringList s = host.split(".", QString::SkipEmptyParts);
+    return s.isEmpty() ? tld : (s.last() + tld);
+}
+
+}
+
+
+/**
+ * @brief ToolsApi::ToolsApi
+ * @param parent
+ */
+ToolsApi::ToolsApi(QObject *parent) :
+    QObject(parent)
+{}
+
+
+/**
+ * Compute a HMAC for a given message given a cryptographic key
+ * and specific crypto algorithm.
+ *
+ * @brief ToolsApi::getHmacHash
+ * @param message
+ * @param algorithm
+ * @param key
+ * @return HMAC of the message
+ */
+QString ToolsApi::getHmacHash(
+        const QString& message,
+        ToolsApi::CryptographicAlgorithm algorithm,
+        const QString& key) const
+{
+    QCryptographicHash::Algorithm
+            method = QCryptographicHash::Md5;
+    if ( ! enumToQtCryptoAlgorithm(algorithm, method))
+    {
+        qCritical() << "Invalid HMAC method algorithm";
+        return QString();
+    }
+    QMessageAuthenticationCode
+            code(method, key.toUtf8());
+    code.addData(message.toUtf8());
+    return QString::fromUtf8(code.result().toBase64());
+}
+
+
+/**
+ * @brief ToolsApi::isCompatibleCorsRequest
+ * @param requestUrl
+ * @param locationUrl
+ * @return
+ */
+bool ToolsApi::areCompatibleCorsUrl(
+        const QUrl& url1,
+        const QUrl& url2) const
+{
+    return url1.scheme() == url2.scheme()
+        && url1.topLevelDomain() == url2.topLevelDomain()
+        && getSecondLevelDomain(url1) == getSecondLevelDomain(url2);
+}

=== added file 'src/Ubuntu/UnityWebApps/plugin/tools-api.h'
--- src/Ubuntu/UnityWebApps/plugin/tools-api.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/UnityWebApps/plugin/tools-api.h	2015-03-27 19:32:46 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of unity-webapps-qml.
+ *
+ * unity-webapps-qml 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-webapps-qml 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/>.
+ */
+
+#ifndef UNITY_WEBAPPS_TOOLSAPI_H
+#define UNITY_WEBAPPS_TOOLSAPI_H
+
+#include <QObject>
+
+
+class ToolsApi : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(CryptographicAlgorithm)
+
+public:
+    explicit ToolsApi(QObject *parent = 0);
+
+    enum CryptographicAlgorithm
+    {
+        MD5,
+        SHA1,
+        SHA256,
+        SHA512
+    };
+
+    Q_INVOKABLE QString getHmacHash(
+            const QString &hmac,
+            CryptographicAlgorithm algorithm,
+            const QString& key) const;
+
+    Q_INVOKABLE bool areCompatibleCorsUrl(
+            const QUrl& url1,
+            const QUrl& url2) const;
+};
+
+#endif // UNITY_WEBAPPS_TOOLSAPI_H

=== modified file 'src/Ubuntu/UnityWebApps/unity-webapps-api.js.in'
--- src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-06-04 21:17:00 +0000
+++ src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2015-03-27 19:32:46 +0000
@@ -35,6 +35,7 @@
     //@include ./bindings/online-accounts/client/online-accounts.js
     //@include ./bindings/runtime-api/client/runtime-api.js
     //@include ./bindings/download-manager/client/download-api.js
+    //@include ./bindings/tools/client/tools.js
     //@include ./common/js/unity-backend-messaging-proxy.js
     //@include ./common/js/unity-binding-proxy.js
     //@include ./common/js/unity-binding-bridge.js
@@ -290,6 +291,7 @@
             ContentHub: createContentHubApi(backend),
             RuntimeApi: createRuntimeApi(backend),
             DownloadApi: createDownloadApi(backend),
+            ToolsApi: createToolsApi(backend)
         };
 
         return api;

=== modified file 'tests/autopilot/html/test_webapps_api_injected.html'
--- tests/autopilot/html/test_webapps_api_injected.html	2014-04-22 15:40:04 +0000
+++ tests/autopilot/html/test_webapps_api_injected.html	2015-03-27 19:32:46 +0000
@@ -32,6 +32,9 @@
 <div id="content">
 </div>
 
+<div id="results">
+</div>
+
 </body>
 
 </html>

=== modified file 'tests/autopilot/setup.py'
--- tests/autopilot/setup.py	2013-07-09 19:02:23 +0000
+++ tests/autopilot/setup.py	2015-03-27 19:32:46 +0000
@@ -6,15 +6,14 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-
 from distutils.core import setup
 from setuptools import find_packages
 
 setup(
-   name='unity-webapps-qml',
-   version='0.1',
-   description='Unity WebApps QML component autopilot tests.',
-   url='https://launchpad.net/unity-webapps-qml',
-   license='GPLv3',
-   packages=find_packages(),
+    name='unity-webapps-qml',
+    version='0.1',
+    description='Unity WebApps QML component autopilot tests.',
+    url='https://launchpad.net/unity-webapps-qml',
+    license='GPLv3',
+    packages=find_packages(),
 )

=== modified file 'tests/autopilot/unity_webapps_qml/tests/__init__.py'
--- tests/autopilot/unity_webapps_qml/tests/__init__.py	2014-07-14 19:01:17 +0000
+++ tests/autopilot/unity_webapps_qml/tests/__init__.py	2015-03-27 19:32:46 +0000
@@ -9,27 +9,27 @@
 
 import os
 import os.path
-import shutil
-import tempfile
 import json
 
-from testtools.matchers import Contains, Equals, GreaterThan
+from testtools.matchers import Equals, GreaterThan
 from autopilot.matchers import Eventually
 from unity_webapps_qml.tests import fake_servers
 
-from unity.emulators.unity import Unity
-
 from unity.tests import UnityTestCase
 
-LOCAL_QML_LAUNCHER_APP_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../../../tools/qml-launcher/unity-webapps-qml-launcher')
+LOCAL_QML_LAUNCHER_APP_PATH = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../../../tools/qml-launcher/unity-webapps-qml-launcher')
 INSTALLED_QML_LAUNCHER_APP_PATH = 'unity-webapps-qml-launcher'
-
-# TODO create __init__.py.in
-LOCAL_BROWSER_CONTAINER_PATH = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../qml/FullWebViewApp.qml')
-INSTALLED_BROWSER_CONTAINER_PATH = '/usr/share/unity-webapps-qml/autopilot-tests/qml/FullWebViewApp.qml'
+LOCAL_BROWSER_CONTAINER_PATH = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../qml/FullWebViewApp.qml')
+INSTALLED_BROWSER_CONTAINER_PATH = '/usr/share \
+    /unity-webapps-qml/autopilot-tests/qml/FullWebViewApp.qml'
 
 BASE_URL = ''
 
+
 class UnityWebappsTestCaseBase(UnityTestCase):
 
     def setUp(self):
@@ -59,7 +59,8 @@
                           webapp_homepage="",
                           use_oxide=False,
                           extra_params=[]):
-        base_params = ['--qml=' + self.get_qml_browser_container_path(),
+        base_params = [
+            '--qml=' + self.get_qml_browser_container_path(),
             '--app-id=' + webapp_name,
             '--webappName=' + webapp_name,
             '--webappSearchPath=' + webapp_search_path]
@@ -75,8 +76,10 @@
 
         if os.path.exists(LOCAL_QML_LAUNCHER_APP_PATH):
             # we are local
-            base_params.append('--import=' + os.path.join (os.path.dirname(os.path.realpath(__file__)),
-                               '../../../../src'))
+            base_params.append(
+                '--import=' + os.path.join(
+                    os.path.dirname(os.path.realpath(__file__)),
+                    '../../../../src'))
 
         base_params += extra_params
 
@@ -86,18 +89,25 @@
         self.assertThat(os.path.exists(html_filepath), Equals(True))
         url = self.create_file_url(html_filepath)
 
-        self.launch_application(self.get_launch_params(url, 'unitywebappsqmllauncher', '', '', False, extra_params))
+        self.launch_application(
+            self.get_launch_params(
+                url,
+                'unitywebappsqmllauncher',
+                '',
+                '',
+                False,
+                extra_params))
         self.assert_url_eventually_loaded(url)
 
     def launch_application(self, args):
-        print 'Launching test with params:', args, "with", self.get_qml_launcher_path()
-
-        self.app = self.launch_test_application(self.get_qml_launcher_path(),
+        self.app = self.launch_test_application(
+            self.get_qml_launcher_path(),
             *args,
             app_type='qt')
 
         self.webviewContainer = self.get_webviewContainer()
-        self.watcher = self.webviewContainer.watch_signal('resultUpdated(QString)')
+        self.watcher = self.webviewContainer.watch_signal(
+            'resultUpdated(QString)')
 
     def pick_app_launcher(self, app_path):
         # force Qt app introspection:
@@ -123,9 +133,14 @@
         webview = self.get_webviewContainer()
         prev_emissions = self.watcher.num_emissions
         webview.slots.evalInPageUnsafe(expr)
-        self.assertThat(lambda: self.watcher.num_emissions, Eventually(GreaterThan(prev_emissions)))
-        results = json.loads(webview.get_signal_emissions('resultUpdated(QString)')[-1][0])
-        return results.has_key('result') and results['result'] or None
+        self.assertThat(
+            lambda: self.watcher.num_emissions,
+            Eventually(GreaterThan(prev_emissions)))
+        results = json.loads(
+            webview.get_signal_emissions(
+                'resultUpdated(QString)')[-1][0])
+        return 'result' in results and results['result'] or None
+
 
 class WebappsTestCaseBaseWithLocalHttpContentBase(UnityWebappsTestCaseBase):
     def setUp(self):
@@ -136,5 +151,11 @@
 
     def launch_with_webapp(self, name, webapp_search_path, use_oxide=False):
         self.use_oxide = use_oxide
-        self.launch_application(self.get_launch_params("", name, webapp_search_path, self.base_url, use_oxide))
+        self.launch_application(
+            self.get_launch_params(
+                "",
+                name,
+                webapp_search_path,
+                self.base_url,
+                use_oxide))
         self.assert_url_eventually_loaded(self.base_url)

=== added file 'tests/autopilot/unity_webapps_qml/tests/test_api_tools.py'
--- tests/autopilot/unity_webapps_qml/tests/test_api_tools.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_api_tools.py	2015-03-27 19:32:46 +0000
@@ -0,0 +1,116 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+from __future__ import absolute_import
+
+import os
+
+from testtools.matchers import Equals, NotEquals, Contains
+from autopilot.matchers import Eventually
+
+from unity_webapps_qml.tests import UnityWebappsTestCaseBase
+
+LOCAL_HTML_TEST_FILE = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_api_injected.html')
+
+INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests\
+    /html/test_webapps_api_injected.html'
+
+
+class UnityWebappsApiToolsTestCaseBase(UnityWebappsTestCaseBase):
+
+    def get_html_test_file(self):
+        if os.path.exists(LOCAL_HTML_TEST_FILE):
+            return os.path.abspath(LOCAL_HTML_TEST_FILE)
+        return INSTALLED_HTML_TEST_FILE
+
+    def setUp(self):
+        super(UnityWebappsApiToolsTestCaseBase, self).setUp()
+        self.launch_with_html_filepath(self.get_html_test_file())
+
+    def test_apiFound(self):
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
+
+        expression = """
+            var api = window.external.getUnityObject("1.0");
+            return api.ToolsApi != null
+                && api.ToolsApi.getHmacHash != null
+                && api.ToolsApi.__private__.sendHttpRequest != null
+        """
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals(True)))
+
+    def test_hmacCall(self):
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
+
+        expression = """
+            var api = window.external.getUnityObject("1.0");
+            api.ToolsApi.getHmacHash(
+                "hi",
+                api.ToolsApi.CryptographicAlgorithm.SHA1,
+                "all",
+                function(hmac) {
+                    document.getElementById('results').innerHTML =
+                        (hmac.errorMsg && hmac.errorMsg.length !== 0)
+                            ? ("FAIL,"+hmac.errorMsg) : ("OK,"+hmac.result);
+                });
+            return true;
+        """
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals(True)))
+
+        expression = """
+            return document.getElementById('results').innerHTML
+        """
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Contains("OK,")))
+
+        result = self.eval_expression_in_page_unsafe(expression)
+        result = result.strip('OK,')
+        self.assertThat(
+            len(result),
+            NotEquals(0))
+
+    def test_invalidHmacCall(self):
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
+
+        expression = """
+            var api = window.external.getUnityObject("1.0");
+            api.ToolsApi.getHmacHash(
+                "hi",
+                "Invalid",
+                "all",
+                function(hmac) {
+                    document.getElementById('results').innerHTML =
+                        (hmac.errorMsg && hmac.errorMsg.length !== 0)
+                            ? ("FAIL,"+hmac.errorMsg) : ("OK,"+hmac.result);
+                });
+            return true;
+        """
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals(True)))
+
+        expression = """
+            return document.getElementById('results').innerHTML
+        """
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Contains("FAIL,")))

=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_callbackDispatch.py'
--- tests/autopilot/unity_webapps_qml/tests/test_callbackDispatch.py	2014-07-11 17:13:18 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_callbackDispatch.py	2015-03-27 19:32:46 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2014 Canonical
+# Copyright 2014-2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -7,22 +7,34 @@
 
 from __future__ import absolute_import
 
-import time
 import os
 
-from testtools.matchers import Equals, GreaterThan, NotEquals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from unity_webapps_qml.tests import UnityWebappsTestCaseBase
 
-LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_callback_dispatch.html')
-INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_callback_dispatch.html'
-
-LOCAL_JS_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_callback_dispatch_api.js')
-INSTALLED_JS_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_callback_dispatch_api.js'
-
-LOCAL_QML_BACKEND_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../qml/test_webapps_callback_dispatch_api.qml')
-INSTALLED_QML_BACKEND_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/qml/test_webapps_callback_dispatch_api.qml'
+LOCAL_HTML_TEST_FILE = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_callback_dispatch.html')
+INSTALLED_HTML_TEST_FILE = '/usr/share\
+    /unity-webapps-qml/autopilot-tests\
+    /html/test_webapps_callback_dispatch.html'
+
+LOCAL_JS_TEST_FILE = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_callback_dispatch_api.js')
+INSTALLED_JS_TEST_FILE = '/usr/share\
+    /unity-webapps-qml/autopilot-tests/html\
+    /test_webapps_callback_dispatch_api.js'
+
+LOCAL_QML_BACKEND_TEST_FILE = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../qml/test_webapps_callback_dispatch_api.qml')
+INSTALLED_QML_BACKEND_TEST_FILE = '/usr/share\
+    /unity-webapps-qml/autopilot-tests/qml\
+    /test_webapps_callback_dispatch_api.qml'
+
 
 class WebappsCallbackDispatchTestCaseBase(UnityWebappsTestCaseBase):
     def setUp(self):
@@ -55,6 +67,6 @@
             Eventually(Equals(True)))
 
         self.assertThat(
-            lambda: self.eval_expression_in_page_unsafe("return document.getElementById('content').innerHTML;"),
+            lambda: self.eval_expression_in_page_unsafe(
+                "return document.getElementById('content').innerHTML;"),
             Eventually(Equals('callback-loop-count-reached')))
-

=== removed file 'tests/autopilot/unity_webapps_qml/tests/test_hud.py'
--- tests/autopilot/unity_webapps_qml/tests/test_hud.py	2014-04-22 15:40:04 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_hud.py	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-import os
-import time
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
-from autopilot.matchers import Eventually
-
-from autopilot import platform
-
-from unity.emulators.icons import HudLauncherIcon
-from unity.emulators import ensure_unity_is_running
-
-from unity_webapps_qml.tests import UnityWebappsTestCaseBase
-
-class UnityWebappsHudTestCase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_hud.html')
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_hud.html'
-
-    def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
-
-    def setUp(self):
-        super(UnityWebappsHudTestCase, self).setUp()
-        # On Touch the dbus unity if does is not exposed
-        if platform.model() == 'Desktop':
-            ensure_unity_is_running()
-        self.launch_with_html_filepath(self.get_html_test_file())
-
-    def test_addAction(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('actionadded')))
-
-        self.unity.hud.ensure_visible()
-        self.addCleanup(self.unity.hud.ensure_hidden)
-
-        self.keyboard.type("Hello")
-        self.keyboard.press_and_release("Enter")
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), Eventually(Equals('none')))
-
-    def test_clearAction(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('actionadded')))
-        expr = """
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'clearAction', 'args': ['Hello']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.unity.hud.ensure_visible()
-        self.addCleanup(self.unity.hud.ensure_hidden)
-
-        self.keyboard.type("Hello")
-        self.keyboard.press_and_release("Enter")
-        self.assertThat(self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), NotEquals('none'))
-
-    def test_clearActions(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('actionadded')))
-        expr = """
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'clearActions', 'args': []})});
-           document.dispatchEvent (e);
-           return true;
-        """
-
-        self.eval_expression_in_page_unsafe(expr)
-
-        actions = ['Hello', 'Another action']
-        for action in actions:
-            self.unity.hud.ensure_visible()
-            self.addCleanup(self.unity.hud.ensure_hidden)
-            self.keyboard.type(action)
-            self.keyboard.press_and_release("Enter")
-
-            self.assertThat(self.eval_expression_in_page_unsafe("return document.getElementById('content').style.display;"), NotEquals('none'))

=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py'
--- tests/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2014-04-22 15:40:04 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_injectedOnWebapp.py	2015-03-27 19:32:46 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
+# Copyright 2013-2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -7,51 +7,75 @@
 
 from __future__ import absolute_import
 
-import time
 import os
 
-from testtools.matchers import Equals, GreaterThan, NotEquals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from unity_webapps_qml.tests import UnityWebappsTestCaseBase
 
+LOCAL_HTML_TEST_FILE = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../html/test_webapps_api_injected.html')
+INSTALLED_HTML_TEST_FILE = '/usr/share\
+    /unity-webapps-qml/autopilot-tests/html/test_webapps_api_injected.html'
+
+
 class UnityWebappsApiInjectedTestCaseBase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_api_injected.html')
-
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_api_injected.html'
 
     def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
+        if os.path.exists(LOCAL_HTML_TEST_FILE):
+            return os.path.abspath(LOCAL_HTML_TEST_FILE)
+        return INSTALLED_HTML_TEST_FILE
 
     def setUp(self):
         super(UnityWebappsApiInjectedTestCaseBase, self).setUp()
         self.launch_with_html_filepath(self.get_html_test_file())
 
     def test_getUnityObjectFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null'),
+            Eventually(Equals(True)))
 
     def test_actionsApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var unity = window.external.getUnityObject("1.0");
-            return unity.addAction != null && unity.clearActions != null && unity.clearAction != null;
+            return unity.addAction != null &&
+                unity.clearActions != null &&
+                unity.clearAction != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                expression),
+            Eventually(Equals(True)))
 
     def test_notificationApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var unity = window.external.getUnityObject("1.0");
-            return unity.Notification != null && unity.Notification.showNotification != null;
+            return unity.Notification != null &&
+                unity.Notification.showNotification != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                expression),
+            Eventually(Equals(True)))
 
     def test_messagingIndicatorApiFound(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var unity = window.external.getUnityObject("1.0");
@@ -61,15 +85,23 @@
                 unity.MessagingIndicator.clearIndicators != null &&
                 unity.MessagingIndicator.showIndicator != null;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                expression),
+            Eventually(Equals(True)))
 
     def test_ubuntuReadyEventSent(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
-            var api_ready_count = window.localStorage['ubuntu-webapps-api-ready-key'];
+            var api_ready_count =
+                window.localStorage['ubuntu-webapps-api-ready-key'];
             return api_ready_count != null && api_ready_count > 0;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals(True)))
-
-
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                expression),
+            Eventually(Equals(True)))

=== modified file 'tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py'
--- tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	2014-07-16 20:15:17 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_installedWebapp.py	2015-03-27 19:32:46 +0000
@@ -1,5 +1,5 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
+# Copyright 2013-2015 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -7,18 +7,22 @@
 
 from __future__ import absolute_import
 
-import time
 import os
+import unittest
 
-from testtools.matchers import Equals, GreaterThan, NotEquals
+from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
 from unity_webapps_qml.tests import WebappsTestCaseBaseWithLocalHttpContentBase
 
-LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../data')
+LOCAL_HTML_TEST_FILE = "%s/%s" % (
+    os.path.dirname(os.path.realpath(__file__)),
+    '../../data')
 INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/data'
 
-class InstalledWebappsTestCaseBase(WebappsTestCaseBaseWithLocalHttpContentBase):
+
+class InstalledWebappsTestCaseBase(
+        WebappsTestCaseBaseWithLocalHttpContentBase):
     def setUp(self):
         super(InstalledWebappsTestCaseBase, self).setUp()
 
@@ -30,34 +34,64 @@
     def test_normalWebappFound(self):
         self.launch_with_webapp('Normal', self.get_webapp_install_folder())
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var contentElement = document.getElementById('content');
             return contentElement.innerHTML;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals("WebApp Script Injected")))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                expression),
+            Eventually(Equals("WebApp Script Injected")))
 
     def test_webappWithUAOverrideFound(self):
-        self.launch_with_webapp('AlteredUAWebapp', self.get_webapp_install_folder(), True)
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return navigator.userAgent;'), Eventually(Equals("My Override")))
+        self.launch_with_webapp(
+            'AlteredUAWebapp',
+            self.get_webapp_install_folder(),
+            True)
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return navigator.userAgent;'),
+            Eventually(Equals("My Override")))
 
     def test_webappFoundWithSpecialWebappPropertiesFile(self):
-        self.launch_with_webapp('ExtendedWebappProperties', self.get_webapp_install_folder() + '/all-in-same-folder')
+        self.launch_with_webapp(
+            'ExtendedWebappProperties',
+            self.get_webapp_install_folder() + '/all-in-same-folder')
 
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))
 
         expression = """
             var contentElement = document.getElementById('content');
             return contentElement.innerHTML;
         """
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe(expression), Eventually(Equals("WebApp Script Injected")))
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(expression),
+            Eventually(Equals("WebApp Script Injected")))
 
+    @unittest.skip("Demonstrates some flackiness")
     def test_webappPropertiesFileWithUA(self):
-        self.launch_with_webapp('ExtendedWebappProperties', self.get_webapp_install_folder() + '/all-in-same-folder', True)
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return navigator.userAgent;'), Eventually(Equals("My Override")))
+        self.launch_with_webapp(
+            'ExtendedWebappProperties',
+            self.get_webapp_install_folder() + '/all-in-same-folder',
+            True)
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return navigator.userAgent;'),
+            Eventually(Equals("My Override")))
 
     def test_webappPropertiesNameUpdated(self):
-        self.launch_with_webapp('', self.get_webapp_install_folder() + '/all-in-same-folder')
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe('return window.external.getUnityObject("1.0") != null;'), Eventually(Equals(True)))
-
+        self.launch_with_webapp(
+            '',
+            self.get_webapp_install_folder() + '/all-in-same-folder')
+        self.assertThat(
+            lambda: self.eval_expression_in_page_unsafe(
+                'return window.external.getUnityObject("1.0") != null;'),
+            Eventually(Equals(True)))

=== removed file 'tests/autopilot/unity_webapps_qml/tests/test_launcher.py'
--- tests/autopilot/unity_webapps_qml/tests/test_launcher.py	2013-09-23 19:59:29 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_launcher.py	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-import os
-import time
-
-from gi.repository import Unity, GObject
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
-from testtools import skipUnless
-
-from autopilot import platform
-from autopilot.matchers import Eventually
-
-from unity.emulators.icons import HudLauncherIcon
-from unity.emulators import ensure_unity_is_running
-
-from unity_webapps_qml.tests import UnityWebappsTestCaseBase
-
-class UnityWebappsLauncherTestCase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_launcher.html')
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_launcher.html'
-
-    def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
-
-    def setUp(self):
-        super(UnityWebappsLauncherTestCase, self).setUp()
-        # On Touch the dbus unity if does is not exposed
-        if platform.model() == 'Desktop':
-            ensure_unity_is_running()
-        self.launch_with_html_filepath(self.get_html_test_file())
-
-    @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
-    def test_checkCounts(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('launcher-updated')))
-
-        launcher_icon = self.unity.launcher.model.get_icon(desktop_id='unitywebappsqmllauncher.desktop')
-        self.assertThat(launcher_icon, NotEquals(None))
-
-        expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
-                var response = e.detail;
-                document.getElementById('status').innerHTML = '' + e.detail;
-           });
-
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'Launcher.__get', 'with_callback': true, 'args': ['count']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('42')))
-
-        # self.assertThat(launcher.get_property('progress'), Equals(0.09375))
-
-    @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
-    def test_checkProgress(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('launcher-updated')))
-
-        launcher_icon = self.unity.launcher.model.get_icon(desktop_id='unitywebappsqmllauncher.desktop')
-        self.assertThat(launcher_icon, NotEquals(None))
-
-        expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
-                var response = e.detail;
-                document.getElementById('status').innerHTML = '' + e.detail;
-           });
-
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'Launcher.__get', 'with_callback': true, 'args': ['progress']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('0.09375')))
-

=== removed file 'tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py'
--- tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	2013-09-23 19:59:29 +0000
+++ tests/autopilot/unity_webapps_qml/tests/test_mediaplayer.py	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-import os
-import time
-
-from gi.repository import Unity, GObject
-
-from testtools.matchers import Equals, GreaterThan, NotEquals
-from testtools import skipUnless
-
-from autopilot import platform
-from autopilot.matchers import Eventually
-
-from unity.emulators import ensure_unity_is_running
-
-from unity_webapps_qml.tests import UnityWebappsTestCaseBase
-
-
-class UnityWebappsMediaplayerTestCase(UnityWebappsTestCaseBase):
-    LOCAL_HTML_TEST_FILE = "%s/%s" % (os.path.dirname(os.path.realpath(__file__)), '../../html/test_webapps_mediaplayer.html')
-    INSTALLED_HTML_TEST_FILE = '/usr/share/unity-webapps-qml/autopilot-tests/html/test_webapps_mediaplayer.html'
-
-    def get_html_test_file(self):
-        if os.path.exists(self.LOCAL_HTML_TEST_FILE):
-            return os.path.abspath(self.LOCAL_HTML_TEST_FILE)
-        return self.INSTALLED_HTML_TEST_FILE
-
-    def setUp(self):
-        super(UnityWebappsMediaplayerTestCase, self).setUp()
-        # On Touch the dbus unity if does is not exposed
-        if platform.model() == 'Desktop':
-            ensure_unity_is_running()
-        self.launch_with_html_filepath(self.get_html_test_file())
-
-    @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
-    def test_checkInitialSetTrack(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
-
-        expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
-                var response = e.detail;
-                document.getElementById('status').innerHTML = '' + e.detail;
-           });
-
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['track']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('TXlBcnRpc3Q=;TXlUaXRsZQ==;TXlBbGJ1bQ==')))
-
-    @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
-    def test_checkInitialSetCanGoNext(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
-
-        expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
-                var response = e.detail;
-                document.getElementById('status').innerHTML = '' + e.detail;
-           });
-
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['can-go-next']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('true')))
-
-    @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
-    def test_checkInitialSetCanGoPrevious(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
-
-        expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
-                var response = e.detail;
-                document.getElementById('status').innerHTML = '' + e.detail;
-           });
-
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['can-go-previous']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('true')))
-
-    @skipUnless(platform.model() == 'Desktop', "Only runs on the Desktop")
-    def test_checkInitialSetCanPlay(self):
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('mediaplayer-updated')))
-
-        expr = """
-           document.addEventListener('unity-webapps-do-call-response', function(e) {
-                var response = e.detail;
-                document.getElementById('status').innerHTML = '' + e.detail;
-           });
-
-           var e = new CustomEvent ("unity-webapps-do-call", {"detail": JSON.stringify({"name": 'MediaPlayer.__get', 'with_callback': true, 'args': ['can-play']})});
-           document.dispatchEvent (e);
-           return true;
-        """
-        self.eval_expression_in_page_unsafe(expr)
-
-        self.assertThat(lambda: self.eval_expression_in_page_unsafe("return document.getElementById('status').innerHTML;"), Eventually(Equals('true')))
-