Merge lp:~ken-vandine/content-hub/click_hook into lp:~content-hub-team/content-hub/trunk

[Ken VanDine]

Added a click hook, which iterates installed known peers, removing them when they are no longer installed and adding peers when needed.

Added a click hook, which iterates installed known peers, removing them when they are no longer installed and adding peers when needed. This looks for JSON files installed as part of a click package in ${HOME}/.local/share/content-hub/${id}

Example syntax:
{
    "source": [
        "pictures",
        "music"
    ]
}

Peers that provide an export handler for a type, should add this file to their click package and define it in their manifest with the content-hub click hook. Example from a manifest file:

    "hooks": {
        "untitled2": {
            "apparmor": "apparmor/untitled2.json",
            "content-hub": "content-hub/untitled2.json",
            "desktop": "untitled2.desktop"
        }
    },

And add content_exchange to the apparmor policy groups.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:53
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ken-vandine/content-hub/click_hook/+merge/187341/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/content-hub-ci/87/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-amd64-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-i386-ci/86/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/content-hub-ci/87/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/content-hub-ci/88/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-amd64-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-i386-ci/87/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/content-hub-ci/88/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ken-vandine/content-hub/click_hook]

54. By Ken VanDine on 2013-09-25

Mock PeerRegistry instead of Registry, fixes test_hook when the gsettings
schema isn't installed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/content-hub-ci/89/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins:8080/job/content-hub-ci/89/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

code looks good

review: Approve

=== modified file 'debian/content-hub.install'
--- debian/content-hub.install	2013-09-11 21:08:25 +0000
+++ debian/content-hub.install	2013-09-25 03:15:44 +0000
@@ -1,3 +1,5 @@
 usr/bin
+usr/lib/*/content-hub/content-hub-peer-hook
+usr/share/click/hooks
 usr/share/dbus-1
 usr/share/glib-2.0/schemas
 
=== modified file 'debian/control'
--- debian/control	2013-09-18 13:54:40 +0000
+++ debian/control	2013-09-25 03:15:44 +0000
@@ -2,6 +2,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               click-dev,
                dbus-test-runner,
                debhelper (>= 9),
                doxygen,
 
=== modified file 'debian/rules'
--- debian/rules	2013-08-26 21:58:01 +0000
+++ debian/rules	2013-09-25 03:15:44 +0000
@@ -4,7 +4,7 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --fail-missing -- -B build
+	dh $@ --with click --fail-missing -- -B build
 
 override_dh_auto_test:
-	dbus-test-runner -t make -p "-C" -p "build" -p test
+	dbus-test-runner -t make -p "-C" -p "build/tests/acceptance-tests" -p test
 
=== modified file 'src/com/ubuntu/content/detail/peer_registry.h'
--- src/com/ubuntu/content/detail/peer_registry.h	2013-07-15 12:05:47 +0000
+++ src/com/ubuntu/content/detail/peer_registry.h	2013-09-25 03:15:44 +0000
@@ -42,9 +42,13 @@
 
     virtual Peer default_peer_for_type(Type) = 0;
     virtual void enumerate_known_peers_for_type(Type, const std::function<void(const Peer&)>& for_each) = 0;
+    virtual void enumerate_known_peers(const std::function<void(const Peer&)>& for_each) = 0;
 
     virtual bool install_default_peer_for_type(Type, Peer) = 0;
     virtual bool install_peer_for_type(Type, Peer) = 0;
+    virtual bool remove_peer(Peer peer) = 0;
+
+
 };
 }
 }
 
=== modified file 'src/com/ubuntu/content/service/CMakeLists.txt'
--- src/com/ubuntu/content/service/CMakeLists.txt	2013-09-11 21:08:25 +0000
+++ src/com/ubuntu/content/service/CMakeLists.txt	2013-09-25 03:15:44 +0000
@@ -76,13 +76,10 @@
   ${GSETTINGS_LDFLAGS}
 )
 
-##########################
-# Don't install hook yet #
-##########################
-#install(
-#  TARGETS content-hub-peer-hook
-#  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}"
-#)
+install(
+  TARGETS content-hub-peer-hook
+  RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/content-hub"
+)
 
 set_target_properties(
   content-hub-peer-hook
@@ -100,13 +97,8 @@
   @ONLY
 )
 
-##########################
-# Don't install hook yet #
-##########################
-#install(
-#FILES
-#"${CLICK_HOOK}"
-#DESTINATION "/usr/share/click/hooks"
-#)
-
-
+install(
+FILES
+"${CLICK_HOOK}"
+DESTINATION "/usr/share/click/hooks"
+)
 
=== modified file 'src/com/ubuntu/content/service/content-hub.hook.in'
--- src/com/ubuntu/content/service/content-hub.hook.in	2013-09-11 21:01:56 +0000
+++ src/com/ubuntu/content/service/content-hub.hook.in	2013-09-25 03:15:44 +0000
@@ -1,4 +1,4 @@
-Pattern: ${home}/.cache/content-hub/${id}-content.json
-Exec: @pkglibexecdir@/content-hub/content-hub-peer-hook ${id}
+Pattern: ${home}/.local/share/content-hub/${id}
+Exec: @pkglibexecdir@/content-hub/content-hub-peer-hook
 User-Level: yes
 Hook-Name: content-hub
 
=== modified file 'src/com/ubuntu/content/service/helper.cpp'
--- src/com/ubuntu/content/service/helper.cpp	2013-09-11 16:45:23 +0000
+++ src/com/ubuntu/content/service/helper.cpp	2013-09-25 03:15:44 +0000
@@ -17,7 +17,6 @@
  */
 
 #include <QCoreApplication>
