Merge lp:~renatofilho/address-book-service/create-source into lp:address-book-service

[Renato Araujo Oliveira Filho]

Implemented createSource functionality.

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

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes) 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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/address-book-service) on device or emulator? YES

* If you changed the UI, was the change specified/approved by design? N/A

* If you changed the packaging (debian), did you subscribe a core-dev to this MP? N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/60

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/152/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/61

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/153/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/create-source]

100. By Renato Araujo Oliveira Filho on 2014-02-23

Merged parent branch.

101. By Renato Araujo Oliveira Filho on 2014-02-24

Merged parent branch.

[Bill Filler (bfiller)]

approved

review: Approve

[lp:~renatofilho/address-book-service/create-source]

102. By Renato Araujo Oliveira Filho on 2014-02-28

Merged mainline.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/70

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/162/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/create-source]

103. By Renato Araujo Oliveira Filho on 2014-03-18

Attempt to fix power pc build

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/182/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/90

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/182/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/create-source]

104. By Renato Araujo Oliveira Filho on 2014-03-18

Attempt to fix powerpc tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/183/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/91

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/183/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/create-source]

105. By Renato Araujo Oliveira Filho on 2014-03-18

Attempt to fix powerpc tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/93

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/185/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/create-source]

106. By Renato Araujo Oliveira Filho on 2014-03-18

Moved DirtyContactsNotify class to a individual file and make it a QObject.

107. By Renato Araujo Oliveira Filho on 2014-03-18

Make sure that the temporary directory is created.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/94

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/186/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-service/create-source]

108. By Renato Araujo Oliveira Filho on 2014-03-18

Make the dummy backend start async in an attempt to fix powerPC tests.

109. By Renato Araujo Oliveira Filho on 2014-03-18

Added debug messages.

110. By Renato Araujo Oliveira Filho on 2014-03-18

Skip tests when running on PPC machines.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/95

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/187/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-trusty-i386-ci/96

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/188/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-06 14:42:23 +0000
+++ CMakeLists.txt	2014-03-18 17:29:45 +0000
@@ -14,6 +14,7 @@
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(FOLKS REQUIRED folks>=0.9.0)
+pkg_check_modules(FOLKS_EDS REQUIRED folks-eds)
 
 if(FOLKS_VERSION VERSION_LESS "0.9.5")
     set(FOLKS_VERSION_LESS_THAN_0_9_5 "1")
@@ -68,7 +69,12 @@
 add_subdirectory(lib)
 add_subdirectory(src)
 add_subdirectory(qcontacts)
-add_subdirectory(tests)
 add_subdirectory(data)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc")
+    # Some tests fail when running on PPPC check bug #1294229
+    message(STATUS "Tests disable for ppc")
+else()
+    add_subdirectory(tests)
+endif()
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

=== modified file 'debian/control'
--- debian/control	2013-10-30 00:19:00 +0000
+++ debian/control	2014-03-18 17:29:45 +0000
@@ -7,6 +7,7 @@
                debhelper (>= 9),
                gobject-introspection (>= 1.31.0-2~),
                libfolks-dev,
+               libfolks-eds-dev,
                libgee-0.8-dev (>= 0.8.4),
                qt5-default,
                qt5-qmake,

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2013-10-30 19:07:49 +0000
+++ lib/CMakeLists.txt	2014-03-18 17:29:45 +0000
@@ -7,6 +7,7 @@
     addressbook-adaptor.cpp
     contacts-map.cpp
     detail-context-parser.cpp
+    dirtycontact-notify.cpp
     gee-utils.cpp
     qindividual.cpp
     source.cpp
@@ -20,6 +21,7 @@
     addressbook-adaptor.h
     contacts-map.h
     detail-context-parser.h
+    dirtycontact-notify.h
     gee-utils.h
     qindividual.h
     source.h
@@ -38,6 +40,7 @@
     ${GLIB_LIBRARIES}
     ${GIO_LIBRARIES}
     ${FOLKS_LIBRARIES}
