Merge lp:~renatofilho/address-book-app/fix-1421245 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Fixed search by non-latin names.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:452
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/839/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21549

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/839/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 CHANGE

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

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

[Michael Sheldon (michael-sheldon)]

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

 * Yes

Did CI run pass? If not, please explain why.

 * Yes (tested with both LTR and RTL non-latin languages)

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'src/imports/Ubuntu/Contacts/ContactListModel.qml'
--- src/imports/Ubuntu/Contacts/ContactListModel.qml	2015-05-07 17:27:16 +0000
+++ src/imports/Ubuntu/Contacts/ContactListModel.qml	2015-06-29 15:36:05 +0000
@@ -76,6 +76,7 @@
 
             filters: [
                 DetailFilter {
+                    id: nameFilter
                     detail: (root.manager === "galera" ? ContactDetail.ExtendedDetail : ContactDetail.DisplayLabel)
                     field: (root.manager === "galera" ? ExtendedDetail.Data : DisplayLabel.Label)
                     value: (root.manager === "galera" ? Contacts.normalized(contactTermFilter.value) : contactTermFilter.value)
@@ -84,12 +85,11 @@
             ]
 
             onValueChanged: {
-                var containsLetter = /^[a-zA-Z]/.test(value)
-
+                var containsLetter = Contacts.containsLetters(value)
                 if (containsLetter && (filters.length > 1)) {
-                    filters = [filters[0]]
+                    filters = [nameFilter]
                 } else if (!containsLetter) {
-                    filters = [filters[0], phoneNumberFilter]
+                    filters = [nameFilter, phoneNumberFilter]
                 }
             }
         },

=== modified file 'src/imports/Ubuntu/Contacts/contacts.cpp'
--- src/imports/Ubuntu/Contacts/contacts.cpp	2015-05-13 21:31:33 +0000
+++ src/imports/Ubuntu/Contacts/contacts.cpp	2015-06-29 15:36:05 +0000
@@ -88,6 +88,16 @@
     return imgThread->outputFile();
 }
 
+bool UbuntuContacts::containsLetters(const QString &value)
+{
+    foreach (const QChar &c, value) {
+        if (c.isLetter()) {
+            return true;
+        }
+    }
+    return false;
+}
+
 bool UbuntuContacts::removeFile(const QUrl &file)
 {
     return QFile::remove(file.toLocalFile());

=== modified file 'src/imports/Ubuntu/Contacts/contacts.h'
--- src/imports/Ubuntu/Contacts/contacts.h	2015-04-30 21:17:11 +0000
+++ src/imports/Ubuntu/Contacts/contacts.h	2015-06-29 15:36:05 +0000
@@ -34,6 +34,7 @@
     Q_INVOKABLE QString contactInitialsFromString(const QString &value);
     Q_INVOKABLE QString normalized(const QString &value);
     Q_INVOKABLE QUrl copyImage(QObject *contact, const QUrl &imageUrl);
+    Q_INVOKABLE bool containsLetters(const QString &value);
     Q_INVOKABLE bool removeFile(const QUrl &file);
 };
 

=== modified file 'tests/data/tst_ContactListModel_data.vcf'
--- tests/data/tst_ContactListModel_data.vcf	2014-12-15 13:39:54 +0000
+++ tests/data/tst_ContactListModel_data.vcf	2015-06-29 15:36:05 +0000
@@ -25,6 +25,41 @@
 N:Fulano;da;Silva1;;;
 FN:Fulano da Silva1
 X-QTPROJECT-FAVORITE:false;0
+TEL:[phone]
 TEL:555666
 CATEGORIES:F
 END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+UID:pas-id-5591505300000002