-#include <com/ubuntu/content/type.h>
 
 #include "hook.h"
 
@@ -27,12 +26,18 @@
 {
     QCoreApplication app(argc, argv);
 
-    if (app.arguments().count() <= 1)
+    qDebug() << Q_FUNC_INFO;
+
+    if (app.arguments().count() > 1)
     {
-        qWarning() << "USAGE:" << app.arguments().first() << "APP_ID";
-        return 1;
+            qWarning() << "Shouldn't have arguments";
+            return 1;
     }
 
-    Hook hook(app.arguments().at(1));
-    return app.exec();
+    new Hook();
+
+    app.exec();
+
+    /* We always want to return 0 */
+    return 0;
 }
 
=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2013-09-11 16:45:23 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2013-09-25 03:15:44 +0000
@@ -24,54 +24,95 @@
 #include <QStandardPaths>
 #include <QDebug>
 #include <QTimer>
+#include <com/ubuntu/content/peer.h>
 
 #include "hook.h"
 
-Hook::Hook(QString app_id, QObject *parent) :
+Hook::Hook(QObject *parent) :
     QObject(parent),
-    app_id(app_id),
     registry(new Registry())
 {
-    qDebug() << Q_FUNC_INFO;
     QTimer::singleShot(200, this, SLOT(run()));
 }
 
+
+Hook::Hook(com::ubuntu::content::detail::PeerRegistry *registry, QObject *parent) :
+    QObject(parent),
+    registry(registry)
+{
+}
+
 void Hook::run()
 {
     qDebug() << Q_FUNC_INFO;
-
-    /* FIXME: we should do a sanity check on this before installing */
-    auto peer = cuc::Peer(app_id);
+    /* Looks for files in ${HOME}/.local/share/content-hub/${id} installed
+     * by click packages.  These files are JSON, for example:
+     *
+     * {
+     *     "source": [
+     *         "pictures",
+     *         "music"
+     *     ]
+     * }
+     *
+     * The hook also iterates known peers and removes them if there is
+     * no JSON file installed in this path.
+     */
 
     QDir contentDir(
-        QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)
+        QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
         + QString("/")
         + QString("content-hub"));
 
-    qDebug() << contentDir.absolutePath();
     if (not contentDir.exists())
         return_error();
 
