Merge lp:~renatofilho/buteo-syncfw-qml/release into lp:buteo-syncfw-qml

[Renato Araujo Oliveira Filho]

Added coverage.
Use async dbus call for "syncProfilesByKey".

[lp:~renatofilho/buteo-syncfw-qml/release]

4. By Renato Araujo Oliveira Filho on 2015-07-09

Renamed buteo package.

5. By Renato Araujo Oliveira Filho on 2015-07-09

Set 'buteo-syncfw' as reccomended package since the library can be used without buteo running.

6. By Renato Araujo Oliveira Filho on 2015-07-15

Added coverage build target.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6
http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-syncfw-qml-ci/3/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-syncfw-qml/release]

7. By Renato Araujo Oliveira Filho on 2015-08-31

Use async dbus call for "syncProfilesByKey".

8. By Renato Araujo Oliveira Filho on 2015-09-01

Keep a cache with all profiles maped by category, to avoid reload it during the sync.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:7
http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-syncfw-qml-ci/4/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:8
http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-syncfw-qml-ci/5/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-syncfw-qml/release]

9. By Renato Araujo Oliveira Filho on 2015-09-01

Fix property notify signal after async load profiles.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:9
http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-syncfw-qml-ci/6/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/buteo-syncfw-qml/release]

10. By Renato Araujo Oliveira Filho on 2015-09-01

Use asyncCall for sync function to avoid block the UI.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:10
http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-syncfw-qml-ci/7/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGED

If you changed UI labels, did you update the pot file?
NO LABEL CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
NO PACKAGE CHANGED

[Ken VanDine (ken-vandine)]

Packaging changes look fine

review: Approve (packaging)

[Michael Sheldon (michael-sheldon)]

Added a comment and a question to the diff, other than that this looks good.

review: Needs Information

[lp:~renatofilho/buteo-syncfw-qml/release]

11. By Renato Araujo Oliveira Filho on 2015-09-29

Use "profiles()" instead of "visibleSyncProfiles()" in "profilesCount()" function.

[Renato Araujo Oliveira Filho (renatofilho)]

Fixed

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/buteo-syncfw-qml-vivid-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/buteo-syncfw-qml-ci/8/rebuild

review: Approve (continuous-integration)

=== modified file 'Buteo/buteo-sync-qml.cpp'
--- Buteo/buteo-sync-qml.cpp	2015-07-08 18:09:47 +0000
+++ Buteo/buteo-sync-qml.cpp	2015-09-29 13:01:20 +0000
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,7 @@
 #include "buteo-sync-qml.h"
 
 #include <QtCore/QDebug>
+#include <QtCore/QTimer>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
 #include <QtXml/QDomDocument>
@@ -25,31 +26,33 @@
 #define BUTEO_DBUS_OBJECT_PATH    "/synchronizer"
 #define BUTEO_DBUS_INTERFACE      "com.meego.msyncd"
 
+typedef QPair<QString, bool> ProfileData;
+
 ButeoSyncFW::ButeoSyncFW(QObject *parent)
