1
=== modified file 'tests/autopilot/gallery_app/emulators/media_selector.py'
2
--- tests/autopilot/gallery_app/emulators/media_selector.py	2016-02-12 21:53:45 +0000
3
+++ tests/autopilot/gallery_app/emulators/media_selector.py	2016-08-18 04:09:35 +0000
4
@@ -21,17 +21,11 @@
5
21
    def get_second_photo(self):
21
    def get_second_photo(self):
6
22
        """Return the second photo item"""
22
        """Return the second photo item"""
7
23
        selector = self.get_media_selector()
23
        selector = self.get_media_selector()
8
24
9
25
        # get the first row in the selector
24
        # get the first row in the selector
16
26
        mediaRow = selector.wait_select_single(objectName="mediaSelectorList0")
25
        events = self.app.select_many('OrganicMediaList')
17
27
26
        photos = events[0].select_many( 'QQuickItem', objectName='eventPhoto')
12
28
        # get the loader for the second item
13
29
        thumbnailLoader = mediaRow.wait_select_single(
14
30
            objectName="thumbnailLoader1")
15
31
18
32
        # return the item itself
27
        # return the item itself
21
33
        return thumbnailLoader.wait_select_single(objectName="eventPhoto",
28
        return photos[0]
20
34
                                                  thumbnailLoaded=True)
22
35
29
23
36
    def ensure_fully_open(self):
30
    def ensure_fully_open(self):
24
37
        """Ensure media selector is fully open"""
31
        """Ensure media selector is fully open"""
25
38
32
26
=== modified file 'tests/autopilot/gallery_app/tests/test_events_view.py'
27
--- tests/autopilot/gallery_app/tests/test_events_view.py	2016-03-07 20:20:03 +0000
28
+++ tests/autopilot/gallery_app/tests/test_events_view.py	2016-08-18 04:09:35 +0000
29
@@ -130,8 +130,8 @@
30
130
        self.assertThat(lambda: exists(self.sample_jpg_files[3]),
130
        self.assertThat(lambda: exists(self.sample_jpg_files[3]),
31
131
                        Eventually(Equals(True)))
131
                        Eventually(Equals(True)))
32
132
        self.enable_select_mode()
132
        self.enable_select_mode()
35
133
        self.events_view.select_photo(self.sample_jpg_files[2])
133
        self.events_view.select_photo(self.sample_jpg_files[2], 1)
36
134
        self.events_view.select_photo(self.sample_jpg_files[3])
134
        self.events_view.select_photo(self.sample_jpg_files[3], 0)
37
135
        self.main_view.get_header().click_action_button("shareButton")
135
        self.main_view.get_header().click_action_button("shareButton")
38
136
        share_picker = self.events_view.get_share_peer_picker()
136
        share_picker = self.events_view.get_share_peer_picker()
39
137
        self.assertThat(share_picker.visible, Eventually(Equals(True)))
137
        self.assertThat(share_picker.visible, Eventually(Equals(True)))
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-08-18
Ubuntu Phablet Team		2016-08-18	Pending
Review via email: mp+303213@code.launchpad.net
1	=== modified file 'tests/autopilot/gallery_app/emulators/media_selector.py'
2	--- tests/autopilot/gallery_app/emulators/media_selector.py 2016-02-12 21:53:45 +0000
3	+++ tests/autopilot/gallery_app/emulators/media_selector.py 2016-08-18 04:09:35 +0000
4	@@ -21,17 +21,11 @@
5	21	def get_second_photo(self):	21	def get_second_photo(self):
6	22	"""Return the second photo item"""	22	"""Return the second photo item"""
7	23	selector = self.get_media_selector()	23	selector = self.get_media_selector()
8	24
9	25	# get the first row in the selector	24	# get the first row in the selector
16	26	mediaRow = selector.wait_select_single(objectName="mediaSelectorList0")	25	events = self.app.select_many('OrganicMediaList')
17	27		26	photos = events[0].select_many( 'QQuickItem', objectName='eventPhoto')
12	28	# get the loader for the second item
13	29	thumbnailLoader = mediaRow.wait_select_single(
14	30	objectName="thumbnailLoader1")
15	31
18	32	# return the item itself	27	# return the item itself
21	33	return thumbnailLoader.wait_select_single(objectName="eventPhoto",	28	return photos[0]
20	34	thumbnailLoaded=True)
22	35		29
23	36	def ensure_fully_open(self):	30	def ensure_fully_open(self):
24	37	"""Ensure media selector is fully open"""	31	"""Ensure media selector is fully open"""
25	38		32
26	=== modified file 'tests/autopilot/gallery_app/tests/test_events_view.py'
27	--- tests/autopilot/gallery_app/tests/test_events_view.py 2016-03-07 20:20:03 +0000
28	+++ tests/autopilot/gallery_app/tests/test_events_view.py 2016-08-18 04:09:35 +0000
29	@@ -130,8 +130,8 @@
30	130	self.assertThat(lambda: exists(self.sample_jpg_files[3]),	130	self.assertThat(lambda: exists(self.sample_jpg_files[3]),
31	131	Eventually(Equals(True)))	131	Eventually(Equals(True)))
32	132	self.enable_select_mode()	132	self.enable_select_mode()
35	133	self.events_view.select_photo(self.sample_jpg_files[2])	133	self.events_view.select_photo(self.sample_jpg_files[2], 1)
36	134	self.events_view.select_photo(self.sample_jpg_files[3])	134	self.events_view.select_photo(self.sample_jpg_files[3], 0)
37	135	self.main_view.get_header().click_action_button("shareButton")	135	self.main_view.get_header().click_action_button("shareButton")
38	136	share_picker = self.events_view.get_share_peer_picker()	136	share_picker = self.events_view.get_share_peer_picker()
39	137	self.assertThat(share_picker.visible, Eventually(Equals(True)))	137	self.assertThat(share_picker.visible, Eventually(Equals(True)))