+NICKNAME:
+NOTE:
+FN:Дмитрий Ященко
+N:Ященко;Дмитрий;;;
+EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:0987654321
+REV:2015-06-29T14:04:03Z(2)
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+UID:pas-id-5591504300000001
+FN:Роман Щекин
+N:Щекин;Роман;;;
+EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:12345678
+REV:2015-06-29T14:03:47Z(0)
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+UID:pas-id-5591510B00000003
+FN:亚历山德拉
+N:;亚历山德拉;;;
+EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:5678
+REV:2015-06-29T14:07:07Z(4)
+END:VCARD
+BEGIN:VCARD
+VERSION:3.0
+UID:pas-id-5591511B00000004
+FN:阿娜丝塔西亚
+N:;阿娜丝塔西亚;;;
+EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:123890
+REV:2015-06-29T14:07:23Z(6)
+END:VCARD

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2015-05-14 21:23:43 +0000
+++ tests/qml/CMakeLists.txt	2015-06-29 15:36:05 +0000
@@ -29,6 +29,7 @@
     declare_qml_test("list_with_actions" tst_ListWithActions.qml)
     declare_qml_test("contact_preview_page" tst_ContactPreviewPage.qml)
     declare_qml_test("vcard_parser" tst_VCardParser.qml)
+    declare_qml_test("ubuntu_contact" tst_UbuntuContacts.qml)
 else()
     if (NOT QMLTESTRUNNER_BIN)
         message(WARNING "Qml tests disabled: qmltestrunner not found")
@@ -47,5 +48,6 @@
     tst_ListWithActions.qml
     tst_ContactPreviewPage.qml
     tst_VCardParser.qml
+    tst_UbuntuContacts.qml
 )
 add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})

=== modified file 'tests/qml/tst_ContactListModel.qml'
--- tests/qml/tst_ContactListModel.qml	2014-12-15 13:38:41 +0000
+++ tests/qml/tst_ContactListModel.qml	2015-06-29 15:36:05 +0000
@@ -61,7 +61,7 @@
 
         function test_contactImport()
         {
-            tryCompare(root.contactListModelObj, "contactCount", 3)
+            tryCompare(root.contactListModelObj, "contactCount", 7)
         }
 
         function test_searchByPhoneNumber()
@@ -74,6 +74,9 @@
 
             root.contactListModelObj.filterTerm = "6"
             tryCompare(root.contactListModelObj, "contactCount", 3)
+
+            root.contactListModelObj.filterTerm = "[phone]"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
         }
 
         function test_searchByContactName()
@@ -101,6 +104,21 @@
 
             root.contactListModelObj.filterTerm = "1"
             tryCompare(root.contactListModelObj, "contactCount", 3)
+
+            root.contactListModelObj.filterTerm = "Renato555"
+            tryCompare(root.contactListModelObj, "contactCount", 0)
+        }
+
+        function test_searchByNonLatinNames()
+        {
+            root.contactListModelObj.filterTerm = "Роман Щекин"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
+
+            root.contactListModelObj.filterTerm = "亚"
+            tryCompare(root.contactListModelObj, "contactCount", 2)
+
+            root.contactListModelObj.filterTerm = "阿娜丝塔西"
+            tryCompare(root.contactListModelObj, "contactCount", 1)
         }
     }
 }

=== added file 'tests/qml/tst_UbuntuContacts.qml'
--- tests/qml/tst_UbuntuContacts.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_UbuntuContacts.qml	2015-06-29 15:36:05 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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/>.
+ */
+
+import QtQuick 2.2
+import QtTest 1.0
+import Ubuntu.Contacts 0.1
+
+Item {
+    id: root
+
+    TestCase {
+        id: uContactsTest
+        name: 'UBuntuContactTestCase'
+
+        function test_normalize_string()
+        {
+            compare(Contacts.normalized("não"), "nao")
+            compare(Contacts.normalized("josé"), "jose")
+            compare(Contacts.normalized("açaí"), "acai")
+            compare(Contacts.normalized("Роман Щекин"), "Роман Щекин")
+            compare(Contacts.normalized("阿娜丝塔西"), "阿娜丝塔西")
+        }
+
+        function test_containsLetters()
+        {
+            compare(Contacts.containsLetters("123456"), false)
+            compare(Contacts.containsLetters("(123)"), false)
+            compare(Contacts.containsLetters("Щекин"), true)
+            compare(Contacts.containsLetters("阿娜丝塔西"), true)
+            compare(Contacts.containsLetters("阿娜23西"), true)
+        }
+    }
+}