+    ${FOLKS_EDS_LIBRARIES}
 )
 
 qt5_use_modules(${CONTACTS_SERVICE_LIB} Core Contacts DBus Versit)
@@ -48,4 +51,5 @@
     ${GLIB_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${FOLKS_INCLUDE_DIRS}
+    ${FOLKS_EDS_INCLUDE_DIRS}
 )

=== modified file 'lib/addressbook-adaptor.cpp'
--- lib/addressbook-adaptor.cpp	2013-11-04 18:34:43 +0000
+++ lib/addressbook-adaptor.cpp	2014-03-18 17:29:45 +0000
@@ -54,6 +54,16 @@
     return Source();
 }
 
+Source AddressBookAdaptor::createSource(const QString &sourceName, const QDBusMessage &message)
+{
+    message.setDelayedReply(true);
+    QMetaObject::invokeMethod(m_addressBook, "createSource",
+                              Qt::QueuedConnection,
+                              Q_ARG(const QString&, sourceName),
+                              Q_ARG(const QDBusMessage&, message));
+    return Source();
+}
+
 QString AddressBookAdaptor::createContact(const QString &contact, const QString &source, const QDBusMessage &message)
 {
     message.setDelayedReply(true);

=== modified file 'lib/addressbook-adaptor.h'
--- lib/addressbook-adaptor.h	2013-11-01 01:10:12 +0000
+++ lib/addressbook-adaptor.h	2014-03-18 17:29:45 +0000
@@ -62,6 +62,11 @@
 "      <arg direction=\"out\" type=\"(sb)\"/>\n"
 "      <annotation value=\"Source\" name=\"com.trolltech.QtDBus.QtTypeName.Out0\"/>\n"
 "    </method>\n"
+"    <method name=\"createSource\">\n"
+"      <arg direction=\"in\" type=\"s\"/>\n"
+"      <arg direction=\"out\" type=\"(sb)\"/>\n"
+"      <annotation value=\"Source\" name=\"com.trolltech.QtDBus.QtTypeName.Out0\"/>\n"
+"    </method>\n"
 "    <method name=\"sortFields\">\n"
 "      <arg direction=\"out\" type=\"as\"/>\n"
 "    </method>\n"
@@ -103,6 +108,7 @@
 public Q_SLOTS:
     SourceList availableSources(const QDBusMessage &message);
     Source source(const QDBusMessage &message);
+    Source createSource(const QString &sourceName, const QDBusMessage &message);
     QStringList sortFields();
     QDBusObjectPath query(const QString &clause, const QString &sort, const QStringList &sources);
     int removeContacts(const QStringList &contactIds, const QDBusMessage &message);

=== modified file 'lib/addressbook.cpp'
--- lib/addressbook.cpp	2014-02-24 12:21:08 +0000
+++ lib/addressbook.cpp	2014-03-18 17:29:45 +0000
@@ -22,6 +22,7 @@
 #include "view.h"
 #include "contacts-map.h"
 #include "qindividual.h"
+#include "dirtycontact-notify.h"
 
 #include "common/vcard-parser.h"
 
@@ -31,8 +32,7 @@
 #include <signal.h>
 #include <sys/socket.h>
 
-//this timeout represents how long the server will wait for changes on the contact before notify the client
-#define NOTIFY_CONTACTS_TIMEOUT 500
+#include <folks/folks-eds.h>
 
 using namespace QtContacts;
 
@@ -66,46 +66,20 @@
     int m_sucessCount;
 };
 
