Merge lp:~rhuddie/address-book-app/add-photo-helper into lp:address-book-app

[Richard Huddie]

New helper method and test for adding a photo to a contact.

Requires content-hub-test-exporter from content-hub-testability to be installed: lp:~ken-vandine/content-hub/testability

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~rhuddie/address-book-app/add-photo-helper/+merge/227519/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/address-book-app-ci/619/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/72
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2220/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1851/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2430/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3401
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10121
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1555/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2070
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2070/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

This looks good, and we are likely going to need it next week to automate adding a picture from the camera.
Richard, can you please push it to the team branch, so somebody else can take over it and update it?

review: Needs Fixing

[lp:~rhuddie/address-book-app/add-photo-helper]

230. By Richard Huddie on 2015-02-24

merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~rhuddie/address-book-app/add-photo-helper/+merge/227519/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/address-book-app-ci/772/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/75
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1688
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/701/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1686
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18637
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/559/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/819
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/819/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

230. By Richard Huddie on 2015-02-24

merge from trunk

229. By Richard Huddie on 2014-07-21

fix flake8

228. By Richard Huddie on 2014-07-21

test now working

227. By Richard Huddie on 2014-07-16

add content-hub-testability dependency

226. By Richard Huddie on 2014-07-16

add expected path validation

225. By Richard Huddie on 2014-07-16

move url conversion to contact editor

224. By Richard Huddie on 2014-07-16

merge trunk

223. By Richard Huddie on 2014-07-16

test updates and add def get_contact_avatar_file_path(self):

222. By Richard Huddie on 2014-07-08

add get_contact_avatar_file_path() to ContactListPage helper

221. By Richard Huddie on 2014-07-03

added fake url dispatcher

=== modified file 'debian/control'
--- debian/control	2015-02-09 15:02:11 +0000
+++ debian/control	2015-02-24 15:05:29 +0000
@@ -92,5 +92,6 @@
          ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),
          address-book-app (>= ${binary:Version}),
          ubuntu-mobile-icons,
+         content-hub-testability,
 Description: Test package for address-book-app
  Autopilot tests for the address-book-app package
 
