Merge lp:~renatofilho/address-book-service/fix-duplicated-fields into lp:address-book-service

[Renato Araujo Oliveira Filho]

Added support to store contacts with duplicate details values.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, doesn't work. same problem as before

review: Needs Fixing

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:120
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/668/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/668/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/2/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

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

Added support to store contacts with duplicate details values.

=== modified file 'lib/gee-utils.h'
--- lib/gee-utils.h	2013-10-30 19:07:49 +0000
+++ lib/gee-utils.h	2014-02-24 23:23:25 +0000
@@ -43,10 +43,10 @@
 #define SET_AFD_NEW() \
     GEE_SET(gee_hash_set_new(FOLKS_TYPE_ABSTRACT_FIELD_DETAILS, \
                              (GBoxedCopyFunc) g_object_ref, g_object_unref, \
-                             _folks_abstract_field_details_hash_data_func, \
-                             NULL, \
-                             NULL, \
-                             _folks_abstract_field_details_equal_data_func, \
+                             NULL, \
+                             NULL, \
+                             NULL, \
+                             NULL, \
                              NULL, \
                              NULL))
 
@@ -71,10 +71,10 @@
                                          NULL, \
                                          NULL, \
                                          NULL, \
-                                         _folks_abstract_field_details_hash_data_func, \
-                                         NULL, \
-                                         NULL, \
-                                         _folks_abstract_field_details_equal_data_func, \
+                                         NULL, \
+                                         NULL, \
+                                         NULL, \
+                                         NULL, \
                                          NULL, \
                                          NULL))
 

=== modified file 'tests/unittest/CMakeLists.txt'
--- tests/unittest/CMakeLists.txt	2014-02-24 23:23:25 +0000
+++ tests/unittest/CMakeLists.txt	2014-02-24 23:23:25 +0000
@@ -71,7 +71,7 @@
     declare_test(addressbook-test True ${BASE_CLIENT_TEST_SRC})
     declare_test(service-life-cycle-test True ${BASE_CLIENT_TEST_SRC})
     declare_test(contact-link-test True ${BASE_CLIENT_TEST_SRC})
-
+    declare_test(contact-edit-test True ${BASE_CLIENT_TEST_SRC})
 elseif()
     message(STATUS "DBus test runner not found. Some tests will be disabled")
 endif()

=== added file 'tests/unittest/contact-edit-test.cpp'
--- tests/unittest/contact-edit-test.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittest/contact-edit-test.cpp	2014-02-24 23:23:25 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2013 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/>.
+ */
+
+#include "base-client-test.h"
+#include "lib/source.h"
+#include "common/dbus-service-defs.h"
+#include "common/vcard-parser.h"
+
+#include <QObject>
+#include <QtDBus>
+#include <QtTest>
+#include <QDebug>
+#include <QtVersit>
+
+class ContactEditTest : public BaseClientTest
+{
+    Q_OBJECT
+private:
+    QString m_basicVcard;
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+        BaseClientTest::initTestCase();
+        m_basicVcard = QStringLiteral("BEGIN:VCARD\n"
+                                      "VERSION:3.0\n"
+                                      "N:Tal;Fulano_;de;;\n"
+                                      "EMAIL:[e-mail]\n"
+                                      "EMAIL:[e-mail]\n"
+                                      "TEL;TYPE=CELL:8888888\n"
+                                      "TEL;TYPE=ISDN:8888888\n"
+                                      "END:VCARD");
+    }
+
+    void testSaveDuplicatedEmail()
+    {
+        // call create contact
+        QDBusReply<QString> reply = m_serverIface->call("createContact", m_basicVcard, "dummy-store");
+
+        // check if the returned id is valid
+        QString newContactId = reply.value();
+        QVERIFY(!newContactId.isEmpty());
+
+        // query created contact
+        QDBusReply<QStringList> reply2 = m_dummyIface->call("listContacts");
+        QCOMPARE(reply2.value().count(), 1);
+        QList<QtContacts::QContact> contactsCreated = galera::VCardParser::vcardToContact(reply2.value());
+        QCOMPARE(contactsCreated.count(), 1);
+
+        // check if the contact has the 2 emails
+        QList<QtContacts::QContactEmailAddress> emails = contactsCreated[0].details<QtContacts::QContactEmailAddress>();
+        QCOMPARE(emails.size(), 2);
+        QCOMPARE(emails[0].emailAddress(), QStringLiteral("[e-mail]"));
+        QCOMPARE(emails[1].emailAddress(), QStringLiteral("[e-mail]"));
+
+        // check if the contact has the 2 phones
+        QList<QtContacts::QContactPhoneNumber> phones = contactsCreated[0].details<QtContacts::QContactPhoneNumber>();
+        QCOMPARE(phones.size(), 2);
+        QCOMPARE(phones[0].number(), QStringLiteral("8888888"));
+        QCOMPARE(phones[1].number(), QStringLiteral("8888888"));
+    }
+
+    void testAddANewEmailWithTheSameAddress()
+    {
+        // call create contact
+        QDBusReply<QString> replyString = m_serverIface->call("createContact", m_basicVcard, "dummy-store");
+
+        // check if the returned id is valid
+        QString newContactId = replyString.value();
+        QVERIFY(!newContactId.isEmpty());
+
+        // query created contact
+        QDBusReply<QStringList> replyStringList = m_dummyIface->call("listContacts");
+        QCOMPARE(replyStringList.value().count(), 1);
+        QList<QtContacts::QContact> contacts = galera::VCardParser::vcardToContact(replyStringList.value());
+        QCOMPARE(contacts.count(), 1);
+
+        // add a email with the same address but different context
+        QtContacts::QContact contact = contacts[0];
+        QtContacts::QContactEmailAddress email;
+        email.setEmailAddress("[e-mail]");
+        QList<int> contexts;
+        contexts << QtContacts::QContactDetail::ContextWork;
+        email.setContexts(contexts);
+        contact.saveDetail(&email);
+
+        // save the changes
+        QStringList vcards = galera::VCardParser::contactToVcard(QList<QtContacts::QContact>() << contact);
+        replyStringList = m_serverIface->call("updateContacts", vcards);
+
+        // query updated contacts
+        replyStringList = m_dummyIface->call("listContacts");
+        QCOMPARE(replyStringList.value().count(), 1);
+        contacts = galera::VCardParser::vcardToContact(replyStringList.value());
+        QCOMPARE(contacts.count(), 1);
+
+        // check if the contact has the 3 emails
+        QList<QtContacts::QContactEmailAddress> emails = contacts[0].details<QtContacts::QContactEmailAddress>();
+        QCOMPARE(emails.size(), 3);
+        bool hasWorkEmail = false;
+        Q_FOREACH(QtContacts::QContactEmailAddress email, emails) {
+            QCOMPARE(email.emailAddress(), QStringLiteral("[e-mail]"));
+            if (email.contexts() == contexts) {
+                // we only have one work e-mail
+                QCOMPARE(hasWorkEmail, false);
+                hasWorkEmail = true;
+            }
+        }
+        QCOMPARE(hasWorkEmail, true);
+    }
+};
+
+QTEST_MAIN(ContactEditTest)
+
+#include "contact-edit-test.moc"