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

[Renato Araujo Oliveira Filho]

Use middle name value on display name.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:204
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/472/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/156/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/156/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6903/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6914/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/473/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/157
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/157/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6920
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6920/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/28159

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

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

[lp:~renatofilho/address-book-service/fix-1548783]

204. By Renato Araujo Oliveira Filho on 2016-05-20

Use middle name value on display name. Fixes: #1375933, #1548783
Approved by: Arthur Mello, PS Jenkins bot

=== modified file 'lib/qindividual.cpp'
--- lib/qindividual.cpp	2015-10-29 13:34:18 +0000
+++ lib/qindividual.cpp	2016-05-04 21:28:44 +0000
@@ -1705,8 +1705,24 @@
     if (fallbackLabel.isEmpty()) {
         QContactName name = contact.detail<QContactName>();
         if (!name.isEmpty()) {
-            QString fullName = QString("%1 %2").arg(name.firstName()).arg(name.lastName());
-            fallbackLabel = fullName.trimmed();
+            QStringList names;
+            if (!name.prefix().isEmpty()) {
+                names << name.prefix();
+            }
+            if (!name.firstName().isEmpty()) {
+                names << name.firstName();
+            }
+            if (!name.middleName().isEmpty()) {
+                names << name.middleName();
+            }
+            if (!name.lastName().isEmpty()) {
+                names << name.lastName();
+            }
+            if (!name.suffix().isEmpty()) {
+                names << name.suffix();
+            }
+
+            fallbackLabel = names.join(" ").trimmed();
         }
     }
 

=== modified file 'tests/unittest/qcontacts-test.cpp'
--- tests/unittest/qcontacts-test.cpp	2015-10-27 15:15:33 +0000
+++ tests/unittest/qcontacts-test.cpp	2016-05-04 21:28:44 +0000
@@ -366,8 +366,8 @@
         QList<QContact> contacts = m_manager->contacts(ids);
 
         QCOMPARE(contacts[0].details<QContactTag>().size(), 1);
-        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("Fulano Tal"));
-        QCOMPARE(contacts[0].detail<QContactTag>().tag(), QStringLiteral("FULANO TAL"));
+        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("Fulano de Tal"));
+        QCOMPARE(contacts[0].detail<QContactTag>().tag(), QStringLiteral("FULANO DE TAL"));
 
         // Change contact name
         name = contact.detail<QContactName>();
@@ -377,8 +377,8 @@
 
         contacts = m_manager->contacts(ids);
         QCOMPARE(contacts[0].details<QContactTag>().size(), 1);
-        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("xFulano Tal"));
-        QCOMPARE(contacts[0].detail<QContactTag>().tag(), QStringLiteral("XFULANO TAL"));
+        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("xFulano de Tal"));
+        QCOMPARE(contacts[0].detail<QContactTag>().tag(), QStringLiteral("XFULANO DE TAL"));
     }
 
     void testContactChangeOrder()
@@ -427,10 +427,10 @@
         QContactFilter filter;
         QList<QContact> contacts = m_manager->contacts(filter);
 
-        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("A Tal"));
-        QCOMPARE(contacts[1].detail<QContactDisplayLabel>().label(), QStringLiteral("B Tal"));
-        QCOMPARE(contacts[2].detail<QContactDisplayLabel>().label(), QStringLiteral("C Tal"));
-        QCOMPARE(contacts[3].detail<QContactDisplayLabel>().label(), QStringLiteral("D Tal"));
+        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("A de Tal"));
+        QCOMPARE(contacts[1].detail<QContactDisplayLabel>().label(), QStringLiteral("B de Tal"));
+        QCOMPARE(contacts[2].detail<QContactDisplayLabel>().label(), QStringLiteral("C de Tal"));
+        QCOMPARE(contacts[3].detail<QContactDisplayLabel>().label(), QStringLiteral("D de Tal"));
 
         // Update contact B name
         contactB = contacts[1];
@@ -443,10 +443,10 @@
         contacts = m_manager->contacts(filter);
 
         // check new order
-        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("A Tal"));
-        QCOMPARE(contacts[1].detail<QContactDisplayLabel>().label(), QStringLiteral("C Tal"));
-        QCOMPARE(contacts[2].detail<QContactDisplayLabel>().label(), QStringLiteral("D Tal"));
-        QCOMPARE(contacts[3].detail<QContactDisplayLabel>().label(), QStringLiteral("X Tal"));
+        QCOMPARE(contacts[0].detail<QContactDisplayLabel>().label(), QStringLiteral("A de Tal"));
+        QCOMPARE(contacts[1].detail<QContactDisplayLabel>().label(), QStringLiteral("C de Tal"));
+        QCOMPARE(contacts[2].detail<QContactDisplayLabel>().label(), QStringLiteral("D de Tal"));
+        QCOMPARE(contacts[3].detail<QContactDisplayLabel>().label(), QStringLiteral("X de Tal"));
     }
 
     /*