=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-09-29 13:20:08 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2015-02-24 15:05:29 +0000
@@ -74,6 +74,7 @@
 
         Image {
             id: avatarImage
+            objectName: "avatarImage"
 
             fillMode: Image.PreserveAspectCrop
             asynchronous: true
 
=== modified file 'tests/autopilot/address_book_app/pages/_contact_editor.py'
--- tests/autopilot/address_book_app/pages/_contact_editor.py	2014-08-20 18:27:37 +0000
+++ tests/autopilot/address_book_app/pages/_contact_editor.py	2015-02-24 15:05:29 +0000
@@ -17,6 +17,8 @@
 import collections
 import logging
 import time
+import urllib.parse
+import urllib.request
 
 import autopilot.logging
 import ubuntuuitoolkit
@@ -61,12 +63,10 @@
 
     @autopilot.logging.log_action(logger.info)
     def add_field(self, detail_name):
-        """Create a new field into the edit contact form.
-
+        """
+        Create a new field into the edit contact form.
         :param detail_name: The detail field name
-
         """
-
         add_field_button = self.select_single(
             'ComboButtonAddField', objectName='addNewFieldButton')
         add_field_button.swipe_into_view()
@@ -150,6 +150,35 @@
             'QQuickFlickable', objectName='scrollArea')
         flickable.flicking.wait_for(False)
 
+    def _get_photo_icon(self):
+        """Return the photo icon QQuickImage object"""
+        photo_icon = self.select_single(
+            'QQuickImage', objectName='avatarImage')
+        return photo_icon
+
+    def press_photo_icon(self):
+        """Press the photo icon on the contact editor page"""
+        self.pointing_device.click_object(self._get_photo_icon())
+
+    def _convert_file_url_to_file_path(self, file_url):
+        """
+        Convert the specified file url to a file path
+
+        :param file_url: url encoded file path
+        :return: file path
+        """
+        path_decoded = urllib.request.url2pathname(file_url)
+        return urllib.parse.urlparse(path_decoded).path
+
+    def get_contact_avatar_file_path(self):
+        """
+        Get the avatar file path for contact
+        :return avatar file path:
+        """
+        avatar = self._get_photo_icon()
+        return self._convert_file_url_to_file_path(
+            avatar.get_properties()['source'])
+
 
 class TextInputDetail(ubuntuuitoolkit.TextField):
     """Custom proxy object for the Text Input Detail field."""
 
=== modified file 'tests/autopilot/address_book_app/pages/_contact_list_page.py'
--- tests/autopilot/address_book_app/pages/_contact_list_page.py	2015-02-19 07:02:09 +0000
+++ tests/autopilot/address_book_app/pages/_contact_list_page.py	2015-02-24 15:05:29 +0000
@@ -126,6 +126,17 @@
         ]
         return [label.text for label in name_labels]
 
+    def get_contact_avatar_file_path(self, display_name):
+        """
+        Get the avatar file path for contact
+        :param display_name: Display name of contact
+        :return avatar file path:
+        """
+        avatar = self.wait_select_single(
+            'ContactAvatar', displayName=display_name)
+        return self._convert_file_url_to_file_path(
+            avatar.get_properties()['avatarUrl'])
+
 
 class RemoveContactsDialog(
         ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2015-02-19 07:02:09 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2015-02-24 15:05:29 +0000
@@ -93,6 +93,28 @@
         if model() != "Desktop":
             subprocess.check_call(["/sbin/initctl", "start", "maliit-server"])
 
+    def _set_content_hub_default_picture_handler(self, app_identifier):
+        subprocess.check_call([
+            '/usr/bin/gsettings',
+            'set',
+            'com.ubuntu.content.hub.default',
+            'pictures',
+            app_identifier])
+
+    def _get_content_hub_default_picture_handler(self):
+        return subprocess.getoutput(
+            '/usr/bin/gsettings get com.ubuntu.content.hub.default pictures')
+
+    def configure_content_hub_test_picture_handler(self):
+        self.default_picture_handler = \
+            self._get_content_hub_default_picture_handler()
+        test_handler = '["content-hub-test-exporter", "", ""]'
+        self._set_content_hub_default_picture_handler(test_handler)
+
+    def restore_default_content_hub_test_picture_handler(self):
+        self._set_content_hub_default_picture_handler(
+            self.default_picture_handler)
+
     def launch_test_local(self):
         return self.launch_test_application(
             self.app_bin,
 
=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-06-17 17:58:07 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2015-02-24 15:05:29 +0000
@@ -7,7 +7,7 @@
 
 """Tests for the Addressbook App"""
 
-from testtools.matchers import Equals
+from testtools.matchers import Equals, NotEquals
 from autopilot.matchers import Eventually
 
 from address_book_app import data
@@ -19,6 +19,14 @@
 
     PHONE_NUMBERS = ['[phone]', '[phone]', '[phone]']
 
+    def setUp(self):
+        self.configure_content_hub_test_picture_handler()
+        super(TestEditContact, self).setUp()
+
+    def tearDown(self):
+        self.restore_default_content_hub_test_picture_handler()
+        super(TestEditContact, self).tearDown()
+
     def add_test_contact(self):
         test_contact = data.Contact('test', 'test')
         # TODO implement the filling of professional details.
@@ -61,7 +69,8 @@
         phone_label_1 = view_page.select_single(
             "Label",
             objectName="label_phoneNumber_1.0")
-        self.assertThat(phone_label_1.text, Eventually(Equals(self.PHONE_NUMBERS[1])))
+        self.assertThat(
+            phone_label_1.text, Eventually(Equals(self.PHONE_NUMBERS[1])))
 
     def test_remove_phone(self):
         contact_editor = self.app.main_window.go_to_add_contact()
@@ -97,7 +106,8 @@
         phone_label_1 = view_page.select_single(
             "Label",
             objectName="label_phoneNumber_0.0")
-        self.assertThat(phone_label_1.text, Eventually(Equals(self.PHONE_NUMBERS[1])))
+        self.assertThat(
+            phone_label_1.text, Eventually(Equals(self.PHONE_NUMBERS[1])))
 
     def test_add_email(self):
         self.add_contact("Fulano", "")
@@ -214,3 +224,16 @@
             "Label",
             objectName="type_onlineAccount_0")
         self.assertThat(im_type.text, Eventually(Equals("Aim")))
+
+    def test_add_photo(self):
+        """Test to add a photo to a contact using content-hub-test-exporter"""
+        # go to add a new contact
+        contact_editor = self.main_window.go_to_add_contact()
+        # get the default avatar file path
+        original_file_path = contact_editor.get_contact_avatar_file_path()
+        # this test uses content-hub-test-exporter to return a picture
+        # instead of launching the gallery-app
+        contact_editor.press_photo_icon()
+        # check that the avatar file path has now been updated
+        avatar_file_path = contact_editor.get_contact_avatar_file_path()
+        self.assertThat(avatar_file_path, NotEquals(original_file_path))