Merge lp:~justinmcp/unity-chromium-extension/native-messaging-2 into lp:~webapps/unity-chromium-extension/staging

[Justin McPherson]

[Alberto Mardegan (mardy)]

I'll test it soon, meanwhile I've just added some comments about the code.

[Alberto Mardegan (mardy)]

I tested it with launchpad.net, and seems to work well! :-)

review: Approve

[lp:~justinmcp/unity-chromium-extension/native-messaging-2]

268. By Justin McPherson on 2014-06-04

Results of review

[Justin McPherson (justinmcp)]

@mardy; I have inverted the result of the installed. It is true that
allowed does not imply installed, but in this scenario, it is correct to
return an installed status.

On Wed, Jun 4, 2014 at 11:30 AM, <email address hidden> wrote:

> The proposal to merge
> lp:~justinmcp/unity-chromium-extension/native-messaging-2 into
> lp:~webapps/unity-chromium-extension/staging has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~justinmcp/unity-chromium-extension/native-messaging-2/+merge/221666
> --
>
> https://code.launchpad.net/~justinmcp/unity-chromium-extension/native-messaging-2/+merge/221666
> You are the owner of
> lp:~justinmcp/unity-chromium-extension/native-messaging-2.
>

=== removed file 'AUTHORS'
=== removed file 'NEWS'
=== removed file 'README'
--- README	2012-11-14 20:26:07 +0000
+++ README	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-+
\ No newline at end of file