-    : QObject(parent)
+    : QObject(parent),
+      m_waitSyncStart(false)
 {
+    connect(this, SIGNAL(syncStatus(QString,int,QString,int)), SIGNAL(syncStatusChanged()));
+    connect(this, SIGNAL(profileChanged(QString,int,QString)), SIGNAL(profilesChanged()));
 }
 
 bool ButeoSyncFW::syncing() const
 {
-    return !(getRunningSyncList().isEmpty());
+    return (m_waitSyncStart || !getRunningSyncList().isEmpty());
 }
 
 QStringList ButeoSyncFW::visibleSyncProfiles() const
 {
-    if (m_iface) {
-        QDBusReply<QStringList> result = m_iface->call("allVisibleSyncProfiles");
-        return result.value();
-    }
-    return QStringList();
+    return profiles();
+}
+
+int ButeoSyncFW::profilesCount() const
+{
+    return profiles().count();
 }
 
 void ButeoSyncFW::classBegin()
 {
-}
-
-void ButeoSyncFW::componentComplete()
-{
     m_serviceWatcher.reset(new QDBusServiceWatcher(BUTEO_DBUS_SERVICE_NAME,
                                                    QDBusConnection::sessionBus(),
                                                    QDBusServiceWatcher::WatchForOwnerChange,
@@ -60,12 +63,17 @@
     initialize();
 }
 
+void ButeoSyncFW::componentComplete()
+{
+}
+
 void ButeoSyncFW::initialize()
 {
     if (!m_iface.isNull()) {
         return;
     }
 
+    m_waitSyncStart = false;
     m_iface.reset(new QDBusInterface(BUTEO_DBUS_SERVICE_NAME,
                                      BUTEO_DBUS_OBJECT_PATH,
                                      BUTEO_DBUS_INTERFACE));
@@ -78,46 +86,68 @@
 
     connect(m_iface.data(),
             SIGNAL(syncStatus(QString, int, QString, int)),
-            SIGNAL(syncStatus(QString, int, QString, int)), Qt::QueuedConnection);
+            SIGNAL(syncStatus(QString, int, QString, int)));
     connect(m_iface.data(),
             SIGNAL(signalProfileChanged(QString, int, QString)),
             SIGNAL(profileChanged(QString, int, QString)), Qt::QueuedConnection);
 
+    // track signals for internal state
+    connect(m_iface.data(),
+            SIGNAL(signalProfileChanged(QString, int, QString)),
+            SLOT(reloadProfiles()));
+    connect(m_iface.data(),
+            SIGNAL(syncStatus(QString, int, QString, int)),
+            SLOT(onSyncStatusChanged()));
+
+    reloadProfiles();
+
     // notify changes on properties
-    emit syncStatus("", 0, "", 0);
-    emit profileChanged("", 0, "");
+    emit syncStatusChanged();
 }
 
-bool ButeoSyncFW::startSync(const QString &aProfileId) const
+bool ButeoSyncFW::startSync(const QString &aProfileId)
 {
-    if (m_iface) {
-        QDBusReply<bool> result = m_iface->call("startSync", aProfileId);
-        return result.value();
-    }
-    return false;
+    if (!m_iface) {
+        return false;
+    }
+
+    QDBusPendingCall pcall = m_iface->asyncCall(QLatin1String("startSync"), aProfileId);
+    if (pcall.isError()) {
+        qWarning() << "Fail to start sync:" << pcall.error().message();
+        return false;
+    }
+
+    if (!m_waitSyncStart) {
+        m_waitSyncStart = true;
+        emit syncStatusChanged();
+    }
+
+    return true;
 }
 
-bool ButeoSyncFW::startSyncByCategory(const QString &category) const
+bool ButeoSyncFW::startSyncByCategory(const QString &category)
 {
     foreach(const QString &profile, syncProfilesByCategory(category)) {
         if (!startSync(profile)) {
             return false;
         }
     }
+
     return true;
 }
 
+
 void ButeoSyncFW::abortSync(const QString &aProfileId) const
 {
     if (m_iface) {
-        m_iface->call("abortSync", aProfileId);
+        m_iface->asyncCall(QLatin1String("abortSync"), aProfileId);
     }
 }
 
 QStringList ButeoSyncFW::getRunningSyncList() const
 {
     if (m_iface) {
-        QDBusReply<QStringList> syncList = m_iface->call("runningSyncs");
+        QDBusReply<QStringList> syncList = m_iface->call(QLatin1String("runningSyncs"));
         return syncList;
     }
     return QStringList();
@@ -125,56 +155,13 @@
 
 QStringList ButeoSyncFW::syncProfilesByCategory(const QString &category) const
 {
-    if (m_iface) {
-         QDBusReply<QStringList> profiles = m_iface->call("syncProfilesByKey", "category", category);
-         // extract ids
-         QStringList ids;
-         foreach(const QString &profile, profiles.value()) {
-            QDomDocument doc;
-            QString errorMsg;
-            int errorLine;
-            int errorColumn;
-            if (doc.setContent(profile, &errorMsg, &errorLine, &errorColumn)) {
-               QDomNodeList profileElements = doc.elementsByTagName("profile");
-               if (!profileElements.isEmpty()) {
-                     //check if is enabled
-                     QDomElement e = profileElements.item(0).toElement();
-                     QDomNodeList values = e.elementsByTagName("key");
-                     bool enabled = true;
-                     for(int i = 0; i < values.count(); i++) {
-                         QDomElement v = values.at(i).toElement();
-                         if ((v.attribute("name") == "enabled") &&
-                             (v.attribute("value") == "false")) {
-                             enabled = false;
-                             continue;
-                         }
-                     }
-                     if (!enabled) {
-                         continue;
-                     }
-                     QString profileName = e.attribute("name", "");
-                     if (!profileName.isEmpty()) {
-                        ids << profileName;
-                     } else {
-                         qWarning() << "Profile name is empty in:" << profile;
-                     }
-               } else {
-                   qWarning() << "Profile not found in:" << profile;
-               }
-            } else {
-                qWarning() << "Fail to parse profile:" << profile;
-                qWarning() << "Error:" << errorMsg << errorLine << errorColumn;
-            }
-         }
-         return ids;
-    }
-    return QStringList();
+    return profiles(category, true);
 }
 
 bool ButeoSyncFW::removeProfile(const QString &profileId) const
 {
     if (m_iface) {
-        QDBusReply<bool> result = m_iface->call("removeProfile", profileId);
+        QDBusReply<bool> result = m_iface->call(QLatin1String("removeProfile"), profileId);
         return result;
     }
     return false;
@@ -197,8 +184,118 @@
 
 void ButeoSyncFW::deinitialize()
 {
+    m_waitSyncStart = false;
+    m_profilesByCategory.clear();
+    m_reloadProfilesWatcher.reset();
     m_iface.reset();
+
     // notify changes on properties
-    emit syncStatus("", 0, "", 0);
-    emit profileChanged("", 0, "");
+    emit profilesChanged();
+    emit syncStatusChanged();
+}
+
+QStringList ButeoSyncFW::profiles(const QString &category, bool onlyEnabled) const
+{
+    QStringList result;
+    QList<ProfileData> filter = category.isEmpty() ?
+                m_profilesByCategory.values() : m_profilesByCategory.values(category);
+
+    foreach(const ProfileData &p, filter) {
+        if (!onlyEnabled || p.second) {
+            result << p.first;
+        }
+    }
+    return result;
+}
+
+
+QMultiMap<QString, QPair<QString, bool> >  ButeoSyncFW::paserProfiles(const QStringList &profiles) const
+{
+    // extract category/ids
+    QMultiMap<QString, ProfileData> profilesByCategory;
+
+    foreach(const QString &profile, profiles) {
+       QDomDocument doc;
+       QString errorMsg;
+       int errorLine;
+       int errorColumn;
+       if (doc.setContent(profile, &errorMsg, &errorLine, &errorColumn)) {
+          QDomNodeList profileElements = doc.elementsByTagName("profile");
+          if (!profileElements.isEmpty()) {
+                //check if is enabled
+                QDomElement e = profileElements.item(0).toElement();
+                QDomNodeList values = e.elementsByTagName("key");
+                bool enabled = true;
+                QString profileCategory;
+                for(int i = 0; i < values.count(); i++) {
+                    QDomElement v = values.at(i).toElement();
+                    if ((v.attribute("name") == "enabled") &&
+                        (v.attribute("value") == "false")) {
+                        enabled = false;
+                    }
+                    if (v.attribute("name") == "category") {
+                        profileCategory = v.attribute("value");
+                    }
+                }
+
+                QString profileName = e.attribute("name", "");
+                if (profileName.isEmpty() || profileCategory.isEmpty()) {
+                    qWarning() << "Fail to retrieve profile name and category";
+                } else {
+                    profilesByCategory.insertMulti(profileCategory, qMakePair(profileName, enabled));
+                }
+          } else {
+              qWarning() << "Profile not found in:" << profile;
+          }
+       } else {
+           qWarning() << "Fail to parse profile:" << profile;
+           qWarning() << "Error:" << errorMsg << errorLine << errorColumn;
+       }
+    }
+    return profilesByCategory;
+}
+
+void ButeoSyncFW::reloadProfiles()
+{
+    if (m_reloadProfilesWatcher) {
+        m_reloadProfilesWatcher.reset();
+    }
+
+    if (!m_iface) {
+        return;
+    }
+
+    // we only care about profiles that uses online-accounts
+    QDBusPendingCall pcall = m_iface->asyncCall(QLatin1String("syncProfilesByKey"),
+                                                QLatin1String("use_accounts"),
+                                                QLatin1String("true"));
+    if (pcall.isError()) {
+        qWarning() << "Fail to call syncProfilesByKey:" << pcall.error().message();
+    } else {
+        m_reloadProfilesWatcher.reset(new QDBusPendingCallWatcher(pcall, this));
+        connect(m_reloadProfilesWatcher.data(), SIGNAL(finished(QDBusPendingCallWatcher*)),
+                SLOT(onAllVisibleSyncProfilesFinished(QDBusPendingCallWatcher*)), Qt::UniqueConnection);
+    }
+}
+
+void ButeoSyncFW::onAllVisibleSyncProfilesFinished(QDBusPendingCallWatcher *watcher)
+{
+    QStringList profiles;
+    QDBusPendingReply<QStringList> reply = *watcher;
+    if (reply.isError()) {
+       qWarning() << "Fail to call 'syncProfilesByKey'" << reply.error().message();
+    } else {
+       profiles = reply.value();
+    }
+
+    m_profilesByCategory = paserProfiles(profiles);
+    m_reloadProfilesWatcher.take()->deleteLater();
+
+    // notify property change
+    emit profilesChanged();
+}
+
+void ButeoSyncFW::onSyncStatusChanged()
+{
+    m_waitSyncStart = false;
 }

=== modified file 'Buteo/buteo-sync-qml.h'
--- Buteo/buteo-sync-qml.h	2015-07-08 18:09:47 +0000
+++ Buteo/buteo-sync-qml.h	2015-09-29 13:01:20 +0000
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,20 +18,23 @@
 #include <QtQml/QQmlParserStatus>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusServiceWatcher>
+#include <QtDBus/QDBusPendingCallWatcher>
 
 class ButeoSyncFW : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
 
-    Q_PROPERTY(bool syncing READ syncing NOTIFY syncStatus)
-    Q_PROPERTY(QStringList visibleSyncProfiles READ visibleSyncProfiles NOTIFY profileChanged)
+    Q_PROPERTY(bool syncing READ syncing NOTIFY syncStatusChanged)
+    Q_PROPERTY(int profilesCount READ profilesCount NOTIFY profilesChanged)
+    Q_PROPERTY(QStringList visibleSyncProfiles READ visibleSyncProfiles NOTIFY profilesChanged)
 
 public:
     ButeoSyncFW(QObject *parent = 0);
 
     bool syncing() const;
     QStringList visibleSyncProfiles() const;
+    int profilesCount() const;
 
     // QQmlParserStatus
     void classBegin();
@@ -110,6 +113,12 @@
     void syncStatus(QString aProfileId, int aStatus,
                     QString aMessage, int aStatusDetails);
 
+    /*!
+     * syncStatus notify signal
+     */
+    void syncStatusChanged();
+    void profilesChanged();
+
 public slots:
     /*!
      * \brief Requests to starts synchronizing using a profile Id
@@ -124,7 +133,7 @@
      * \return True if a profile with the Id was found. Otherwise
      *  false and no status change signals will follow from this request.
      */
-    bool startSync(const QString &aProfileId) const;
+    bool startSync(const QString &aProfileId);
 
     /*!
      * \brief Requests to starts synchronizing using a profile category
@@ -135,7 +144,7 @@
      *
      * \see ButeoSyncFW::startSync
      */
-    bool startSyncByCategory(const QString &category) const;
+    bool startSyncByCategory(const QString &category);
 
     /*!
      * \brief Stops synchronizing the profile with the given Id.
@@ -171,11 +180,20 @@
 
 private slots:
     void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
+    void onSyncProfilesByKeyFinished(QDBusPendingCallWatcher *watcher);
+    void onAllVisibleSyncProfilesFinished(QDBusPendingCallWatcher *watcher);
+    void onSyncStatusChanged();
+    void reloadProfiles();
 
 private:
     QScopedPointer<QDBusInterface> m_iface;
     QScopedPointer<QDBusServiceWatcher> m_serviceWatcher;
+    QScopedPointer<QDBusPendingCallWatcher> m_reloadProfilesWatcher;
+    QMultiMap<QString, QPair<QString, bool> > m_profilesByCategory;
+    bool m_waitSyncStart;
 
     void initialize();
     void deinitialize();
+    QStringList profiles(const QString &category = QString(), bool onlyEnabled=false) const;
+    QMultiMap<QString, QPair<QString, bool> > paserProfiles(const QStringList &profiles) const;
 };

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-07-08 15:02:36 +0000
+++ CMakeLists.txt	2015-09-29 13:01:20 +0000
@@ -18,6 +18,20 @@
 find_package(Qt5DBus REQUIRED)
 find_package(Qt5Xml REQUIRED)
 
+# Coverage tools
+OPTION(ENABLE_COVERAGE "Build with coverage analysis support" OFF)
+if(ENABLE_COVERAGE)
+    message(STATUS "Using coverage flags")
+    find_program(COVERAGE_COMMAND gcov)
+    if(NOT COVERAGE_COMMAND)
+        message(FATAL_ERROR "gcov command not found")
+    endif()
+    SET(CMAKE_C_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+    SET(CMAKE_CXX_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
+    include(${CMAKE_SOURCE_DIR}/cmake/lcov.cmake)
+endif()
+
 enable_testing()
 add_subdirectory(Buteo)
 add_subdirectory(tests)

=== added directory 'cmake'
=== added file 'cmake/lcov.cmake'
--- cmake/lcov.cmake	1970-01-01 00:00:00 +0000
+++ cmake/lcov.cmake	2015-09-29 13:01:20 +0000
@@ -0,0 +1,67 @@
+# - This module creates a new 'lcov' target which generates
+#   a coverage analysis html output.
+# LCOV is a graphical front-end for GCC's coverage testing tool gcov.  Please see
+# http://ltp.sourceforge.net/coverage/lcov.php
+#
+# Usage: you must add an option to your CMakeLists.txt to build your application
+# with coverage support. Then you need to include this file to the lcov target.
+#
+# Example:
+# IF(BUILD_WITH_COVERAGE)
+#   SET(CMAKE_C_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+#   SET(CMAKE_CXX_FLAGS "-g -O0 -Wall -fprofile-arcs -ftest-coverage")
+#   SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
+#   include(${CMAKE_SOURCE_DIR}/cmake/lcov.cmake)
+# ENDIF(BUILD_WITH_COVERAGE)
+#=============================================================================
+# Copyright 2010 ascolab GmbH
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+set(REMOVE_PATTERN
+    q*.h
+    *.moc
+    moc_*.cpp
+    locale_facets.h
+    new
+    move.h)
+
+## lcov target
+ADD_CUSTOM_TARGET(lcov)
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND mkdir -p coverage
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND lcov --directory . --zerocounters
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND make test
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND lcov --directory . --capture --output-file ./coverage/stap_all.info --no-checksum --compat-libtool
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND lcov --directory . -r ./coverage/stap_all.info ${REMOVE_PATTERN} --output-file ./coverage/stap.info
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND genhtml -o ./coverage --title "Code Coverage" --legend --show-details --demangle-cpp ./coverage/stap.info
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+ADD_CUSTOM_COMMAND(TARGET lcov
+    COMMAND echo "Open ${CMAKE_BINARY_DIR}/coverage/index.html to view the coverage analysis results."
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+

=== modified file 'debian/control'
--- debian/control	2015-07-09 14:03:24 +0000
+++ debian/control	2015-09-29 13:01:20 +0000
@@ -25,7 +25,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         buteo-syncfw-qt5,
+Recommends: buteo-syncfw
 Description: Buteo sync framework client - QML bindings
  buteo-syncfw manages data synchronization
  .

=== modified file 'tests/qml/buteo-syncfw.py'
--- tests/qml/buteo-syncfw.py	2015-07-08 15:02:36 +0000
+++ tests/qml/buteo-syncfw.py	2015-09-29 13:01:20 +0000
@@ -30,6 +30,7 @@
 SYSTEM_BUS = False
 
 class ButeoSyncFw(dbus.service.Object):
+    DBUS_NAME = None
     PROFILES = [
 """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <profile type=\"sync\" name=\"test-profile\">
@@ -90,6 +91,7 @@
 
     def __init__(self, object_path):
         dbus.service.Object.__init__(self, dbus.SessionBus(), object_path)
+        self._mainloop = GObject.MainLoop()
         self._activeSync = []
         self._profiles = ButeoSyncFw.PROFILES
 
@@ -112,6 +114,12 @@
     @dbus.service.method(dbus_interface=MAIN_IFACE,
                          in_signature='s', out_signature='')
     def abortSync(self, profileId):
+        # WORKAROUND: using 'quit' as profileId will cause the service to dissapear
+        # used on unit test
+        if profileId == 'quit':
+            self.quit()
+            return
+
         if profileId in self._activeSync:
             self._activeSync.remove(profileId)
             self.syncStatus(profileId, 5, 'aborted by the user', 0)
@@ -134,12 +142,12 @@
     @dbus.service.signal(dbus_interface=MAIN_IFACE,
                          signature='sisi')
     def syncStatus(self, profileId, status, message, statusDetails):
-        print("SyncStatus called")
+        pass
 
     @dbus.service.signal(dbus_interface=MAIN_IFACE,
                          signature='sis')
     def signalProfileChanged(self, profileId, status, changedProfile):
-        print("profileChanged called")
+        pass
 
     @dbus.service.method(dbus_interface=MAIN_IFACE,
                          in_signature='s', out_signature='b')
@@ -151,13 +159,16 @@
         else:
             return False
 
+    def quit(self):
+        ButeoSyncFw.DBUS_NAME = None
+        self._mainloop.quit()
 
+    def _run(self):
+        self._mainloop.run()
 
 if __name__ == '__main__':
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
-    name = dbus.service.BusName(BUS_NAME)
-    mainloop = GObject.MainLoop()
+    ButeoSyncFw.DBUS_NAME = dbus.service.BusName(BUS_NAME)
     buteo = ButeoSyncFw(MAIN_OBJ)
-    mainloop.run()
-
+    buteo._run()

=== modified file 'tests/qml/tst_ButeoSyncFW.qml'
--- tests/qml/tst_ButeoSyncFW.qml	2015-07-08 15:02:36 +0000
+++ tests/qml/tst_ButeoSyncFW.qml	2015-09-29 13:01:20 +0000
@@ -24,12 +24,13 @@
     property var buteoComponent
 
     TestCase {
-        id: vcardParser
         name: 'ButeoSyncFWTestCase'
 
         function init()
         {
             buteoComponent = Qt.createQmlObject('import Buteo 0.1; ButeoSync{ }', root);
+            // wait profiles to load
+            tryCompare(buteoComponent, 'profilesCount', 4)
         }
 
         function cleanup()
@@ -47,6 +48,27 @@
             }
         }
 
+        function cleanupTestCase()
+        {
+            // Test service dissapear
+            // We can only test it on 'cleanupTestCase' because it will cause the dbus
+            // service to dissapear and any test after this call will fail
+            buteoComponent = Qt.createQmlObject('import Buteo 0.1; ButeoSync{ }', root);
+
+            var spy = Qt.createQmlObject('import QtTest 1.0; SignalSpy{ }', root);
+            spy.target = buteoComponent
+            spy.signalName = "profilesChanged"
+
+            buteoComponent.abortSync('quit')
+
+            tryCompare(spy, "count", 1)
+            tryCompare(buteoComponent, 'syncing', false)
+            tryCompare(buteoComponent, 'visibleSyncProfiles', [])
+
+            buteoComponent.destroy()
+            buteoComponent = null
+        }
+
         function test_start_sync()
         {
             var spy = Qt.createQmlObject('import QtTest 1.0; SignalSpy{ }', root);
@@ -99,7 +121,7 @@
 
         function test_visibleSyncProfiles_property()
         {
-            compare(buteoComponent.visibleSyncProfiles.length, 4)
+            tryCompare(buteoComponent, 'profilesCount', 4)
             var spy = Qt.createQmlObject('import QtTest 1.0; SignalSpy{ }', root);
             spy.target = buteoComponent
             spy.signalName = "profileChanged"
@@ -109,7 +131,7 @@
             compare(spy.signalArguments[0][0], '3')
             compare(spy.signalArguments[0][1], ButeoSync.ProfileRemoved)
             compare(spy.signalArguments[0][2], 'deleted')
-            compare(buteoComponent.visibleSyncProfiles.length, 3)
+            tryCompare(buteoComponent, 'profilesCount', 3)
             spy.clear()
 
             buteoComponent.removeProfile('2')
@@ -117,7 +139,7 @@
             compare(spy.signalArguments[0][0], '2')
             compare(spy.signalArguments[0][1], ButeoSync.ProfileRemoved)
             compare(spy.signalArguments[0][2], 'deleted')
-            compare(buteoComponent.visibleSyncProfiles.length, 2)
+            tryCompare(buteoComponent, 'profilesCount', 2)
             spy.clear()
 
             buteoComponent.removeProfile('1')
@@ -125,7 +147,7 @@
             compare(spy.signalArguments[0][0], '1')
             compare(spy.signalArguments[0][1], ButeoSync.ProfileRemoved)
             compare(spy.signalArguments[0][2], 'deleted')
-            compare(buteoComponent.visibleSyncProfiles.length, 1)
+            tryCompare(buteoComponent, 'profilesCount', 1)
             spy.clear()
 
             buteoComponent.removeProfile('0')
@@ -133,7 +155,7 @@
             compare(spy.signalArguments[0][0], '0')
             compare(spy.signalArguments[0][1], ButeoSync.ProfileRemoved)
             compare(spy.signalArguments[0][2], 'deleted')
-            compare(buteoComponent.visibleSyncProfiles.length, 0)
+            tryCompare(buteoComponent, 'profilesCount', 0)
             spy.clear()
         }
 
@@ -141,8 +163,8 @@
         {
             var profiles = buteoComponent.syncProfilesByCategory('contacts')
             compare(profiles.length, 2)
-            compare(profiles[0], 'test-profile')
-            compare(profiles[1], '63807467')
+            compare(profiles[0], '63807467')
+            compare(profiles[1], 'test-profile')
         }
 
         function test_sync_by_category()
@@ -156,19 +178,19 @@
             // wait for two signals (since we have two contacts profiles)
             tryCompare(spy, "count", 2)
             // first profile
-            compare(spy.signalArguments[0][0], 'test-profile')
+            compare(spy.signalArguments[0][0], '63807467')
             compare(spy.signalArguments[0][1], ButeoSync.SyncStarted)
             compare(spy.signalArguments[0][2], '')
 
             // secound profile
-            compare(spy.signalArguments[1][0], '63807467')
+            compare(spy.signalArguments[1][0], 'test-profile')
             compare(spy.signalArguments[1][1], ButeoSync.SyncStarted)
             compare(spy.signalArguments[1][2], '')
 
             var activeProfiles = buteoComponent.getRunningSyncList()
             compare(activeProfiles.length, 2)
-            compare(activeProfiles[0], 'test-profile')
-            compare(activeProfiles[1], '63807467')
+            compare(activeProfiles[0], '63807467')
+            compare(activeProfiles[1], 'test-profile')
         }
     }
 }