-    const QString file = contentDir.filePath(peer.id() + QString("-content.json"));
-
-    QFile contentJson(file);
+    QStringList all_peers;
+    registry->enumerate_known_peers([&all_peers](const com::ubuntu::content::Peer& peer)
+                                    {
+                                        all_peers.append(peer.id());
+                                    });
+
+    Q_FOREACH(QString p, all_peers)
+    {
+        qDebug() << Q_FUNC_INFO << "Looking for" << p;
+        QStringList pp = contentDir.entryList(QStringList("*"+ p));
+        if (pp.isEmpty())
+            registry->remove_peer(com::ubuntu::content::Peer{p});
+    }
+
+    Q_FOREACH(QFileInfo f, contentDir.entryInfoList(QDir::Files))
+        add_peer(f);
+
+    QCoreApplication::instance()->quit();
+}
+
+bool Hook::add_peer(QFileInfo result)
+{
+    qDebug() << Q_FUNC_INFO << "Hook:" << result.filePath();
+
+    QString app_id = result.fileName();
+    auto peer = cuc::Peer(app_id);
+
+    QFile contentJson(result.absoluteFilePath());
     if (!contentJson.open(QIODevice::ReadOnly | QIODevice::Text))
-        return_error("couldn't open " + QString(file));
+        return_error("couldn't open " + result.absoluteFilePath());
 
     QJsonParseError *e = new QJsonParseError();
     QJsonDocument contentDoc = QJsonDocument::fromJson(contentJson.readAll(), e);
 
     if (e->error != 0)
-        return_error(e->errorString());
+        return return_error(e->errorString());
 
     if (not contentDoc.isObject())
-        return_error("invalid JSON object");
-
+        return return_error("invalid JSON object");
 
     QJsonObject contentObj = contentDoc.object();
     QVariant sources = contentObj.toVariantMap()["source"];
     Q_FOREACH(QString source, sources.toStringList())
     {
+        /* FIXME: we should iterate known types, but there isn't
+         * really a good way to do that right now */
         if (source == "pictures")
         {
             if (not registry->install_peer_for_type(cuc::Type::Known::pictures(), peer))
@@ -88,12 +129,11 @@
                 qWarning() << "Failed to install peer for" << source;
         }
     }
-
-    QCoreApplication::instance()->quit();
+    return true;
 }
 
-void Hook::return_error(QString err)
+bool Hook::return_error(QString err)
 {
     qWarning() << "Failed to install peer" << err;
-    QCoreApplication::instance()->exit(1);
+    return false;
 }
 
=== modified file 'src/com/ubuntu/content/service/hook.h'
--- src/com/ubuntu/content/service/hook.h	2013-09-11 16:45:23 +0000
+++ src/com/ubuntu/content/service/hook.h	2013-09-25 03:15:44 +0000
@@ -20,6 +20,8 @@
 #define HOOK_H
 
 #include <QObject>
+#include <QFileInfo>
+#include <com/ubuntu/content/peer.h>
 
 #include "registry.h"
 
@@ -27,15 +29,16 @@
 {
     Q_OBJECT
 public:
-    explicit Hook(QString app_id, QObject *parent = 0);
+    explicit Hook(QObject *parent = 0);
+    Hook(com::ubuntu::content::detail::PeerRegistry *registry, QObject *parent = 0);
 
 public slots:
-    void return_error(QString err = "");
+    bool return_error(QString err = "");
     void run();
+    bool add_peer(QFileInfo);
 
 private:
-    QString app_id;
-    Registry* registry;
+    com::ubuntu::content::detail::PeerRegistry* registry;
     
 };
 
 
=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2013-09-18 14:32:34 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2013-09-25 03:15:44 +0000
@@ -48,6 +48,21 @@
     }
 }
 
+void Registry::enumerate_known_peers(const std::function<void(const cuc::Peer&)>&for_each)
+{
+    qDebug() << Q_FUNC_INFO;
+
+    Q_FOREACH (QString type_id, m_peers->keys())
+    {
+        qDebug() << Q_FUNC_INFO << type_id;
+        Q_FOREACH (QString k, m_peers->get(type_id).toStringList())
+        {
+            qDebug() << Q_FUNC_INFO << k;
+            for_each(k);
+        }
+    }
+}
+
 bool Registry::install_default_peer_for_type(cuc::Type type, cuc::Peer peer)
 {
     qDebug() << Q_FUNC_INFO << "type:" << type.id() << "peer:" << peer.id();
@@ -72,3 +87,19 @@
     }
     return false;
 }