=== modified file 'chromium-extension/background-page.js'
--- chromium-extension/background-page.js	2014-05-21 07:36:09 +0000
+++ chromium-extension/background-page.js	2014-06-04 01:24:00 +0000
@@ -109,12 +109,12 @@
                         windowInfos.tabId,
                         function (result) {
                             if (result && result.integrate) {
-                                sendNativeMessaging({
+                                sendNativeMessage({
                                     "method" : "install",
                                     "url" : url
                                 })
                             } else {
-                                sendNativeMessaging({
+                                sendNativeMessage({
                                     "method" : "dont_ask",
                                     "url" : url
                                 })
@@ -169,12 +169,12 @@
                                 sender.tab.id,
                                 function (result) {
                                     if (result && result.integrate) {
-                                        sendNativeMessaging({
+                                        sendNativeMessage({
                                             "method" : "install",
                                             "url" : request.options.url
                                         })
                                     } else {
-                                        sendNativeMessaging({
+                                        sendNativeMessage({
                                             "method" : "dont_ask",
                                             "url" : request.options.url
                                         })

=== modified file 'common-vars.pri'
--- common-vars.pri	2014-05-19 14:04:19 +0000
+++ common-vars.pri	2014-06-04 01:24:00 +0000
@@ -3,4 +3,4 @@
 #-----------------------------------------------------------------------------
 
 PROJECT_NAME = unity_webapps_chromium
-PROJECT_VERSION = 3.1
+PROJECT_VERSION = 3.2

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-14 07:59:30 +0000
+++ debian/changelog	2014-06-04 01:24:00 +0000
@@ -1,8 +1,8 @@
-unity-chromium-extension (3.1.0+14.04.20140318-0ubuntu2) UNRELEASED; urgency=medium
-
-  * Support native messaging.
-
- -- Justin McPherson <justin@ubuntu>  Thu, 08 May 2014 14:25:18 +1000
+unity-chromium-extension (3.2.0+14.04.20140318-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Support native messaging. (with Alberto Mardegan)
+
+ -- Justin McPherson <[e-mail]>  Fri, 23 May 2014 20:31:14 +1000
 
 unity-chromium-extension (3.0.0+14.04.20140318-0ubuntu1) trusty; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2014-05-14 07:59:30 +0000
+++ debian/control	2014-06-04 01:24:00 +0000
@@ -4,7 +4,6 @@
 # FIXME: We should be using debhelper 9, but that breaks the build
 # for some currently unknown reason.
 Build-Depends: autotools-dev,
-#               chromium-browser (>= 20.0.1132.47~r144678-0ubuntu4),
                debhelper (>= 8),
                dh-autoreconf,
                gnome-common,
@@ -27,7 +26,7 @@
 
 Package: unity-chromium-extension
 Architecture: any
-Depends: chromium-browser (>= 20.0.1132.47~r144678-0ubuntu4),
+Depends: chromium-browser (>= 34.0.1847.116-0ubuntu2),
          unity-webapps-service,
          webbrowser-app,
          ${misc:Depends},

=== removed directory 'm4'
=== removed file 'messaging-host/installation-host'
--- messaging-host/installation-host	2014-05-21 07:15:14 +0000
+++ messaging-host/installation-host	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import select
-import struct
-import json
-from syslog import syslog
-
-
-SELECT_TIMEOUT = 10 # seconds
-
-def handle_start_service(message):
-    syslog('NMH: handle_start_sevice')
-    return {}
-
-def handle_url_loaded(message):
-    syslog('NMH: handle_url_loaded')
-    if message['url'] == 'http://slashdot.org/':
-        return { 'available': True, "appName" : "Slashdot", "appDomain" : "http://slashdot.org/" }
-    else:
-        return { 'available' : False }
-
-def handle_dont_ask(message):
-    return {}
-
-def handle_install(message):
-    return {}
-
-def handle_message(message):
-    syslog("NMH: handle message");
-    if message['method'] == 'start_service':
-        return handle_start_service(message)
-    if message['method'] == 'url_loaded':
-        return handle_url_loaded(message);
-    elif message['method'] == 'dont_ask':
-        return handle_dont_ask(message);
-    elif message['method'] == 'install':
-        return handle_install(message);
-    return {}
-
-def process_message():
-    syslog("NMH: process_message")
-    try:
-        packed_length = sys.stdin.read(4)
-        if packed_length == '':
-            return False
-        length = struct.unpack('I', packed_length)[0]
-        request = json.loads(sys.stdin.read(length).decode('utf-8'))
-        reply = handle_message(request)
-
-        syslog("recieved message from chrome %s" % request)
-        reply = json.dumps(reply)
-        sys.stdout.write(struct.pack('I', len(reply)) + reply)
-        sys.stdout.flush()
-        return True
-    except Excepion, e:
-        syslog("Exception from native host" + str(e))
-        sys.exit(1)
-
-def main():
-    while True:
-        rl, wl, xl = select.select([sys.stdin],[],[], SELECT_TIMEOUT)
-        if rl:
-            if process_message() == False:
-                syslog("Native Messaging Host: recved EOF")
-                sys.exit(0)
-        else:
-            syslog("Native Messaging Host: timeout")
-            sys.exit(0)
-
-if __name__ == '__main__':
-    syslog("Started messaging host")
-    main()
-

=== modified file 'messaging-host/main.cpp'
--- messaging-host/main.cpp	2014-05-22 07:10:55 +0000
+++ messaging-host/main.cpp	2014-06-04 01:24:00 +0000
@@ -46,7 +46,7 @@
         break;
     }
 
-    syslog(syslog_type, "com.canonical.webapps.installer: %s", localMsg.constData());
+    syslog(syslog_type, "%s", localMsg.constData());
 }
 
 
@@ -56,7 +56,7 @@
         qInstallMessageHandler(syslogOutputHandler);
     }
 
-    qDebug() << "started";
+    qDebug() << "Starting";
 
     QCoreApplication app(argc, argv);
 
@@ -64,7 +64,7 @@
     UnityWebapps::WebappsHandler handler;
     service.addHandler(&handler);
 
-    UnityWebapps::InactivityTimer inactivityTimer(10 * 1000);
+    UnityWebapps::InactivityTimer inactivityTimer(2 * 60 * 1000);
     QObject::connect(&inactivityTimer, SIGNAL(timeout()), &app, SLOT(quit()));
     inactivityTimer.watchObject(&service);
 
@@ -79,6 +79,10 @@
         return EXIT_FAILURE;
     }
 
-    return app.exec();
+    int r = app.exec();
+
+    qDebug() << "Finishing";
+
+    return r;
 }
 

=== modified file 'messaging-host/messaging-host.pro'
--- messaging-host/messaging-host.pro	2014-05-21 12:32:50 +0000
+++ messaging-host/messaging-host.pro	2014-06-04 01:24:00 +0000
@@ -4,11 +4,18 @@
 TARGET = unity-webapps-messaging-host
 
 CONFIG += \
+    link_pkgconfig \
     qt
 
 QT += \
     core
 
+PKGCONFIG += \
+    glib-2.0 \
+    gobject-2.0 \
+    libunity_webapps-0.2 \
+    libunity-webapps-repository \
+
 SOURCES = \
     connection.cpp \
     inactivity-timer.cpp \

=== modified file 'messaging-host/webapps-handler.cpp'
--- messaging-host/webapps-handler.cpp	2014-05-21 09:44:07 +0000
+++ messaging-host/webapps-handler.cpp	2014-06-04 01:24:00 +0000
@@ -16,6 +16,11 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+extern "C" {
+#include <unity-webapps-permissions.h>
+#include <unity-webapps-application-repository.h>
+}
+
 #include "webapps-handler.h"
 
 #include <QDebug>
@@ -32,20 +37,57 @@
     inline WebappsHandlerPrivate(WebappsHandler *service);
     inline ~WebappsHandlerPrivate();
 
+    UnityWebappsApplicationRepository *getRepository();
+
 private:
+    static
+    void installationCallback(UnityWebappsApplicationRepository *repository,
+                              const gchar *name,
+                              UnityWebappsApplicationStatus status,
+                              gpointer user_data);
+
     mutable WebappsHandler *q_ptr;
+    UnityWebappsApplicationRepository *applicationRepository;
 };
 
 } // namespace
 
+
 WebappsHandlerPrivate::WebappsHandlerPrivate(WebappsHandler *service):
-    q_ptr(service)
+    q_ptr(service),
+    applicationRepository(0)
 {
 }
 
 WebappsHandlerPrivate::~WebappsHandlerPrivate()
 {
-}
+    if (applicationRepository != 0) {
+        g_object_unref(G_OBJECT(applicationRepository));
+    }
+}
+
+UnityWebappsApplicationRepository *WebappsHandlerPrivate::getRepository()
+{
+    if (applicationRepository == 0) {
+        applicationRepository = unity_webapps_application_repository_new_default();
+        unity_webapps_application_repository_prepare(applicationRepository);
+    }
+    return applicationRepository;
+}
+
+void WebappsHandlerPrivate::installationCallback(
+    UnityWebappsApplicationRepository *repository,
+    const gchar *name,
+    UnityWebappsApplicationStatus status,
+    gpointer user_data
+)
+{
+    Q_UNUSED(repository);
+    Q_UNUSED(name);
+    Q_UNUSED(status);
+    Q_UNUSED(user_data);
+}
+
 
 WebappsHandler::WebappsHandler(QObject *parent):
     QObject(parent),
@@ -60,26 +102,182 @@
 
 QVariantMap WebappsHandler::url_loaded(const QVariantMap &message)
 {
-    qDebug() << Q_FUNC_INFO << message;
+    Q_D(WebappsHandler);
+
     QVariantMap reply;
-    if (message.value("url").toString() == QStringLiteral("http://slashdot.org/")) {
-        reply.insert("available", true);
-        reply.insert("appName", QStringLiteral("Slashdot"));
-        reply.insert("appDomain", QStringLiteral("http://slashdot.org/"));
-    }
+
+    if (!message.contains("url")) {
+        reply.insert("error", QStringLiteral("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+
+    GList *apps = unity_webapps_application_repository_resolve_url(
+                    d->getRepository(),
+                    url.toLocal8Bit().constData()
+                  );
+
+    if (apps == 0) {
+        reply.insert("available", false);
+        return reply;
+    }
+
+    // As per original extension only look at the first entry
+    const gchar *packageName = (const gchar*)apps->data;
+    UnityWebappsApplicationStatus status = unity_webapps_application_repository_get_resolved_application_status(
+                d->getRepository(),
+                packageName);
+
+    if (status == UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED) {
+        reply.insert("available", false);
+        g_list_free_full(apps, g_free);
+        return reply;
+    }
+
+    const gchar *appName = unity_webapps_application_repository_get_resolved_application_name(
+                        d->getRepository(),
+                        packageName);
+
+    const gchar *appDomain = unity_webapps_application_repository_get_resolved_application_domain(
+                        d->getRepository(),
+                        packageName);
+
+    if (unity_webapps_permissions_get_domain_dontask(appDomain) ||
+        unity_webapps_permissions_get_domain_allowed(appDomain)) {
+        reply.insert("available", false);
+        g_list_free_full(apps, g_free);
+        return reply;
+    }
+
+    reply.insert("available", true);
+    reply.insert("appName", QString::fromUtf8(appName));
+    reply.insert("appDomain", QString::fromUtf8(appDomain));
+
+    g_list_free_full(apps, g_free);
+
     return reply;
 }
 
 QVariantMap WebappsHandler::dont_ask(const QVariantMap &message)
 {
-    qDebug() << Q_FUNC_INFO << message;
+    Q_D(WebappsHandler);
+
     QVariantMap reply;
+
+    if (!message.contains("url")) {
+        reply.insert("error", QLatin1String("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+
+    GList *apps = unity_webapps_application_repository_resolve_url(
+                    d->getRepository(),
+                    url.toLocal8Bit().constData()
+                  );
+
+    if (apps == 0) {
+        reply.insert("available", false);
+        reply.insert("dont_ask", false);
+        return reply;
+    }
+
+    const gchar *packageName = (const gchar*)apps->data;
+
+    const gchar *appDomain = unity_webapps_application_repository_get_resolved_application_domain(
+                        d->getRepository(),
+                        packageName);
+
+    unity_webapps_permissions_dontask_domain(appDomain);
+
+    reply.insert("dont_ask", true);
+
+    g_list_free_full(apps, g_free);
+
     return reply;
 }
 
 QVariantMap WebappsHandler::install(const QVariantMap &message)
 {
-    qDebug() << Q_FUNC_INFO << message;
+    Q_D(WebappsHandler);
+
     QVariantMap reply;
+
+    if (!message.contains("url")) {
+        reply.insert("error", QLatin1String("malformed request"));
+        return reply;
+    }
+
+    QString url = message.value("url").toString();
+
+    GList *apps = unity_webapps_application_repository_resolve_url(
+                    d->getRepository(),
+                    url.toLocal8Bit().constData()
+                  );
+
+    if (apps == 0) {
+        reply.insert("available", false);
+        reply.insert("installed", false);
+        return reply;
+    }
+
+    const gchar *packageName = (const gchar*)apps->data;
+
+    UnityWebappsApplicationStatus status = unity_webapps_application_repository_get_resolved_application_status(
+                d->getRepository(),
+                packageName);
+
+    if (status == UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED) {
+        reply.insert("available", false);
+        reply.insert("installed", false);
+        g_list_free_full(apps, g_free);
+        return reply;
+    }
+
+    const gchar *appDomain = unity_webapps_application_repository_get_resolved_application_domain(
+                        d->getRepository(),
+                        packageName);
+    const gchar *appName = unity_webapps_application_repository_get_resolved_application_name(
+                        d->getRepository(),
+                        packageName);
+
+    switch (status) {
+    case UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE:
+        if (unity_webapps_permissions_get_domain_dontask(appDomain)) {
+            reply.insert("available", true);
+            reply.insert("installed", false);
+            g_list_free_full(apps, g_free);
+            return reply;
+        }
+        unity_webapps_permissions_allow_domain(appDomain);
+        unity_webapps_application_repository_install_application(
+            d->getRepository(),
+            packageName,
+            WebappsHandlerPrivate::installationCallback,
+            0);
+        break;
+
+    case UNITY_WEBAPPS_APPLICATION_STATUS_INSTALLED:
+        if (unity_webapps_permissions_get_domain_dontask(appDomain) ||
+            unity_webapps_permissions_get_domain_allowed(appDomain)) {
+            reply.insert("available", true);
+            reply.insert("installed", false);
+            g_list_free_full(apps, g_free);
+            return reply;
+        }
+        unity_webapps_application_repository_add_desktop_to_launcher(appName);
+        unity_webapps_permissions_allow_domain(appDomain);
+        break;
+    case UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED:
+        // handled above
+        break;
+    }
+
+    reply.insert("installed", true);
+
+    g_list_free_full(apps, g_free);
+
     return reply;
 }
+

=== modified file 'tests/unit/messaging-host/messaging-host.pro'
--- tests/unit/messaging-host/messaging-host.pro	2014-05-21 08:18:12 +0000
+++ tests/unit/messaging-host/messaging-host.pro	2014-06-04 01:24:00 +0000
@@ -3,7 +3,8 @@
     tst_connection \
     tst_connection_host \
     tst_inactivity_timer.pro \
-    tst_service.pro
+    tst_service.pro \
+    tst_webapps-handler.pro \
 
 tst_connection.file = tst_connection.pro
 tst_connection_host.file = tst_connection_host.pro

=== added file 'tests/unit/messaging-host/tst_webapps-handler.cpp'
--- tests/unit/messaging-host/tst_webapps-handler.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/tst_webapps-handler.cpp	2014-06-04 01:24:00 +0000
@@ -0,0 +1,324 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This file is part of unity-chromium-extension
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+extern "C" {
+#include <unity-webapps-permissions.h>
+#include <unity-webapps-application-repository.h>
+}
+
+#include "webapps-handler.h"
+
+#include <QDebug>
+#include <QSignalSpy>
+#include <QTest>
+
+
+// {{{ mock implementations
+struct AppInfo {
+    bool install;
+    bool allowed;
+    bool dontask;
+    UnityWebappsApplicationStatus status;
+    QString name;
+    QString domain;
+};
+
+QMap<QString, AppInfo> _mock_app_info;
+
+UnityWebappsApplicationRepository *unity_webapps_application_repository_new_default()
+{
+    return (UnityWebappsApplicationRepository*)g_object_new(G_TYPE_OBJECT, 0);
+}
+
+gboolean unity_webapps_application_repository_prepare(UnityWebappsApplicationRepository *repository)
+{
+    Q_UNUSED(repository);
+
+    return true;
+}
+
+GList * unity_webapps_application_repository_resolve_url(UnityWebappsApplicationRepository *repository, const gchar *url)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(url))) {
+        return 0;
+    }
+
+    return g_list_append((GList*)0, (gpointer)g_strdup(url));
+}
+
+UnityWebappsApplicationStatus
+unity_webapps_application_repository_get_resolved_application_status(
+    UnityWebappsApplicationRepository *repository,
+    const gchar *application
+)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
+        return UNITY_WEBAPPS_APPLICATION_STATUS_UNRESOLVED;
+    }
+
+    return _mock_app_info.value(QString::fromUtf8(application)).status;
+}
+
+const gchar *
+unity_webapps_application_repository_get_resolved_application_name(UnityWebappsApplicationRepository *repository,
+                                                                    const gchar *application)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
+        return 0;
+    }
+
+    return g_strdup(_mock_app_info.value(QString::fromUtf8(application)).name.toLocal8Bit().constData());
+}
+
+const gchar *
+unity_webapps_application_repository_get_resolved_application_domain(UnityWebappsApplicationRepository *repository,
+																	  const gchar *application)
+{
+    Q_UNUSED(repository);
+
+    if (!_mock_app_info.contains(QString::fromUtf8(application))) {
+        return 0;
+    }
+
+    return g_strdup(_mock_app_info.value(QString::fromUtf8(application)).domain.toLocal8Bit().constData());
+}
+
+
+gboolean unity_webapps_permissions_get_domain_allowed(const gchar *domain)
+{
+    Q_FOREACH(const QString &key, _mock_app_info.keys()) {
+        AppInfo appInfo = _mock_app_info.value(key);
+        if (appInfo.domain == QLatin1String(domain)) {
+            return appInfo.allowed;
+        }
+    }
+
+    return false;
+}
+
+gboolean unity_webapps_permissions_get_domain_dontask(const gchar *domain)
+{
+    Q_FOREACH(const QString &key, _mock_app_info.keys()) {
+        AppInfo appInfo = _mock_app_info.value(key);
+        if (appInfo.domain == QLatin1String(domain)) {
+            return appInfo.dontask;
+        }
+    }
+
+    return false;
+}
+
+void unity_webapps_permissions_dontask_domain(const gchar *domain)
+{
+    Q_UNUSED(domain);
+}
+
+void
+unity_webapps_application_repository_install_application(UnityWebappsApplicationRepository *repository, const gchar *name,
+														 UnityWebappsApplicationRepositoryInstallCallback callback, gpointer user_data)
+{
+    Q_UNUSED(repository);
+    Q_UNUSED(name);
+    Q_UNUSED(callback);
+    Q_UNUSED(user_data);
+}
+
+// }}}
+
+
+class WebappsHandlerTest : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebappsHandlerTest();
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+    void testUrlLoadedMalformedRequest();
+    void testUrlLoaded_data();
+    void testUrlLoaded();
+    void testDontAskMalformedRequest();
+    void testDontAsk_data();
+    void testDontAsk();
+    void testInstallMalformedRequest();
+    void testInstall_data();
+    void testInstall();
+};
+
+WebappsHandlerTest::WebappsHandlerTest():
+    QObject(0)
+{
+}
+
+
+void WebappsHandlerTest::initTestCase()
+{
+    _mock_app_info.insert("https://mail.google.com/", { true, false, false, UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE, "Gmail", "mail.google.com" });
+    _mock_app_info.insert("http://www.tumblr.com/", { false, true, true, UNITY_WEBAPPS_APPLICATION_STATUS_AVAILABLE, "Tumblr", "www.tumblr.com" });
+}
+
+void WebappsHandlerTest::cleanupTestCase()
+{
+}
+
+void WebappsHandlerTest::testUrlLoadedMalformedRequest()
+{
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("url_loaded"));
+
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void WebappsHandlerTest::testUrlLoaded_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("available");
+    QTest::addColumn<QString>("appName");
+    QTest::addColumn<QString>("appDomain");
+
+    QTest::newRow("available") << "https://mail.google.com/" << true << "Gmail" << "mail.google.com";
+    QTest::newRow("not_available") << "http://www.example.com/" << false << "None" << "None";
+}
+
+void WebappsHandlerTest::testUrlLoaded()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, available);
+    QFETCH(QString, appName);
+    QFETCH(QString, appDomain);
+
+    QVariantMap message;
+    message.insert("method", QString("url_loaded"));
+    message.insert("url", url);
+
+    UnityWebapps::WebappsHandler handler;
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("available").toBool(), available);
+    if (available) {
+        QCOMPARE(appName, reply.value("appName").toString());
+        QCOMPARE(appDomain, reply.value("appDomain").toString());
+    }
+}
+
+void WebappsHandlerTest::testDontAskMalformedRequest()
+{
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("dont_ask"));
+
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void WebappsHandlerTest::testDontAsk_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("available");
+
+    QTest::newRow("ask") << "https://mail.google.com/" << true;
+    QTest::newRow("dont_ask") << "http://www.tumblr.com/" << true;
+    QTest::newRow("no app") << "http://www.example.com/" << false;
+}
+
+void WebappsHandlerTest::testDontAsk()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, available);
+
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("dont_ask"));
+    message.insert("url", url);
+
+    QVariantMap reply = handler.dont_ask(message);
+
+    QVERIFY(!reply.empty());
+    if (available) {
+        QCOMPARE(reply.value("dont_ask").toBool(), true);
+    } else {
+        QCOMPARE(reply.value("dont_ask").toBool(), false);
+        QCOMPARE(reply.value("available").toBool(), false);
+    }
+}
+
+void WebappsHandlerTest::testInstallMalformedRequest()
+{
+    UnityWebapps::WebappsHandler handler;
+
+    QVariantMap message;
+    message.insert("method", QString("install"));
+
+    QVariantMap reply = handler.url_loaded(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("error").toString(), QStringLiteral("malformed request"));
+}
+
+void WebappsHandlerTest::testInstall_data()
+{
+    QTest::addColumn<QString>("url");
+    QTest::addColumn<bool>("available");
+    QTest::addColumn<bool>("installed");
+
+    QTest::newRow("installs") << "https://mail.google.com/" << true << true;
+    QTest::newRow("wont install") << "http://www.tumblr.com/" << true << false;
+    QTest::newRow("no app") << "http://www.example.com/" << false << false;
+}
+
+void WebappsHandlerTest::testInstall()
+{
+    QFETCH(QString, url);
+    QFETCH(bool, available);
+    QFETCH(bool, installed);
+
+    QVariantMap message;
+    message.insert("method", QString("install"));
+    message.insert("url", url);
+
+    UnityWebapps::WebappsHandler handler;
+    QVariantMap reply = handler.install(message);
+
+    QVERIFY(!reply.empty());
+    QCOMPARE(reply.value("installed").toBool(), installed);
+    if (!available) {
+        QCOMPARE(reply.value("available").toBool(), false);
+    }
+}
+
+QTEST_MAIN(WebappsHandlerTest);
+
+#include "tst_webapps-handler.moc"

=== added file 'tests/unit/messaging-host/tst_webapps-handler.pro'
--- tests/unit/messaging-host/tst_webapps-handler.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/messaging-host/tst_webapps-handler.pro	2014-06-04 01:24:00 +0000
@@ -0,0 +1,30 @@
+include(messaging-host.pri)
+
+TARGET = tst_webapps-handler
+
+QMAKE_CXXFLAGS += -std=c++11
+
+CONFIG += \
+    link_pkgconfig \
+    qt
+
+QT += \
+    core \
+    testlib
+
+PKGCONFIG += \
+    glib-2.0 \
+    gobject-2.0 \
+    libunity_webapps-0.2 \
+    libunity-webapps-repository \
+
+SOURCES += \
+    $${SRC_DIR}/webapps-handler.cpp \
+    tst_webapps-handler.cpp
+
+HEADERS += \
+    $${SRC_DIR}/webapps-handler.h
+
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a ./$${TARGET}"
+check.depends = $${TARGET}
+QMAKE_EXTRA_TARGETS += check