Merge lp:~mandel/ubuntu-system-settings/fix-network into lp:ubuntu-system-settings

[Manuel de la Peña]

Improve the network code in the system-updates plugin.

The current code in the system-updates that deals with the network is not "ideal". This branch simplifies the network interaction and add new tests that make sure that we react correctly to possible json errors.

[lp:~mandel/ubuntu-system-settings/fix-network]

1231. By Manuel de la Peña on 2014-12-16

Merged with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1231
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1860/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/582/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/580/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1860/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mandel/ubuntu-system-settings/fix-network]

1232. By Manuel de la Peña on 2014-12-16

Added missing tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1232
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1862/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/132
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/585
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16597

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1862/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

There's a merge conflict

review: Needs Fixing

[Sebastien Bacher (seb128)]

can you rebase on current trunk?

review: Needs Fixing

[Sebastien Bacher (seb128)]

Hello?

[Manuel de la Peña (mandel)]

Doing a smaller change to fix this step by step.

Unmerged revisions

1232. By Manuel de la Peña on 2014-12-16

Added missing tests.

1231. By Manuel de la Peña on 2014-12-16

Merged with trunk.

1230. By Manuel de la Peña on 2014-12-16

Improve the network code in the system-updates plugin.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-19 18:05:48 +0000
+++ CMakeLists.txt	2014-12-16 16:28:50 +0000
@@ -27,8 +27,12 @@
 endif()
 
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fno-permissive -pedantic -Wall -Wextra")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fno-permissive -pedantic -Wall -Wextra -fPIC -pthread")
 find_package(Qt5Widgets REQUIRED)
+
+find_package(Gtest REQUIRED)
+include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
+
 # Workaround for https://bugreports.qt-project.org/browse/QTBUG-29987
 set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}/qt5/qml")
 set(CMAKE_AUTOMOC ON)