+
+bool Registry::remove_peer(cuc::Peer peer)
+{
+    qDebug() << Q_FUNC_INFO << "peer:" << peer.id();
+    bool ret = false;
+    Q_FOREACH (QString type_id, m_peers->keys())
+    {
+        QStringList l = m_peers->get(type_id).toStringList();
+        if (l.contains(peer.id()))
+        {
+            l.removeAll(peer.id());
+            ret = m_peers->trySet(type_id, QVariant(l));
+        }
+    }
+    return ret;
+}
 
=== modified file 'src/com/ubuntu/content/service/registry.h'
--- src/com/ubuntu/content/service/registry.h	2013-09-18 14:32:50 +0000
+++ src/com/ubuntu/content/service/registry.h	2013-09-25 03:15:44 +0000
@@ -36,8 +36,10 @@
     ~Registry();
     cuc::Peer default_peer_for_type(cuc::Type type);
     void enumerate_known_peers_for_type(cuc::Type type, const std::function<void(const cuc::Peer&)>& for_each);
+    void enumerate_known_peers(const std::function<void(const cuc::Peer&)>& for_each);
     bool install_default_peer_for_type(cuc::Type type, cuc::Peer peer);
     bool install_peer_for_type(cuc::Type type, cuc::Peer peer);    
+    bool remove_peer(cuc::Peer peer);
 
 private:
     QScopedPointer<QGSettings> m_defaultPeers;
 
=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2013-09-20 16:20:06 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2013-09-25 03:15:44 +0000
@@ -52,12 +52,24 @@
   test_utils.cpp
 )
 
+add_executable(
+  test_hook
+  test_hook.cpp
+  ${MOCS}
+  ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content/service/hook.cpp
+  ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content/service/registry.cpp
+  good.json
+  bad.json
+)
+
 qt5_use_modules(app_hub_communication_default_peer Core Test)
 qt5_use_modules(app_hub_communication_known_peers Core Test)
 qt5_use_modules(app_hub_communication_stores Core Test)
 qt5_use_modules(app_hub_communication_transfer Core Test)
 qt5_use_modules(app_hub_communication_handler Core Test)
 qt5_use_modules(test_utils Core Test)
+qt5_use_modules(test_hook Core Test)
+
 target_link_libraries(app_hub_communication_stores content-hub gmock gtest gtest_main)
 target_link_libraries(app_hub_communication_default_peer content-hub gmock gtest gtest_main)
 target_link_libraries(app_hub_communication_known_peers content-hub gmock gtest gtest_main)
@@ -65,6 +77,7 @@
 target_link_libraries(app_hub_communication_transfer content-hub gmock gtest gtest_main)
 target_link_libraries(app_hub_communication_handler content-hub gmock gtest gtest_main)
 target_link_libraries(test_utils content-hub gmock gtest gtest_main)
+target_link_libraries(test_hook content-hub gmock gtest gtest_main ${GSETTINGS_LDFLAGS})
 
 add_test(app_hub_communication_default_peer app_hub_communication_default_peer)
 add_test(app_hub_communication_known_peers app_hub_communication_known_peers)
@@ -72,6 +85,15 @@
 add_test(app_hub_communication_transfer app_hub_communication_transfer)
 add_test(app_hub_communication_handler app_hub_communication_handler)
 add_test(test_utils test_utils)