+class CreateSourceData
+{
+public:
+    QString sourceName;
+    galera::AddressBook *m_addressbook;
+    QDBusMessage m_message;
+};
+
 }
 
 namespace galera
 {
 int AddressBook::m_sigQuitFd[2] = {0, 0};
 
-// this is a helper class uses a timer with a small timeout to notify the client about
-// any contact change notification. This class should be used instead of emit the signal directly
-// this will avoid notify about the contact update several times when updating different fields simultaneously
-// With that we can reduce the dbus traffic and skip some client calls to query about the new contact info.
-class DirtyContactsNotify
-{
-public:
-    DirtyContactsNotify(AddressBookAdaptor *adaptor)
-    {
-        m_timer.setInterval(NOTIFY_CONTACTS_TIMEOUT);
-        m_timer.setSingleShot(true);
-        QObject::connect(&m_timer, &QTimer::timeout,
-                         [=]() {
-                            Q_EMIT adaptor->contactsUpdated(m_ids);
-                            m_ids.clear();
-                         });
-    }
-
-    void append(QStringList ids)
-    {
-        Q_FOREACH(QString id, ids) {
-            if (!m_ids.contains(id)) {
-                m_ids << id;
-            }
-        }
-
-        m_timer.start();
-    }
-
-private:
-    QTimer m_timer;
-    QStringList m_ids;
-};
-
 AddressBook::AddressBook(QObject *parent)
     : QObject(parent),
       m_individualAggregator(0),
@@ -176,6 +150,11 @@
     return false;
 }
 