=== added file 'cmake/FindGtest.cmake'
--- cmake/FindGtest.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGtest.cmake	2014-12-16 16:28:50 +0000
@@ -0,0 +1,53 @@
+include(ExternalProject)
+include(FindPackageHandleStandardArgs)
+
+#gtest
+set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
+find_path(GTEST_INCLUDE_DIR gtest/gtest.h
+            HINTS ${GTEST_INSTALL_DIR})
+
+#gmock
+find_path(GMOCK_INSTALL_DIR gmock/CMakeLists.txt
+          HINTS /usr/src)
+if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
+    message(FATAL_ERROR "google-mock package not found")
+endif()
+
+set(GMOCK_INSTALL_DIR ${GMOCK_INSTALL_DIR}/gmock)
+find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
+
+set(GMOCK_PREFIX gmock)
+set(GMOCK_BINARY_DIR ${CMAKE_BINARY_DIR}/${GMOCK_PREFIX}/libs)
+set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
+
+set(GTEST_CMAKE_ARGS "")
+if (${MIR_IS_CROSS_COMPILING})
+    set(GTEST_CMAKE_ARGS
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
+endif()
+
+ExternalProject_Add(
+    GMock
+    #where to build in source tree
+    PREFIX ${GMOCK_PREFIX}
+    #where the source is external to the project
+    SOURCE_DIR ${GMOCK_INSTALL_DIR}
+    #forward the compilers to the subproject so cross-arch builds work
+    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
+    BINARY_DIR ${GMOCK_BINARY_DIR}
+
+    #we don't need to install, so skip
+    INSTALL_COMMAND ""
+)
+
+set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
+set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
+set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
+set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
+set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
+set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
+
+find_package_handle_standard_args(GTest  DEFAULT_MSG
+                                    GMOCK_INCLUDE_DIR
+                                    GTEST_INCLUDE_DIR)

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-11 21:15:07 +0000
+++ debian/changelog	2014-12-16 16:28:50 +0000
@@ -7,6 +7,12 @@
 
  -- Ubuntu daily release <[e-mail]>  Thu, 11 Dec 2014 21:15:06 +0000
 
+ubuntu-system-settings (0.3+15.04.20141210.1-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Greatly improve the network class in the system-updates plugin.
+
+ -- Manuel de la Pena <[e-mail]>  Tue, 16 Dec 2014 12:39:46 +0100
+
 ubuntu-system-settings (0.3+15.04.20141210.1-0ubuntu1) vivid; urgency=low
 
   [ jonas-drange ]

=== modified file 'debian/control'
--- debian/control	2014-12-11 21:14:43 +0000
+++ debian/control	2014-12-16 16:28:50 +0000
@@ -44,7 +44,8 @@
                python3-gi,
                python3-dbus,
                python3-xdg,
-               gir1.2-glib-2.0
+               gir1.2-glib-2.0,
+               google-mock
 Standards-Version: 3.9.6
 Homepage: https://launchpad.net/ubuntu-system-settings
 # If you aren't a member of ~system-settings-touch but need to upload packaging
@@ -89,7 +90,8 @@
          python3-dbus,
          python3-xdg,
          gir1.2-glib-2.0,
-         qml-module-ubuntu-connectivity
+         qml-module-ubuntu-connectivity,
+         google-mock
 Recommends: ubuntu-system-settings-online-accounts,
             ubuntu-touch-sounds,
 Conflicts: ubuntu-system-settings-example

=== modified file 'plugins/system-update/download_tracker.cpp'
--- plugins/system-update/download_tracker.cpp	2014-12-11 09:46:36 +0000
+++ plugins/system-update/download_tracker.cpp	2014-12-16 16:28:50 +0000
@@ -23,8 +23,8 @@
 #include <ubuntu/download_manager/download_struct.h>
 #include <ubuntu/download_manager/error.h>
 
+#include "network.h"
 #include "download_tracker.h"
-#include "network/network.h"
 
 namespace {
     const QString DOWNLOAD_COMMAND = "post-download-command";

=== removed directory 'plugins/system-update/network'
=== renamed file 'plugins/system-update/network/network.cpp' => 'plugins/system-update/network.cpp'
--- plugins/system-update/network/network.cpp	2014-09-18 13:50:15 +0000
+++ plugins/system-update/network.cpp	2014-12-16 16:28:50 +0000
@@ -16,18 +16,29 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "network.h"
+#include <QByteArray>
+#include <QDebug>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QByteArray>
+#include <QProcessEnvironment>
 #include <QUrl>
-#include <QProcessEnvironment>
-
-#define URL_APPS "https://myapps.developer.ubuntu.com/dev/api/click-metadata/"
-
-#define APPS_DATA "APPS_DATA"
+
+#include "network.h"
+
+namespace {
+    const QString CLICK_TOKEN_URL_ENV = "CLICK_TOKEN_URL";
+    const QString URL_APPS_ENV = "URL_APPS";
+    const QString URL_APPS =
+        "https://myapps.developer.ubuntu.com/dev/api/click-metadata/";
+    const QString APPS_DATA = "APPS_DATA";
+    const QString NAME_KEY = "name";
+    const QString VERSION_KEY = "version";
+    const QString ICON_KEY = "icon_url";
+    const QString DOWNLOAD_URL_KEY = "download_url";
+    const QString BINARY_SIZE_KEY = "binary_filesize";
+}
 
 namespace UpdatePlugin {
 
@@ -35,8 +46,12 @@
     QObject(parent),
     m_nam(this)
 {
-    QObject::connect(&m_nam, SIGNAL(finished(QNetworkReply*)),
-                     this, SLOT(onReply(QNetworkReply*)));
+}
+
+Network::Network(QHash<QString, Update*> apps, QObject *parent) :
+    Network(parent)
+{
+    m_apps = apps;
 }
 
 void Network::checkForNewVersions(QHash<QString, Update*> &apps)
@@ -45,33 +60,109 @@
 
     QJsonObject serializer;
     QJsonArray array;
+
     foreach(QString id, m_apps.keys()) {
         array.append(QJsonValue(m_apps.value(id)->getPackageName()));
     }
+    serializer.insert(NAME_KEY, array);
 
-    serializer.insert("name", array);
     QJsonDocument doc(serializer);
 
-    QByteArray content = doc.toJson();
+    auto content = doc.toJson();
+    auto urlApps = getUrlApps();
 
-    QString urlApps = getUrlApps();
-    QNetworkRequest request;
+    QNetworkRequest request(urlApps);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setUrl(QUrl(urlApps));
-    RequestObject* reqObject = new RequestObject(QString(APPS_DATA));
+
+    auto reqObject = new RequestObject(APPS_DATA);
     request.setOriginatingObject(reqObject);
-    m_nam.post(request, content);
+
+    auto reply = m_nam.post(request, content);
+    connect(reply, &QNetworkReply::finished,
+            this, &Network::onRequestFinished);
 }
 
-QString Network::getUrlApps()
+QUrl Network::getUrlApps()
 {
-    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
-    QString command = environment.value("URL_APPS", QString(URL_APPS));
+    auto environment = QProcessEnvironment::systemEnvironment();
+    auto command = environment.value(URL_APPS_ENV, URL_APPS);
     return command;
 }
 
-void Network::onReply(QNetworkReply *reply)
-{
+bool Network::parseUpdateObject(const QJsonValue& value)
+{
+    if (!value.isObject()) {
+        qWarning() << "The value to parse is not an array.";
+        return false;
+    }
+
+    auto object = value.toObject();
+
+    if (object.contains(NAME_KEY)) {
+        auto name = object[NAME_KEY].toString();
+
+        if (name.isEmpty()) {
+            qWarning() << "Json reply contains a '" << NAME_KEY
+                << "' value that is not a string.";
+            return false;
+        }
+
+        if (m_apps.contains(name)) {
+            auto version = object[VERSION_KEY].toString();
+            auto icon_url = object[ICON_KEY].toString();
+            auto url = object[DOWNLOAD_URL_KEY].toString();
+            auto size = object[BINARY_SIZE_KEY].toInt();
+
+            if (!version.isEmpty()) {
+                m_apps[name]->setRemoteVersion(version);
+                if (m_apps[name]->updateRequired()) {
+                    m_apps[name]->setIconUrl(icon_url);
+                    m_apps[name]->setDownloadUrl(url);
+                    m_apps[name]->setBinaryFilesize(size);
+                    return true;
+                }
+            } else {
+                qWarning() << "Json reply contains a '" << VERSION_KEY
+                    << "' value that is not a string.";
+                return false;
+            }
+
+        } else {
+            // can we really get here? It means that an update was returned
+            // for an application not present in the device
+            qWarning() << "Reply has update for missing application";
+            return false;
+        }
+    } else {
+        qWarning() << "Json reply is missing the '" << NAME_KEY
+            << "' key";
+        return false;
+    }
+    return false;
+}
+
+void Network::onHeadRequestFinished()
+{
+    auto reply = qobject_cast<QNetworkReply*>(sender());
+    if (reply->hasRawHeader(X_CLICK_TOKEN)) {
+        auto app = qobject_cast<Update*>(reply->request().originatingObject());
+        if (app != nullptr) {
+            QString header(reply->rawHeader(X_CLICK_TOKEN));
+            Q_EMIT clickTokenObtained(app, header);
+        } else {
+            // is this even possible?
+            qWarning() << "App missing from head request.";
+        }
+    } else {
+        qWarning() << "HEader '" << X_CLICK_TOKEN << "' missing from head reply.";
+    }
+    reply->deleteLater();
+}
+
+void Network::onRequestFinished()
+{
+    auto reply = qobject_cast<QNetworkReply*>(sender());
+
     if (reply->error() == QNetworkReply::NoError) {
         QVariant statusAttr = reply->attribute(
                                 QNetworkRequest::HttpStatusCodeAttribute);
@@ -83,46 +174,30 @@
         int httpStatus = statusAttr.toInt();
 
         if (httpStatus == 200 || httpStatus == 201) {
-            if (reply->hasRawHeader(X_CLICK_TOKEN)) {
-                Update* app = qobject_cast<Update*>(
-                            reply->request().originatingObject());
-                if (app != nullptr) {
-                    QString header(reply->rawHeader(X_CLICK_TOKEN));
-                    Q_EMIT clickTokenObtained(app, header);
-                }
-                reply->deleteLater();
-                return;
-            }
-
-            QByteArray payload = reply->readAll();
-            QJsonDocument document = QJsonDocument::fromJson(payload);
-
-            RequestObject* state = qobject_cast<RequestObject*>(reply->request().originatingObject());
-            if (state != nullptr && state->operation.contains(APPS_DATA) && document.isArray()) {
-                QJsonArray array = document.array();
+            auto payload = reply->readAll();
+            auto document = QJsonDocument::fromJson(payload);
+
+            auto state = qobject_cast<RequestObject*>(
+                    reply->request().originatingObject());
+
+            if (state != nullptr
+                    && state->operation.contains(APPS_DATA)
+                    && document.isArray()) {
+
+                auto array = document.array();
                 bool updates = false;
-                for (int i = 0; i < array.size(); i++) {
-                    QJsonObject object = array.at(i).toObject();
-                    QString name = object.value("name").toString();
-                    QString version = object.value("version").toString();
-                    QString icon_url = object.value("icon_url").toString();
-                    QString url = object.value("download_url").toString();
-                    int size = object.value("binary_filesize").toVariant().toInt();
-                    if (m_apps.contains(name)) {
-                        m_apps[name]->setRemoteVersion(version);
-                        if (m_apps[name]->updateRequired()) {
-                            m_apps[name]->setIconUrl(icon_url);
-                            m_apps[name]->setDownloadUrl(url);
-                            m_apps[name]->setBinaryFilesize(size);
-                            updates = true;
-                        }
-                    }
+
+                foreach(const QJsonValue& value, array) {
+                    // parse the object and state if updates are needed
+                    updates = parseUpdateObject(value);
                 }
+
                 if (updates) {
                     Q_EMIT updatesFound();
                 } else {
                     Q_EMIT updatesNotFound();
                 }
+
             } else {
                 Q_EMIT errorOccurred();
             }
@@ -142,14 +217,18 @@
 void Network::getClickToken(Update *app, const QString &url,
                             const QString &authHeader)
 {
-    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
-    QString signUrl = environment.value("CLICK_TOKEN_URL", url);
+    auto environment = QProcessEnvironment::systemEnvironment();
+    auto signUrl = environment.value(CLICK_TOKEN_URL_ENV, url);
+
     QUrl query(signUrl);
     query.setQuery(authHeader);
-    QNetworkRequest request;
-    request.setUrl(query);
+
+    QNetworkRequest request(query);
     request.setOriginatingObject(app);
-    m_nam.head(request);
+
+    auto reply = m_nam.head(request);
+    connect(reply, &QNetworkReply::finished,
+            this, &Network::onHeadRequestFinished);
 }
 
 }

=== renamed file 'plugins/system-update/network/network.h' => 'plugins/system-update/network.h'
--- plugins/system-update/network/network.h	2014-10-07 17:50:03 +0000
+++ plugins/system-update/network.h	2014-12-16 16:28:50 +0000
@@ -19,11 +19,12 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
+#include <QHash>
 #include <QObject>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QHash>
-#include "../update.h"
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+#include "update.h"
 
 #define X_CLICK_TOKEN "X-Click-Token"
 
@@ -51,6 +52,9 @@
     void checkForNewVersions(QHash<QString, Update*> &apps);
     void getClickToken(Update *app, const QString &url,
                        const QString &authHeader);
+protected:
+    // helper constructor that allows to set the hash map for testing purposes
+    Network(QHash<QString, Update*> apps, QObject *parent=0);
 
 Q_SIGNALS:
     void updatesFound();
@@ -60,14 +64,17 @@
     void serverError();
     void clickTokenObtained(Update *app, const QString &clickToken);
 
+protected:
+    QUrl getUrlApps();
+    bool parseUpdateObject(const QJsonValue& value);
+
 private Q_SLOTS:
-    void onReply(QNetworkReply*);
+    void onRequestFinished();
+    void onHeadRequestFinished();
 
 private:
     QNetworkAccessManager m_nam;
     QHash<QString, Update*> m_apps;
-
-    QString getUrlApps();
 };
 
 }

=== modified file 'plugins/system-update/plugin/CMakeLists.txt'
--- plugins/system-update/plugin/CMakeLists.txt	2014-10-22 19:37:42 +0000
+++ plugins/system-update/plugin/CMakeLists.txt	2014-12-16 16:28:50 +0000
@@ -1,9 +1,28 @@
 SET (CMAKE_AUTOMOC ON)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_library(update-plugin SHARED update-plugin.h update-plugin.cpp ../network/network.cpp ../network/network.h
-../update.cpp ../update.h ../update_manager.cpp ../update_manager.h ../system_update.cpp ../system_update.h
-../download_tracker.h ../download_tracker.cpp)
+set(SOURCES
+	update-plugin.cpp
+	../network.cpp
+	../update.cpp
+	../update_manager.cpp
+	../system_update.cpp
+	../download_tracker.cpp
+)
+
+set(HEADERS
+	update-plugin.h
+	../network.h
+	../update.h
+	../update_manager.h
+	../system_update.h
+        ../download_tracker.h
+)
+
+add_library(update-plugin SHARED
+	${HEADERS}
+	${SOURCES}
+)
 
 qt5_use_modules(update-plugin Core Qml Quick Network DBus)
 include_directories(/usr/include/apt-pkg/)

=== modified file 'plugins/system-update/update.h'
--- plugins/system-update/update.h	2014-09-12 19:12:36 +0000
+++ plugins/system-update/update.h	2014-12-16 16:28:50 +0000
@@ -78,7 +78,7 @@
 
 public:
     explicit Update(QObject *parent = 0);
-    virtual ~Update();
+    ~Update();
 
     bool systemUpdate() { return m_systemUpdate; }
     QString getPackageName() { return m_packagename; }
@@ -89,7 +89,7 @@
     QString lastUpdateDate() { return m_lastUpdateDate; }
     int binaryFilesize() { return m_binary_filesize; }
     int downloadProgress() { return m_download_progress; }
-    bool updateRequired() { return m_update; }
+    virtual bool updateRequired() { return m_update; }
     bool updateState() { return m_update_state; }
     bool updateReady() { return m_update_ready; }
     bool selected() { return m_selected; }
@@ -101,19 +101,19 @@
     void setSystemUpdate(bool isSystem);
     void initializeApplication(QString packagename, QString title,
                                QString version);
-    void setRemoteVersion(QString &version);
+    virtual void setRemoteVersion(QString &version);
     void setUpdateRequired(bool state);
     void setUpdateState(bool state);
     void setUpdateReady(bool ready);
     void setSelected(bool value);
-    void setBinaryFilesize(int size);
+    virtual void setBinaryFilesize(int size);
     void setDownloadProgress(int progress);
-    void setIconUrl(QString icon);
+    virtual void setIconUrl(QString icon);
     void setError(QString error);
     void setUpdateAvailable(bool available) { m_update = available; }
     void setLastUpdateDate(const QString date);
     void setClickUrl(const QString &url) { m_click_url = url; }
-    void setDownloadUrl(const QString &url);
+    virtual void setDownloadUrl(const QString &url);
     void setClickToken(const QString &token) { m_clickToken = token; Q_EMIT clickTokenChanged(); }
 
 private:

=== modified file 'plugins/system-update/update_manager.h'
--- plugins/system-update/update_manager.h	2014-10-24 20:06:13 +0000
+++ plugins/system-update/update_manager.h	2014-12-16 16:28:50 +0000
@@ -40,7 +40,7 @@
 #else
 #include <ssoservice.h>
 #include <QProcess>
-#include "network/network.h"
+#include "network.h"
 #include "system_update.h"
 #endif
 

=== modified file 'tests/plugins/system-update/CMakeLists.txt'
--- tests/plugins/system-update/CMakeLists.txt	2014-10-23 13:27:05 +0000
+++ tests/plugins/system-update/CMakeLists.txt	2014-12-16 16:28:50 +0000
@@ -25,16 +25,37 @@
     ../../../plugins/system-update/update.cpp
 )
 
+add_executable(tst-network
+    mock_update.h
+    tst_network.cpp
+    ../../../plugins/system-update/update.cpp
+    ../../../plugins/system-update/network.cpp
+)
+
 # set the path to the library folder
 include_directories(/usr/include/apt-pkg/)
 
-target_link_libraries(tst-update-manager apt-pkg update-plugin ${UBUNTUONEAUTH_LDFLAGS})
-qt5_use_modules(tst-update-manager Qml Quick Core DBus Xml Network Test)
-add_test(NAME tst-update-manager COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-update-manager)
-
-qt5_use_modules(tst-update Qml Quick Core DBus Xml Network Test)
-target_link_libraries(tst-update apt-pkg update-plugin)
-add_test(NAME tst-update COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-update)
+set(UNIT_TESTS
+    tst-update-manager 
+    tst-update 
+    tst-network
+)
+
+foreach(test ${UNIT_TESTS})
+    qt5_use_modules(${test} Qml Quick Core DBus Xml Network Test)
+
+    target_link_libraries(${test}
+        apt-pkg
+        update-plugin
+        ${UBUNTUONEAUTH_LDFLAGS}
+        ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
+        ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+        ${GMOCK_LIBRARY}
+        ${GTEST_BOTH_LIBRARIES}
+    )
+    add_test(NAME ${test}
+	     COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/${test})
+endforeach(test)
 
 add_custom_command(
     TARGET tst-update-manager

=== added file 'tests/plugins/system-update/mock_update.h'
--- tests/plugins/system-update/mock_update.h	1970-01-01 00:00:00 +0000
+++ tests/plugins/system-update/mock_update.h	2014-12-16 16:28:50 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2014 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 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/>.
+ *
+ * Authors:
+ * Manuel de la Pena <[e-mail]>
+ *
+ */
+
+#ifndef MOCKED_UPDATE_H
+#define MOCKED_UPDATE_H
+
+#include <gmock/gmock.h>
+
+#include "update.h"
+
+using namespace UpdatePlugin;
+
+class MockedUpdate : public Update {
+    Q_OBJECT
+public:
+    explicit MockedUpdate(QObject *parent = 0)
+        : Update(parent) {}
+
+    MOCK_METHOD1(setRemoteVersion, void(QString&));
+    MOCK_METHOD1(setBinaryFilesize, void(int));
+    MOCK_METHOD0(updateRequired, bool());
+    MOCK_METHOD1(setIconUrl, void(QString));
+    MOCK_METHOD1(setDownloadUrl, void(const QString&));
+};
+
+#endif

=== added file 'tests/plugins/system-update/tst_network.cpp'
--- tests/plugins/system-update/tst_network.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/system-update/tst_network.cpp	2014-12-16 16:28:50 +0000
@@ -0,0 +1,272 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * 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/>.
+ */
+
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QObject>
+#include <QTest>
+#include <QScopedPointer>
+#include <QString>
+
+#include <gmock/gmock.h>
+
+#include "mock_update.h"
+#include "network.h"
+
+using ::testing::_;
+using ::testing::Mock;
+using ::testing::AnyNumber;
+using ::testing::Return;
+
+using namespace UpdatePlugin;
+
+namespace {
+    const QString NAME_KEY = "name";
+    const QString VERSION_KEY = "version";
+    const QString ICON_KEY = "icon_url";
+    const QString DOWNLOAD_URL_KEY = "download_url";
+    const QString BINARY_SIZE_KEY = "binary_filesize";
+}
+
+// helper class that exposes protected members
+class PublicNetwork : public Network
+{
+public:
+    PublicNetwork(QHash<QString, Update*> apps, QObject *parent=0) :
+        Network(apps, parent) {}
+
+    using Network::getUrlApps;
+    using Network::parseUpdateObject;
+};
+
+class NetworkTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    NetworkTest() : QObject() {};
+
+private Q_SLOTS:
+    void testParseUpdateNotObject();
+    void testParseUpdateMissingName();
+    void testParseUpdateMissingVersion();
+    void testParseUpdateRequired_data();
+    void testParseUpdateRequired();
+    void testParseUpdateNotRequired();
+    void testParseUpdateMissingInHash();
+};
+
+void NetworkTest::testParseUpdateNotObject()
+{
+    QJsonValue value(true);
+
+    QHash<QString, Update*> updates;
+    QScopedPointer<PublicNetwork> network(new PublicNetwork(updates));
+
+    QVERIFY(!network->parseUpdateObject(value));
+}
+
+void NetworkTest::testParseUpdateMissingName()
+{
+    QJsonObject obj;
+    QJsonValue value(obj);
+
+    QHash<QString, Update*> updates;
+    QScopedPointer<PublicNetwork> network(new PublicNetwork(updates));
+
+    QVERIFY(!network->parseUpdateObject(value));
+}
+
+void NetworkTest::testParseUpdateMissingVersion()
+{
+    QJsonObject obj;
+    obj["name"] = "test";
+    QJsonValue value(obj);
+
+    QHash<QString, Update*> updates;
+    QScopedPointer<PublicNetwork> network(new PublicNetwork(updates));
+
+    QVERIFY(!network->parseUpdateObject(value));
+}
+
+void NetworkTest::testParseUpdateRequired_data()
+{
+    QTest::addColumn<QHash<QString, Update*>>("updates");
+    QTest::addColumn<QJsonValue>("json");
+
+    QString firstName = "first-app";
+    QString secondName = "second-app";
+
+    QJsonObject firstJson;
+    firstJson[NAME_KEY] = firstName;
+    firstJson[VERSION_KEY] = QJsonValue(QString("2.2"));
+    firstJson[ICON_KEY] = QJsonValue(QString("www.test.com/first-app-icon"));
+    firstJson[DOWNLOAD_URL_KEY] = QJsonValue(QString("www.test.com/first-app"));
+    firstJson[BINARY_SIZE_KEY] = QJsonValue(23.3);
+
+    QJsonObject secondJson;
+    secondJson[NAME_KEY] = secondName;
+    secondJson[VERSION_KEY] = QJsonValue(QString("1.2"));
+    secondJson[ICON_KEY] = QJsonValue(QString("www.test.com/second-app-icon"));
+    secondJson[DOWNLOAD_URL_KEY] = QJsonValue(QString("www.test.com/second-app"));
+    secondJson[BINARY_SIZE_KEY] = QJsonValue(3.3);
+
+    QHash<QString, Update*> singleUpdate;
+    singleUpdate[firstName] = new MockedUpdate();
+
+    QHash<QString, Update*> severalUpdates;
+    severalUpdates[firstName] = new MockedUpdate();
+    severalUpdates[secondName] = new MockedUpdate();
+
+    QTest::newRow("single-obj") << singleUpdate << QJsonValue(firstJson);
+    QTest::newRow("several-obj") << severalUpdates << QJsonValue(secondJson);
+}
+
+void NetworkTest::testParseUpdateRequired()
+{
+    // the typedef is needed so that QFETCH does work
+    typedef QHash<QString, Update*> UpdatesHash;
+    QFETCH(UpdatesHash, updates);
+    QFETCH(QJsonValue, json);
+
+    auto jsonObj = json.toObject();
+    auto jsonName = jsonObj[NAME_KEY].toString();
+    if (jsonName.isEmpty()) {
+        QFAIL("Wrong test data.");
+    }
+
+    auto version = jsonObj[VERSION_KEY].toString();
+    auto icon_url = jsonObj[ICON_KEY].toString();
+    auto url = jsonObj[DOWNLOAD_URL_KEY].toString();
+    auto size = jsonObj[BINARY_SIZE_KEY].toInt();
+
+    // set the expectations of the updates, only the update with the same name
+    // as the json will have the methods called once, the rest should not be
+    // called at all
+    foreach(const QString& name, updates.keys()) {
+	auto update = qobject_cast<MockedUpdate*>(updates[name]);
+        if (name == jsonName) {
+            // set expectations
+            EXPECT_CALL(*update, setRemoteVersion(version))
+                .Times(1);
+
+            EXPECT_CALL(*update, updateRequired())
+                .Times(1)
+                .WillOnce(Return(true));
+
+            EXPECT_CALL(*update, setIconUrl(icon_url))
+                .Times(1);
+
+            EXPECT_CALL(*update, setDownloadUrl(url))
+                .Times(1);
+
+            EXPECT_CALL(*update, setBinaryFilesize(size))
+                .Times(1);
+	} else {
+            // methods most not be called
+            EXPECT_CALL(*update, setRemoteVersion(version))
+                .Times(0);
+
+            EXPECT_CALL(*update, updateRequired())
+                .Times(0);
+
+            EXPECT_CALL(*update, setIconUrl(icon_url))
+                .Times(0);
+
+            EXPECT_CALL(*update, setDownloadUrl(url))
+                .Times(0);
+
+            EXPECT_CALL(*update, setBinaryFilesize(size))
+                .Times(0);
+	}
+    }
+
+    QScopedPointer<PublicNetwork> network(new PublicNetwork(updates));
+    QVERIFY(network->parseUpdateObject(json));
+
+    // verify each of the mocked objects
+    foreach(Update* update, updates) {
+	auto mock = qobject_cast<MockedUpdate*>(update);
+        QVERIFY(Mock::VerifyAndClearExpectations(mock));
+    }
+    // we must delete all the mocks
+    qDeleteAll(updates);
+}
+
+void NetworkTest::testParseUpdateNotRequired()
+{
+    // create updates with a mock obj that does not need an update
+    QString appName = "first-app";
+
+    QJsonObject json;
+    json[NAME_KEY] = appName;
+    json[VERSION_KEY] = QJsonValue(QString("2.2"));
+    json[ICON_KEY] = QJsonValue(QString("www.test.com/first-app-icon"));
+    json[DOWNLOAD_URL_KEY] = QJsonValue(QString("www.test.com/first-app"));
+    json[BINARY_SIZE_KEY] = QJsonValue(23.3);
+
+    auto update = new MockedUpdate();
+    QHash<QString, Update*> updates;
+    updates[appName] = update;
+
+    // set expectations
+    EXPECT_CALL(*update, setRemoteVersion(_))
+        .Times(1);
+
+    EXPECT_CALL(*update, updateRequired())
+        .Times(1)
+        .WillOnce(Return(false));
+
+    EXPECT_CALL(*update, setIconUrl(_))
+        .Times(0);
+
+    EXPECT_CALL(*update, setDownloadUrl(_))
+        .Times(0);
+
+    EXPECT_CALL(*update, setBinaryFilesize(_))
+        .Times(0);
+
+    QScopedPointer<PublicNetwork> network(new PublicNetwork(updates));
+    QVERIFY(!network->parseUpdateObject(json));
+    QVERIFY(Mock::VerifyAndClearExpectations(update));
+    qDeleteAll(updates);
+}
+
+void NetworkTest::testParseUpdateMissingInHash()
+{
+    // send an update for a missing app
+    QString appName = "first-app";
+
+    QJsonObject json;
+    json[NAME_KEY] = appName;
+    json[VERSION_KEY] = QJsonValue(QString("2.2"));
+    json[ICON_KEY] = QJsonValue(QString("www.test.com/first-app-icon"));
+    json[DOWNLOAD_URL_KEY] = QJsonValue(QString("www.test.com/first-app"));
+    json[BINARY_SIZE_KEY] = QJsonValue(23.3);
+
+    QHash<QString, Update*> updates;
+
+    QScopedPointer<PublicNetwork> network(new PublicNetwork(updates));
+    QVERIFY(!network->parseUpdateObject(json));
+}
+
+QTEST_MAIN(NetworkTest)
+#include "tst_network.moc"

=== modified file 'tests/plugins/system-update/tst_update.cpp'
--- tests/plugins/system-update/tst_update.cpp	2014-08-20 12:50:09 +0000
+++ tests/plugins/system-update/tst_update.cpp	2014-12-16 16:28:50 +0000
@@ -35,7 +35,7 @@
     Q_OBJECT
 
 public:
-    UpdateTest() {};
+    UpdateTest() : QObject() {};
 
 private Q_SLOTS:
     void testCompareVersion();