+add_test(test_hook test_hook)
+
+set_target_properties(
+  test_hook
+  PROPERTIES
+  AUTOMOC TRUE
+)
+
+file(COPY good.json bad.json DESTINATION .)
 
 add_custom_command(
   OUTPUT transfer_files
 
=== modified file 'tests/acceptance-tests/app_hub_communication_default_peer.cpp'
--- tests/acceptance-tests/app_hub_communication_default_peer.cpp	2013-09-06 09:25:19 +0000
+++ tests/acceptance-tests/app_hub_communication_default_peer.cpp	2013-09-25 03:15:44 +0000
@@ -67,9 +67,10 @@
 
     MOCK_METHOD1(default_peer_for_type, cuc::Peer(cuc::Type t));
     MOCK_METHOD2(enumerate_known_peers_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
-    
+    MOCK_METHOD1(enumerate_known_peers, void(const std::function<void(const cuc::Peer&)>&));
     MOCK_METHOD2(install_default_peer_for_type, bool(cuc::Type, cuc::Peer));
     MOCK_METHOD2(install_peer_for_type, bool(cuc::Type, cuc::Peer));
+    MOCK_METHOD1(remove_peer, bool(cuc::Peer));
 };
 }
 
 
=== modified file 'tests/acceptance-tests/app_hub_communication_handler.cpp'
--- tests/acceptance-tests/app_hub_communication_handler.cpp	2013-09-13 15:23:54 +0000
+++ tests/acceptance-tests/app_hub_communication_handler.cpp	2013-09-25 03:15:44 +0000
@@ -65,9 +65,10 @@
 
     MOCK_METHOD1(default_peer_for_type, cuc::Peer(cuc::Type t));
     MOCK_METHOD2(enumerate_known_peers_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
-
+    MOCK_METHOD1(enumerate_known_peers, void(const std::function<void(const cuc::Peer&)>&));
     MOCK_METHOD2(install_default_peer_for_type, bool(cuc::Type, cuc::Peer));
     MOCK_METHOD2(install_peer_for_type, bool(cuc::Type, cuc::Peer));
+    MOCK_METHOD1(remove_peer, bool(cuc::Peer));
 };
 
 struct MockedHandler : public cuc::ImportExportHandler
 
=== modified file 'tests/acceptance-tests/app_hub_communication_known_peers.cpp'
--- tests/acceptance-tests/app_hub_communication_known_peers.cpp	2013-09-18 14:59:01 +0000
+++ tests/acceptance-tests/app_hub_communication_known_peers.cpp	2013-09-25 03:15:44 +0000
@@ -66,9 +66,10 @@
 
     MOCK_METHOD1(default_peer_for_type, cuc::Peer(cuc::Type t));
     MOCK_METHOD2(enumerate_known_peers_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
-    
+    MOCK_METHOD1(enumerate_known_peers, void(const std::function<void(const cuc::Peer&)>&));
     MOCK_METHOD2(install_default_peer_for_type, bool(cuc::Type, cuc::Peer));
     MOCK_METHOD2(install_peer_for_type, bool(cuc::Type, cuc::Peer));
+    MOCK_METHOD1(remove_peer, bool(cuc::Peer));
 };
 }
 
 
=== modified file 'tests/acceptance-tests/app_hub_communication_stores.cpp'
--- tests/acceptance-tests/app_hub_communication_stores.cpp	2013-09-06 09:25:19 +0000
+++ tests/acceptance-tests/app_hub_communication_stores.cpp	2013-09-25 03:15:44 +0000
@@ -66,9 +66,10 @@
 
     MOCK_METHOD1(default_peer_for_type, cuc::Peer(cuc::Type t));
     MOCK_METHOD2(enumerate_known_peers_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
-    
+    MOCK_METHOD1(enumerate_known_peers, void(const std::function<void(const cuc::Peer&)>&));
     MOCK_METHOD2(install_default_peer_for_type, bool(cuc::Type, cuc::Peer));
     MOCK_METHOD2(install_peer_for_type, bool(cuc::Type, cuc::Peer));
+    MOCK_METHOD1(remove_peer, bool(cuc::Peer));
 };
 }
 
 
