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

[Renato Araujo Oliveira Filho]

Make sure that the contact list enter in single selection mode when requested by content hub.

Make sure that the contact list enter in single selection mode when requested by content hub.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:453
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/840/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/143
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3346/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2794/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3344
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3344/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21605

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:453
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/841/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3348/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21611

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

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

[Ken VanDine (ken-vandine)]

Code looks good and I confirmed that single select is chosen when it should

review: Approve

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2015-04-28 16:29:44 +0000
+++ src/imports/MainWindow.qml	2015-07-01 17:53:42 +0000
@@ -61,14 +61,14 @@
     function pick(single)
     {
         console.debug("Pick mode:" + single)
-        pickWithTransfer(single, null)
+        pickWithTransfer(single === "true", null)
     }
 
     function pickWithTransfer(single, activeTransfer)
     {
         mainStack.resetStack()
         if (mainStack.contactListPage) {
-            mainStack.contactListPage.startPickMode(single === "true", activeTransfer)
+            mainStack.contactListPage.startPickMode(single, activeTransfer)
         } else {
             console.error("Pick mode requested but ContactListPage not loaded")
         }

=== modified file 'tests/qml/tst_ContactList.qml'
--- tests/qml/tst_ContactList.qml	2015-04-29 14:22:40 +0000
+++ tests/qml/tst_ContactList.qml	2015-07-01 17:53:42 +0000
@@ -99,5 +99,35 @@
         {
             tryCompare(root.contactListPageObj, "contactManager", "memory")
         }
+
+        function test_pickMode()
+        {
+            var listView = findChild(root.contactListPageObj, "contactListView")
+            // check initial state
+            compare(root.contactListPageObj.pickMode, false)
+            compare(root.contactListPageObj.pickMultipleContacts, false)
+
+            // by default the list accepts multi-selection but the selection mode is disabled
+            compare(listView.multipleSelection, true)
+            compare(listView.isInSelectionMode, false)
+
+            // start multi-selection pick mode
+            root.contactListPageObj.startPickMode(false /*isSingle*/, null)
+
+            // check multi-selection mode
+            compare(root.contactListPageObj.pickMode, true)
+            compare(root.contactListPageObj.pickMultipleContacts, true)
+            compare(listView.multipleSelection, true)
+            compare(listView.isInSelectionMode, true)
+
+            // start single-selection pick mode
+            root.contactListPageObj.startPickMode(true /*isSingle*/, null)
+
+            // check single-selection mode
+            compare(root.contactListPageObj.pickMode, true)
+            compare(root.contactListPageObj.pickMultipleContacts, false)
+            compare(listView.multipleSelection, false)
+            compare(listView.isInSelectionMode, true)
+        }
     }
 }