1
=== modified file 'tests/autopilot/gallery_app/emulators/picker_screen.py'
2
--- tests/autopilot/gallery_app/emulators/picker_screen.py	2013-08-19 13:58:55 +0000
3
+++ tests/autopilot/gallery_app/emulators/picker_screen.py	2014-04-09 10:34:08 +0000
4
@@ -32,3 +32,16 @@
5
32
        grid_view = self.grid_view()
32
        grid_view = self.grid_view()
6
33
        return grid_view.select_many("OrganicItemInteraction")[0]
33
        return grid_view.select_many("OrganicItemInteraction")[0]
7
34
34
8
35
    def _get_named_photo_element(self, photo_name):
9
36
        """
10
37
        Return the ShapeItem container object for the named photo.
11
38
        This object can be clicked to enable the photo to be selected.
12
39
        """
13
40
        photo_element = self.grid_view().wait_select_single('QQuickImage',
14
41
                                                       source=photo_name)
15
42
        return photo_element.get_parent()
16
43
17
44
    def select_named_photo(self, photo_name):
18
45
        """Select the named photo from the picker view."""
19
46
        photo_element = self._get_named_photo_element(photo_name)
20
47
        self.pointing_device.click_object(photo_element)
21
35
48
22
=== modified file 'tests/autopilot/gallery_app/tests/test_picker_mode.py'
23
--- tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-04-08 16:47:21 +0000
24
+++ tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-04-09 10:34:08 +0000
25
@@ -55,6 +55,20 @@
26
55
        self.assertThat(pick_button.enabled, Eventually(Equals(False)))
55
        self.assertThat(pick_button.enabled, Eventually(Equals(False)))
27
56
        self.assertThat(first_events_media.isSelected, Eventually(Equals(False)))
56
        self.assertThat(first_events_media.isSelected, Eventually(Equals(False)))
28
57
57
29
58
    def test_pick_named_photo(self):
30
59
        """Select a named photo and press Pick button."""
31
60
        self.picker_view.switch_to_tab('photosTab')
32
61
        pick_button = self.picker_view.pick_button()
33
62
        self.assertFalse(pick_button.enabled)
34
63
35
64
        # create the image location path based on sample location
36
65
        image_path = 'image://thumbnailer/{}/sample02.jpg'.format(
37
66
            self.sample_destination_dir)
38
67
        self.picker_view.select_named_photo(image_path)
39
68
40
69
        self.assertTrue(pick_button.enabled)
41
70
        self.click_item(pick_button)
42
71
43
58
    @unittest.skip("Temporarily disable as it fails in some cases, supposedly due to problems with the infrastructure")
72
    @unittest.skip("Temporarily disable as it fails in some cases, supposedly due to problems with the infrastructure")
44
59
    def test_selection_synchronisation(self):
73
    def test_selection_synchronisation(self):
45
60
        """Checks if the selection is the same for both views"""
74
        """Checks if the selection is the same for both views"""
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