=== modified file 'tests/acceptance-tests/app_hub_communication_transfer.cpp'
--- tests/acceptance-tests/app_hub_communication_transfer.cpp	2013-09-20 15:40:51 +0000
+++ tests/acceptance-tests/app_hub_communication_transfer.cpp	2013-09-25 03:15:44 +0000
@@ -68,9 +68,10 @@
 
     MOCK_METHOD1(default_peer_for_type, cuc::Peer(cuc::Type t));
     MOCK_METHOD2(enumerate_known_peers_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
-    
+    MOCK_METHOD1(enumerate_known_peers, void(const std::function<void(const cuc::Peer&)>&));
     MOCK_METHOD2(install_default_peer_for_type, bool(cuc::Type, cuc::Peer));
     MOCK_METHOD2(install_peer_for_type, bool(cuc::Type, cuc::Peer));
+    MOCK_METHOD1(remove_peer, bool(cuc::Peer));
 };
 }
 
 
=== added file 'tests/acceptance-tests/bad.json'
--- tests/acceptance-tests/bad.json	1970-01-01 00:00:00 +0000
+++ tests/acceptance-tests/bad.json	2013-09-25 03:15:44 +0000
@@ -0,0 +1,6 @@
+{
+    "source": [
+        "pictures",
+        "music",
+    ]
+}
 
=== added file 'tests/acceptance-tests/good.json'
--- tests/acceptance-tests/good.json	1970-01-01 00:00:00 +0000
+++ tests/acceptance-tests/good.json	2013-09-25 03:15:44 +0000
@@ -0,0 +1,6 @@
+{
+    "source": [
+        "pictures",
+        "music"
+    ]
+}
 
=== added file 'tests/acceptance-tests/test_hook.cpp'
--- tests/acceptance-tests/test_hook.cpp	1970-01-01 00:00:00 +0000
+++ tests/acceptance-tests/test_hook.cpp	2013-09-25 03:15:44 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Ken VanDine <[e-mail]>
+ */
+
+#include <com/ubuntu/content/peer.h>
+#include <com/ubuntu/content/type.h>
+#include "com/ubuntu/content/detail/peer_registry.h"
+#include "com/ubuntu/content/service/hook.h"
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <QtTest/QTest>
+
+namespace cuc = com::ubuntu::content;
+
+void PrintTo(const QString& s, ::std::ostream* os) {
+    *os << std::string(qPrintable(s));
+}
+
+namespace
+{
+struct MockedRegistry : public cuc::detail::PeerRegistry
+{
+    MockedRegistry() : PeerRegistry()
+    {
+        using namespace ::testing;
+
+        ON_CALL(*this, default_peer_for_type(_)).WillByDefault(Return(cuc::Peer::unknown()));
+        ON_CALL(*this, install_default_peer_for_type(_,_)).WillByDefault(Return(false));
+        ON_CALL(*this, install_peer_for_type(_,_)).WillByDefault(Return(false));
+        ON_CALL(*this, remove_peer(_)).WillByDefault(Return(false));
+    }
+
+    MOCK_METHOD1(default_peer_for_type, cuc::Peer(cuc::Type t));
+    MOCK_METHOD2(enumerate_known_peers_for_type, void(cuc::Type, const std::function<void(const cuc::Peer&)>&));
+    
+    MOCK_METHOD2(install_default_peer_for_type, bool(cuc::Type, cuc::Peer));
+    MOCK_METHOD2(install_peer_for_type, bool(cuc::Type, cuc::Peer));
+    MOCK_METHOD1(enumerate_known_peers, void(const std::function<void(const cuc::Peer&)>&));
+    MOCK_METHOD1(remove_peer, bool(cuc::Peer));
+};
+}
+
+TEST(Hook, parse_json)
+{
+    using namespace ::testing;
+    
+    auto mock = new MockedRegistry{};
+    EXPECT_CALL(*mock, install_peer_for_type(_,_)).
+    Times(Exactly(2)).
+    WillRepeatedly(Return(true));
+
+    QFileInfo f("good.json");
+    Hook *hook = new Hook(mock);
+
+    EXPECT_TRUE(hook->add_peer(f));
+    f.setFile("bad.json");
+    EXPECT_FALSE(hook->add_peer(f));
+    delete mock;
+}