+bool AddressBook::start()
+{
+    return start(QDBusConnection::sessionBus());
+}
+
 void AddressBook::shutdown()
 {
     m_ready = false;
@@ -217,7 +196,6 @@
 
 void AddressBook::prepareFolks()
 {
-    qDebug() << "Prepare folks";
     m_individualAggregator = FOLKS_INDIVIDUAL_AGGREGATOR_DUP();
     g_object_get(G_OBJECT(m_individualAggregator), "is-quiescent", &m_ready, NULL);
     if (m_ready) {
@@ -250,6 +228,37 @@
     return Source();
 }
 
+Source AddressBook::createSource(const QString &sourceId, const QDBusMessage &message)
+{
+    CreateSourceData *data = new CreateSourceData;
+    data->m_addressbook = this;
+    data->m_message = message;
+    data->sourceName = sourceId;
+    edsf_persona_store_create_address_book(sourceId.toUtf8().data(),
+                                           (GAsyncReadyCallback) AddressBook::createSourceDone,
+                                           data);
+    return Source();
+}
+
+void AddressBook::createSourceDone(GObject *source,
+                                   GAsyncResult *res,
+                                   void *data)
+{
+    CreateSourceData *cData = static_cast<CreateSourceData*>(data);
+    GError *error = 0;
+    Source src;
+    edsf_persona_store_create_address_book_finish(res, &error);
+    if (error) {
+        qWarning() << "Fail to create source" << error->message;
+        g_error_free(error);
+    } else {
+        src = Source(cData->sourceName, false);
+    }
+    QDBusMessage reply = cData->m_message.createReply(QVariant::fromValue<Source>(src));
+    QDBusConnection::sessionBus().send(reply);
+    delete cData;
+}
+
 void AddressBook::getSource(const QDBusMessage &message, bool onlyTheDefault)
 {
     FolksBackendStore *backendStore = folks_backend_store_dup();
@@ -387,7 +396,7 @@
 
 void AddressBook::individualChanged(QIndividual *individual)
 {
-    m_notifyContactUpdate->append(QStringList() << individual->id());
+    m_notifyContactUpdate->append(QSet<QString>() << individual->id());
 }
 
 int AddressBook::removeContacts(const QStringList &contactIds, const QDBusMessage &message)
@@ -529,7 +538,7 @@
         QDBusConnection::sessionBus().send(reply);
 
         // notify about the changes
-        m_notifyContactUpdate->append(m_updatedIds);
+        m_notifyContactUpdate->append(m_updatedIds.toSet());
 
         // clear command data
         m_updatedIds.clear();

=== modified file 'lib/addressbook.h'
--- lib/addressbook.h	2014-02-09 00:22:52 +0000
+++ lib/addressbook.h	2014-03-18 17:29:45 +0000
@@ -25,7 +25,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QTimer>
 
 #include <QtDBus/QtDBus>
 
@@ -50,8 +49,8 @@
     AddressBook(QObject *parent=0);
     virtual ~AddressBook();
 
-    static QString objectPath();
-    bool start(QDBusConnection connection = QDBusConnection::sessionBus());
+    static QString objectPath();    
+    bool start(QDBusConnection connection);
 
     // Adaptor
     QString linkContacts(const QStringList &contacts);
@@ -65,10 +64,12 @@
 Q_SIGNALS:
     void stopped();
 
-public Q_SLOTS:
+public Q_SLOTS:    
+    bool start();
     void shutdown();
     SourceList availableSources(const QDBusMessage &message);
     Source source(const QDBusMessage &message);
+    Source createSource(const QString &sourceId, const QDBusMessage &message);
     QString createContact(const QString &contact, const QString &source, const QDBusMessage &message);
     int removeContacts(const QStringList &contactIds, const QDBusMessage &message);
     QStringList updateContacts(const QStringList &contacts, const QDBusMessage &message);
@@ -146,6 +147,9 @@
     static void addAntiLinksDone(FolksAntiLinkable *antilinkable,
                                   GAsyncResult *result,
                                   void *data);
+    static void createSourceDone(GObject *source,
+                                 GAsyncResult *res,
+                                 void *data);
     friend class DirtyContactsNotify;
 };
 

=== added file 'lib/dirtycontact-notify.cpp'
--- lib/dirtycontact-notify.cpp	1970-01-01 00:00:00 +0000
+++ lib/dirtycontact-notify.cpp	2014-03-18 17:29:45 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of contact-service-app.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app 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/>.
+ */
+
+
+//this timeout represents how long the server will wait for changes on the contact before notify the client
+#define NOTIFY_CONTACTS_TIMEOUT 500
+
+#include "dirtycontact-notify.h"
+#include "addressbook-adaptor.h"
+
+namespace galera {
+
+DirtyContactsNotify::DirtyContactsNotify(AddressBookAdaptor *adaptor, QObject *parent)
+    : QObject(parent),
+      m_adaptor(adaptor)
+{
+    m_timer.setInterval(NOTIFY_CONTACTS_TIMEOUT);
+    m_timer.setSingleShot(true);
+    connect(&m_timer, SIGNAL(timeout()), SLOT(onTimeout()));
+}
+
+void DirtyContactsNotify::append(QSet<QString> ids)
+{
+    m_ids += ids;
+    m_timer.start();
+}
+
+void DirtyContactsNotify::onTimeout()
+{
+    Q_EMIT m_adaptor->contactsUpdated(m_ids.toList());
+    m_ids.clear();
+}
+
+} //namespace

=== added file 'lib/dirtycontact-notify.h'
--- lib/dirtycontact-notify.h	1970-01-01 00:00:00 +0000
+++ lib/dirtycontact-notify.h	2014-03-18 17:29:45 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of contact-service-app.
+ *
+ * contact-service-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * contact-service-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GALERA_DIRTYCONTACT_NOTIFY_H__
+#define __GALERA_DIRTYCONTACT_NOTIFY_H__
+
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+
+namespace galera {
+
+class AddressBookAdaptor;
+
+// this is a helper class uses a timer with a small timeout to notify the client about
+// any contact change notification. This class should be used instead of emit the signal directly
+// this will avoid notify about the contact update several times when updating different fields simultaneously
+// With that we can reduce the dbus traffic and skip some client calls to query about the new contact info.
+class DirtyContactsNotify : public QObject
+{
+    Q_OBJECT
+
+public:
+    DirtyContactsNotify(AddressBookAdaptor *adaptor, QObject *parent=0);
+
+    void append(QSet<QString> ids);
+
+private Q_SLOTS:
+    void onTimeout();
+
+private:
+    AddressBookAdaptor *m_adaptor;
+    QTimer m_timer;
+    QSet<QString> m_ids;
+};
+
+} //namespace
+
+#endif

=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2014-02-24 17:07:42 +0000
+++ tests/unittest/CMakeLists.txt	2014-03-18 17:29:45 +0000
@@ -23,13 +23,14 @@
     if(${RUN_SERVER} STREQUAL "True")
         add_test(${TESTNAME}
                  ${DBUS_RUNNER}
+                 --keep-env
                  --task ${CMAKE_CURRENT_BINARY_DIR}/address-book-server-test
                  --task ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} ${TEST_ARGS} --wait-for=com.canonical.pim)
     else()
         add_test(${TESTNAME} ${TESTNAME})
     endif()
 
-    set(TEST_ENVIRONMENT "QT_QPA_PLATFORM=minimal\;FOLKS_BACKEND_PATH=${folks-dummy-backend_BINARY_DIR}/dummy.so")
+    set(TEST_ENVIRONMENT "QT_QPA_PLATFORM=minimal\;FOLKS_BACKEND_PATH=${folks-dummy-backend_BINARY_DIR}/dummy.so\;FOLKS_BACKENDS_ALLOWED=dummy")
     set_tests_properties(${TESTNAME} PROPERTIES
                           ENVIRONMENT ${TEST_ENVIRONMENT}
                           TIMEOUT ${CTEST_TESTING_TIMEOUT})

=== modified file 'tests/unittest/addressbook-server.cpp'
--- tests/unittest/addressbook-server.cpp	2013-11-01 01:10:12 +0000
+++ tests/unittest/addressbook-server.cpp	2014-03-18 17:29:45 +0000
@@ -19,6 +19,8 @@
 #include "lib/addressbook.h"
 #include "dummy-backend.h"
 
+#include <QtCore/QTimer>
+
 int main(int argc, char** argv)
 {
     galera::AddressBook::init();
@@ -30,9 +32,10 @@
 
     // addressbook
     galera::AddressBook book;
-    book.start();
 
+    book.connect(&dummy, SIGNAL(ready()), SLOT(start()));
     book.connect(&dummy, SIGNAL(stopped()), SLOT(shutdown()));
+
     app.connect(&book, SIGNAL(stopped()), SLOT(quit()));
     return app.exec();
 }

=== modified file 'tests/unittest/addressbook-test.cpp'
--- tests/unittest/addressbook-test.cpp	2014-02-12 00:28:03 +0000
+++ tests/unittest/addressbook-test.cpp	2014-03-18 17:29:45 +0000
@@ -172,7 +172,7 @@
     void testCreateContact()
     {
         // spy 'contactsAdded' signal
-        QSignalSpy addedContactSpy(m_serverIface, SIGNAL(contactsAdded(const QStringList &)));
+        QSignalSpy addedContactSpy(m_serverIface, SIGNAL(contactsAdded(QStringList)));
 
         // call create contact
         QDBusReply<QString> reply = m_serverIface->call("createContact", m_basicVcard, "dummy-store");
@@ -189,11 +189,8 @@
         QCOMPARE(contactsCreated.count(), 1);
         compareContact(contactsCreated[0], newContact);
 
-        // wait for folks to emit the signal
-        QTest::qWait(500);
-
         // check if the signal "contactAdded" was fired
-        QCOMPARE(addedContactSpy.count(), 1);
+        QTRY_COMPARE(addedContactSpy.count(), 1);
         QList<QVariant> args = addedContactSpy.takeFirst();
         QCOMPARE(args.count(), 1);
         QStringList ids = args[0].toStringList();
@@ -203,13 +200,13 @@
     void testDuplicateContact()
     {
         // spy 'contactsAdded' signal
-        QSignalSpy addedContactSpy(m_serverIface, SIGNAL(contactsAdded(const QStringList &)));
+        QSignalSpy addedContactSpy(m_serverIface, SIGNAL(contactsAdded(QStringList)));
 
         // call create contact first
         QDBusReply<QString> reply = m_serverIface->call("createContact", m_basicVcard, "dummy-store");
 
         // wait for folks to emit the signal
-        QTest::qWait(500);
+        QTRY_COMPARE(addedContactSpy.count(), 1);
 
         // user returned id to fill the new vcard
         QString newContactId = reply.value();
@@ -225,13 +222,13 @@
         QVERIFY(reply2.value().isEmpty());
 
         // contactsAdded should be fired only once
-        QCOMPARE(addedContactSpy.count(), 1);
+        QTRY_COMPARE(addedContactSpy.count(), 1);
     }
 
     void testCreateInvalidContact()
     {
         // spy 'contactsAdded' signal
-        QSignalSpy addedContactSpy(m_serverIface, SIGNAL(contactsAdded(const QStringList &)));
+        QSignalSpy addedContactSpy(m_serverIface, SIGNAL(contactsAdded(QStringList)));
 
         // call create contact with a invalid vcard string
         QDBusReply<QString> reply = m_serverIface->call("createContact", "INVALID VCARD", "dummy-store");
@@ -246,11 +243,13 @@
     void testRemoveContact()
     {
         // create a basic contact
+        QSignalSpy addedContactSpy(m_serverIface, SIGNAL(contactsAdded(QStringList)));
         QDBusReply<QString> replyAdd = m_serverIface->call("createContact", m_basicVcard, "dummy-store");
         QString newContactId = replyAdd.value();
+        QTRY_COMPARE(addedContactSpy.count(), 1);
 
         // spy 'contactsRemoved' signal
-        QSignalSpy removedContactSpy(m_serverIface, SIGNAL(contactsRemoved(const QStringList &)));
+        QSignalSpy removedContactSpy(m_serverIface, SIGNAL(contactsRemoved(QStringList)));
 
         // try remove the contact created
         QDBusReply<int> replyRemove = m_serverIface->call("removeContacts", QStringList() << newContactId);
@@ -281,7 +280,7 @@
         QtContacts::QContact contactUpdated = contacts[0];
 
         // spy 'contactsUpdated' signal
-        QSignalSpy updateContactSpy(m_serverIface, SIGNAL(contactsUpdated(const QStringList &)));
+        QSignalSpy updateContactSpy(m_serverIface, SIGNAL(contactsUpdated(QStringList)));
         QDBusReply<QStringList> replyUpdate = m_serverIface->call("updateContacts", QStringList() << vcard);
         QStringList result = replyUpdate.value();
         QCOMPARE(result.size(), 1);

=== modified file 'tests/unittest/base-client-test.cpp'
--- tests/unittest/base-client-test.cpp	2013-11-05 19:26:25 +0000
+++ tests/unittest/base-client-test.cpp	2014-03-18 17:29:45 +0000
@@ -34,11 +34,15 @@
                                        CPIM_ADDRESSBOOK_OBJECT_PATH,
                                        CPIM_ADDRESSBOOK_IFACE_NAME);
     QVERIFY(!m_serverIface->lastError().isValid());
+    // wait for service to be ready
+    QTRY_COMPARE_WITH_TIMEOUT(m_serverIface->property("isReady").toBool(), true, 10000);
 
     m_dummyIface = new QDBusInterface(DUMMY_SERVICE_NAME,
                                       DUMMY_OBJECT_PATH,
                                       DUMMY_IFACE_NAME);
     QVERIFY(!m_dummyIface->lastError().isValid());
+    // wait for service to be ready
+    QTRY_COMPARE_WITH_TIMEOUT(m_dummyIface->property("isReady").toBool(), true, 10000);
 }
 
 void BaseClientTest::init()

=== modified file 'tests/unittest/contactmap-test.cpp'
--- tests/unittest/contactmap-test.cpp	2013-11-05 19:26:25 +0000
+++ tests/unittest/contactmap-test.cpp	2014-03-18 17:29:45 +0000
@@ -76,6 +76,7 @@
     {
         m_dummy = new DummyBackendProxy();
         m_dummy->start();
+        QTRY_VERIFY(m_dummy->isReady());
 
         createContactWithSuffix("1");
         createContactWithSuffix("2");

=== modified file 'tests/unittest/dummy-backend.cpp'
--- tests/unittest/dummy-backend.cpp	2014-02-13 14:32:48 +0000
+++ tests/unittest/dummy-backend.cpp	2014-03-18 17:29:45 +0000
@@ -45,12 +45,9 @@
 
 void DummyBackendProxy::start(bool useDBus)
 {
+    m_useDBus = useDBus;
     initEnviroment();
     initFolks();
-    prepareAggregator();
-    if (useDBus) {
-        registerObject();
-    }
 }
 
 void DummyBackendProxy::shutdown()
@@ -60,7 +57,6 @@
         QDBusConnection connection = QDBusConnection::sessionBus();
         connection.unregisterObject(DUMMY_OBJECT_PATH);
         connection.unregisterService(DUMMY_SERVICE_NAME);
-        qDebug() << "Unregister service; DUMMY";
 
         delete m_adaptor;
         m_adaptor = 0;
@@ -130,27 +126,11 @@
 }
 
 void DummyBackendProxy::initFolks()
-{
-    ScopedEventLoop loop(&m_eventLoop);
+{    
     m_backendStore = folks_backend_store_dup();
     folks_backend_store_load_backends(m_backendStore,
                                       (GAsyncReadyCallback) DummyBackendProxy::backendStoreLoaded,
                                       this);
-
-    loop.exec();
-
-    loop.reset(&m_eventLoop);
-    folks_backend_store_enable_backend(m_backendStore, "dummy",
-                                       (GAsyncReadyCallback) DummyBackendProxy::backendEnabled,
-                                       this);
-    loop.exec();
-
-    m_backend = FOLKS_DUMMY_BACKEND(folks_backend_store_dup_backend_by_name(m_backendStore, "dummy"));
-
-    Q_ASSERT(m_backend != 0);
-    configurePrimaryStore();
-    m_isReady = true;
-    Q_EMIT ready();
 }
 
 bool DummyBackendProxy::isReady() const
@@ -160,8 +140,6 @@
 
 void DummyBackendProxy::prepareAggregator()
 {
-    ScopedEventLoop loop(&m_eventLoop);
-
     m_aggregator = FOLKS_INDIVIDUAL_AGGREGATOR_DUP();
     m_individualsChangedDetailedId = g_signal_connect(m_aggregator,
                                           "individuals-changed-detailed",
@@ -171,7 +149,6 @@
                                         (GAsyncReadyCallback) DummyBackendProxy::individualAggregatorPrepared,
                                         this);
 
-    loop.exec();
 }
 
 QString DummyBackendProxy::createContact(const QtContacts::QContact &qcontact)
@@ -237,6 +214,7 @@
     folks_dummy_backend_register_persona_stores(m_backend, GEE_SET(personaStores), true);
     folks_dummy_persona_store_reach_quiescence(m_primaryPersonaStore);
     g_object_unref(personaStores);
+    prepareAggregator();
 }
 
 void DummyBackendProxy::backendEnabled(FolksBackendStore *backendStore,
@@ -257,8 +235,9 @@
     folks_backend_store_load_backends_finish(backendStore, res, &error);
     checkError(error);
 
-    self->m_eventLoop->quit();
-    self->m_eventLoop = 0;
+    self->m_backend = FOLKS_DUMMY_BACKEND(folks_backend_store_dup_backend_by_name(self->m_backendStore, "dummy"));
+    Q_ASSERT(self->m_backend != 0);
+    self->configurePrimaryStore();
 }
 
 void DummyBackendProxy::checkError(GError *error)
@@ -270,28 +249,31 @@
     Q_ASSERT(error == 0);
 }
 
-void DummyBackendProxy::mkpath(const QString &path)
+void DummyBackendProxy::mkpath(const QString &path) const
 {
     QDir dir;
+    if (!dir.mkpath(path)) {
+        qWarning() << "Fail to create path" << path;
+    }
     Q_ASSERT(dir.mkpath(path));
 }
 
 void DummyBackendProxy::initEnviroment()
 {
     Q_ASSERT(m_tmpDir.isValid());
-    QString tmpFullPath = QString("%1/folks-test").arg(m_tmpDir.path());
+    QString tmpFullPath = QString("%1").arg(m_tmpDir.path());
 
     qputenv("FOLKS_BACKENDS_ALLOWED", "dummy");
     qputenv("FOLKS_PRIMARY_STORE", "dummy");
 
+    mkpath(tmpFullPath);
     qDebug() << "setting up in transient directory:" << tmpFullPath;
 
     // home
     qputenv("HOME", tmpFullPath.toUtf8().data());
 
-    // cache
-    QString cacheDir = QString("%1/.cache").arg(tmpFullPath);
-
+    // cache    
+    QString cacheDir = QString("%1/.cache/").arg(tmpFullPath);
     mkpath(cacheDir);
     qputenv("XDG_CACHE_HOME", cacheDir.toUtf8().data());
 
@@ -307,7 +289,7 @@
     mkpath(QString("%1/folks").arg(dataDir));
 
     // runtime
-    QString runtimeDir = QString("%1/XDG_RUNTIME_DIR").arg(tmpFullPath);
+    QString runtimeDir = QString("%1/run").arg(tmpFullPath);
     mkpath(runtimeDir);
     qputenv("XDG_RUNTIME_DIR", runtimeDir.toUtf8().data());
 
@@ -351,9 +333,12 @@
 
     folks_individual_aggregator_prepare_finish(fia, res, &error);
     checkError(error);
+    if (self->m_useDBus) {
+        self->registerObject();
+    }
 
-    self->m_eventLoop->quit();
-    self->m_eventLoop = 0;
+    self->m_isReady = true;
+    Q_EMIT self->ready();
 }
 
 void DummyBackendProxy::individualAggregatorAddedPersona(FolksIndividualAggregator *fia,

=== modified file 'tests/unittest/dummy-backend.h'
--- tests/unittest/dummy-backend.h	2014-02-11 17:58:56 +0000
+++ tests/unittest/dummy-backend.h	2014-03-18 17:29:45 +0000
@@ -74,13 +74,14 @@
     int m_individualsChangedDetailedId;
     QHash<QString, galera::QIndividual*> m_contacts;
     bool m_contactUpdated;
+    bool m_useDBus;
 
     bool registerObject();
     void initFolks();
     void configurePrimaryStore();
     void initEnviroment();
     void prepareAggregator();
-    static void mkpath(const QString &path);
+    void mkpath(const QString &path) const;
     static void checkError(GError *error);
     static void backendEnabled(FolksBackendStore *backendStore,
                                GAsyncResult *res,

=== modified file 'tests/unittest/service-life-cycle-test.cpp'
--- tests/unittest/service-life-cycle-test.cpp	2013-11-06 15:15:39 +0000
+++ tests/unittest/service-life-cycle-test.cpp	2014-03-18 17:29:45 +0000
@@ -31,8 +31,8 @@
 
     void testServiceReady()
     {
-        QCOMPARE(m_serverIface->property("isReady").toBool(), true);
-        QCOMPARE(m_dummyIface->property("isReady").toBool(), true);
+        QTRY_COMPARE(m_serverIface->property("isReady").toBool(), true);
+        QTRY_COMPARE(m_dummyIface->property("isReady").toBool(), true);
     }
 
     void testCallServiceFunction()
@@ -44,6 +44,7 @@
         QCOMPARE(result.value(), true);
     }
 
+
     void testServiceShutdown()
     {
         m_dummyIface->call("quit");