gallery-app

Merge lp:~rhuddie/gallery-app/photo_selector into lp:gallery-app

photo_selector
Merge into trunk

Proposed by Richard Huddie on 2014-02-28

Status:	Merged
Merged at revision:	958
Proposed branch:	lp:~rhuddie/gallery-app/photo_selector
Merge into:	lp:gallery-app
Diff against target:	45 lines (+27/-0) 2 files modified tests/autopilot/gallery_app/emulators/picker_screen.py (+13/-0) tests/autopilot/gallery_app/tests/test_picker_mode.py (+14/-0)
To merge this branch:	bzr merge lp:~rhuddie/gallery-app/photo_selector
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-03-04	Approve on 2014-04-21
Arthur Mello (community)		2014-04-08	Approve on 2014-04-09
Leo Arias (community)	code review	2014-02-28	Approve on 2014-04-01
Víctor R. Ruiz		2014-02-28	Pending
Javier Collado		2014-02-28	Pending
Review via email: mp+208761@code.launchpad.net

Commit message

A new emulator method for selecting a specific photo from the picker view. A new test is also added to use this method and then click on the Pick button.

Description of the change

A new emulator method for selecting a specific photo from the picker view. A new test is also added to use this method and then click on the Pick button.

Revision history for this message

Leo Arias (elopio) wrote on 2014-03-06:

Please:
- change the double quotes on strings to single quotes.
- change "Returns" to "Return", and finish your sentences with a period as per pep257.
- add information about the return type on get_named_photo

And I've seen one more detail that will help hiding the implementation details a little, which might be usefule in case of an implementation detail.

Make get_named_photo private, naming it something like _get_named_photo_element()

And make a new public method

def select_photo(self, name):
   photo_element = self.picker_view.get_named_photo(
      'image://gallery-thumbnail//tmp/gallery-ap_sd/new_user.png')
   self.pointing_device.click_object(photo)

review: Needs Fixing (code review)

lp:~rhuddie/gallery-app/photo_selector updated on 2014-03-07

922. By Richard Huddie on 2014-03-07: fix review comments

Revision history for this message

Leo Arias (elopio) on 2014-04-01:

review: Approve (code review)

lp:~rhuddie/gallery-app/photo_selector updated on 2014-04-02

923. By Richard Huddie on 2014-04-02: merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/763/rebuild

review: Needs Fixing (continuous-integration)

lp:~rhuddie/gallery-app/photo_selector updated on 2014-04-07

924. By Richard Huddie on 2014-04-07: update image path to use thumbnailer

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/769/rebuild

review: Needs Fixing (continuous-integration)

lp:~rhuddie/gallery-app/photo_selector updated on 2014-04-07

925. By Richard Huddie on 2014-04-07: renamed test data file

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/770/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/775/rebuild

review: Needs Fixing (continuous-integration)

lp:~rhuddie/gallery-app/photo_selector updated on 2014-04-08

926. By Richard Huddie on 2014-04-08: changed test to use existing sample file

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/779/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/780/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/781/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/783/rebuild

review: Needs Fixing (continuous-integration)

lp:~rhuddie/gallery-app/photo_selector updated on 2014-04-09

927. By Richard Huddie on 2014-04-09: use wait_select_single for selecting QQuickImage item
928. By Richard Huddie on 2014-04-09: merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

FAILED: Continuous integration, rev:927
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/787/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/212/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/212/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4663/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4790/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/787/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/788/rebuild

review: Needs Fixing (continuous-integration)

lp:~rhuddie/gallery-app/photo_selector updated on 2014-04-09

929. By Richard Huddie on 2014-04-09: creat file path based on sample dir

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/789/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Arthur Mello (artmello) on 2014-04-09:

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/790/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Richard Huddie (rhuddie) wrote on 2014-04-14:

Are there any related MPs required for this MP to build/function as expected? Please list
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

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

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/gallery-app) on device or emulator?
Yes - mako

If you changed the UI, was the change specified/approved by design?
No UI changes. - Test code changes only

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
No packaging changes.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-21:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/802/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Richard Huddie

Ubuntu Phablet Team

 === modified file 'tests/autopilot/gallery_app/emulators/picker_screen.py'
 --- tests/autopilot/gallery_app/emulators/picker_screen.py	2013-08-19 13:58:55 +0000
 +++ tests/autopilot/gallery_app/emulators/picker_screen.py	2014-04-09 10:34:08 +0000
@@ -32,3 +32,16 @@
          grid_view = self.grid_view()
          return grid_view.select_many("OrganicItemInteraction")[0]
++    def _get_named_photo_element(self, photo_name):
++        """
++        Return the ShapeItem container object for the named photo.
++        This object can be clicked to enable the photo to be selected.
++        """
++        photo_element = self.grid_view().wait_select_single('QQuickImage',
++                                                       source=photo_name)
++        return photo_element.get_parent()
++
++    def select_named_photo(self, photo_name):
++        """Select the named photo from the picker view."""
++        photo_element = self._get_named_photo_element(photo_name)
++        self.pointing_device.click_object(photo_element)
 === modified file 'tests/autopilot/gallery_app/tests/test_picker_mode.py'
 --- tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-04-08 16:47:21 +0000
 +++ tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-04-09 10:34:08 +0000
@@ -55,6 +55,20 @@
          self.assertThat(pick_button.enabled, Eventually(Equals(False)))
          self.assertThat(first_events_media.isSelected, Eventually(Equals(False)))
++    def test_pick_named_photo(self):
++        """Select a named photo and press Pick button."""
++        self.picker_view.switch_to_tab('photosTab')
++        pick_button = self.picker_view.pick_button()
++        self.assertFalse(pick_button.enabled)
++
++        # create the image location path based on sample location
++        image_path = 'image://thumbnailer/{}/sample02.jpg'.format(
++            self.sample_destination_dir)
++        self.picker_view.select_named_photo(image_path)
++
++        self.assertTrue(pick_button.enabled)
++        self.click_item(pick_button)
++
      @unittest.skip("Temporarily disable as it fails in some cases, supposedly due to problems with the infrastructure")
      def test_selection_synchronisation(self):
          """Checks if the selection is the same for both views"""