← Back to branch summary

~phablet-team/gallery-app/trunk

« back to all changes in this revision

Viewing changes to tests/autopilot/gallery_app/tests/test_album_editor.py

fix tests on desktop, 
fix flaky test, 
pep8 fixes,
refactor test to make failures easier to diagnose. 

[barry]
  py3 port Fixes: 1304950

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/autopilot/gallery_app/tests/test_album_editor.py
8
8
 
9
9
"""Tests the album editor of the gallery app"""
10
10
 
11
 
from __future__ import absolute_import
12
 
 
13
11
from testtools.matchers import Equals
14
12
from autopilot.matchers import Eventually
15
13
 
47
45
        editor = self.app.select_single(album_editor.AlbumEditorAnimated)
48
46
        editor.ensure_fully_open()
49
47
 
50
 
    def ensure_media_selector_is_fully_open(self):
51
 
        media_selector = self.media_selector.get_media_selector()
52
 
        self.assertThat(media_selector.opacity, Eventually(Equals(1.0)))
53
 
 
54
 
    def ensure_album_viewer_is_fully_closed(self):
55
 
        animated_viewer = self.album_view.get_animated_album_view()
56
 
        self.assertThat(animated_viewer.isOpen, Eventually(Equals(False)))
57
 
        self.assertThat(animated_viewer.animationRunning,
58
 
                        Eventually(Equals(False)))
59
 
 
60
48
    def test_album_title_fields(self):
61
49
        """tests the title and sub title"""
62
50
        editor = self.app.select_single(album_editor.AlbumEditorAnimated)
95
83
        # workaround lp:1247698
96
84
        self.main_view.close_toolbar()
97
85
        editor.add_photos()
98
 
        self.ensure_media_selector_is_fully_open()
 
86
        self.media_selector.ensure_fully_open()
99
87
 
100
88
        self.main_view.get_toolbar().click_custom_button("cancelButton")
101
89
        editor.ensure_fully_closed()
105
93
        num_photos_start = self.album_view.number_of_photos()
106
94
        self.assertThat(num_photos_start, Equals(1))
107
95
        self.main_view.open_toolbar().click_button("backButton")
108
 
        self.ensure_album_viewer_is_fully_closed()
 
96
        self.album_view.ensure_animated_fully_closed()
109
97
 
110
98
        # now open to add a photo
111
99
        self.main_view.close_toolbar()
114
102
        # workaround lp:1247698
115
103
        self.main_view.close_toolbar()
116
104
        editor.add_photos()
117
 
        self.ensure_media_selector_is_fully_open()
 
105
        self.media_selector.ensure_fully_open()
118
106
 
119
107
        photo = self.media_selector.get_second_photo()
120
108
        self.click_item(photo)
146
134
        green_item = self.gallery_utils.get_cover_menu_item("Green")
147
135
        self.click_item(green_item)
148
136
 
149
 
        self.assertThat(lambda:
150
 
            cover_image.source.endswith("album-cover-green-large.png"),
151
 
            Eventually(Equals(True)))
 
137
        self.assertThat(lambda: cover_image.source.endswith(
 
138
            "album-cover-green-large.png"), Eventually(Equals(True)))