1
=== modified file 'tests/autopilot/gallery_app/emulators/album_editor.py'
2
--- tests/autopilot/gallery_app/emulators/album_editor.py	2013-05-15 08:25:11 +0000
3
+++ tests/autopilot/gallery_app/emulators/album_editor.py	2013-05-27 11:31:30 +0000
4
@@ -52,5 +52,5 @@
5
52
52
6
53
    def get_cover_menu_item(self, idx):
53
    def get_cover_menu_item(self, idx):
7
54
        """Returns the item of the cover menu with index idx"""
54
        """Returns the item of the cover menu with index idx"""
9
55
        return self.app.select_many("Standard", 
55
        return self.app.select_many("Standard",
10
56
                                    objectName="albumCoverMenuItem")[idx]
56
                                    objectName="albumCoverMenuItem")[idx]
11
57
57
12
=== modified file 'tests/autopilot/gallery_app/emulators/album_view.py'
13
--- tests/autopilot/gallery_app/emulators/album_view.py	2013-05-23 11:22:48 +0000
14
+++ tests/autopilot/gallery_app/emulators/album_view.py	2013-05-27 11:31:30 +0000
15
@@ -29,8 +29,8 @@
16
29
29
17
30
    def get_first_photo(self):
30
    def get_first_photo(self):
18
31
        """Returns the first photo in a newly opened album"""
31
        """Returns the first photo in a newly opened album"""
21
32
        return self.app.select_many("FramePortrait",
32
        return self.app.select_many(
22
33
                                      visible=True, isLoaded=True)[0]
33
            "FramePortrait", visible=True, isLoaded=True)[0]
23
34
34
24
35
    def get_album_photo_view(self):
35
    def get_album_photo_view(self):
25
36
        """Returns the photo view of the album viewer"""
36
        """Returns the photo view of the album viewer"""
26
37
37
27
=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
28
--- tests/autopilot/gallery_app/tests/__init__.py	2013-05-23 11:22:48 +0000
29
+++ tests/autopilot/gallery_app/tests/__init__.py	2013-05-27 11:31:30 +0000
30
@@ -83,15 +83,18 @@
31
83
        sleep(1)
83
        sleep(1)
32
84
84
33
85
    def launch_test_local(self):
85
    def launch_test_local(self):
35
86
        self.app = self.launch_test_application(self.local_location,
86
        self.app = self.launch_test_application(
36
87
            self.local_location,
37
87
            self.sample_dir)
88
            self.sample_dir)
38
88
89
39
89
    def launch_test_installed(self):
90
    def launch_test_installed(self):
40
90
        if model() == 'Desktop':
91
        if model() == 'Desktop':
42
91
            self.app = self.launch_test_application("gallery-app",
92
            self.app = self.launch_test_application(
43
93
                "gallery-app",
44
92
                self.sample_dir)
94
                self.sample_dir)
45
93
        else:
95
        else:
47
94
            self.app = self.launch_test_application("gallery-app",
96
            self.app = self.launch_test_application(
48
97
                "gallery-app",
49
95
                "--desktop_file_hint=/usr/share/applications/gallery-app.desktop",
98
                "--desktop_file_hint=/usr/share/applications/gallery-app.desktop",
50
96
                self.sample_dir,
99
                self.sample_dir,
51
97
                app_type='qt')
100
                app_type='qt')
52
@@ -103,8 +106,8 @@
53
103
    def click_item(self, item, delay=0.1):
106
    def click_item(self, item, delay=0.1):
54
104
        """Does a mouse click on the passed item, and moved the mouse there
107
        """Does a mouse click on the passed item, and moved the mouse there
55
105
           before"""
108
           before"""
58
106
        #In jenkins test may fail because we don't wait before clicking the target
109
        # In jenkins test may fail because we don't wait before clicking the
59
107
        #so we add a little delay before click.
110
        # target so we add a little delay before click.
60
108
        if model() == 'Desktop' and delay <= 0.25:
111
        if model() == 'Desktop' and delay <= 0.25:
61
109
            delay = 0.25
112
            delay = 0.25
62
110
113
63
111
114
64
=== modified file 'tests/autopilot/gallery_app/tests/test_album_editor.py'
65
--- tests/autopilot/gallery_app/tests/test_album_editor.py	2013-05-23 11:22:48 +0000
66
+++ tests/autopilot/gallery_app/tests/test_album_editor.py	2013-05-27 11:31:30 +0000
67
@@ -150,16 +150,16 @@
68
150
    def test_cover_image(self):
150
    def test_cover_image(self):
69
151
        """Test to change the album cover image"""
151
        """Test to change the album cover image"""
70
152
        cover_image = self.album_editor.get_album_cover_image()
152
        cover_image = self.album_editor.get_album_cover_image()
73
153
        self.assertThat(cover_image.source.endswith("album-cover-default-large.png"),
153
        self.assertThat(
74
154
                        Equals(True))
154
            cover_image.source.endswith("album-cover-default-large.png"), Equals(True))
75
155
155
76
156
        # click somewhere rather at the bottom of the cover
156
        # click somewhere rather at the bottom of the cover
77
157
        x, y, w, h = cover_image.globalRect
157
        x, y, w, h = cover_image.globalRect
79
158
        self.pointing_device.move(x + int(w/2), y + h - int(h/10) )
158
        self.pointing_device.move(x + int(w / 2), y + h - int(h / 10))
80
159
        self.pointing_device.click()
159
        self.pointing_device.click()
81
160
160
82
161
        green_item = self.album_editor.get_cover_menu_item(2)
161
        green_item = self.album_editor.get_cover_menu_item(2)
83
162
        self.click_item(green_item)
162
        self.click_item(green_item)
84
163
163
87
164
        self.assertThat(cover_image.source.endswith("album-cover-green-large.png"),
164
        self.assertThat(
88
165
                        Equals(True))
165
            cover_image.source.endswith("album-cover-green-large.png"), Equals(True))
Status:	Superseded
Proposed branch:	lp:~om26er/gallery-app/reduce_pep8_complaints
Merge into:	lp:gallery-app
Diff against target:	88 lines (+16/-13) 4 files modified tests/autopilot/gallery_app/emulators/album_editor.py (+1/-1) tests/autopilot/gallery_app/emulators/album_view.py (+2/-2) tests/autopilot/gallery_app/tests/__init__.py (+8/-5) tests/autopilot/gallery_app/tests/test_album_editor.py (+5/-5)
To merge this branch:	bzr merge lp:~om26er/gallery-app/reduce_pep8_complaints
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-05-29
Omer Akram (community)			Approve on 2013-05-29
Günter Schwann (community)		2013-05-27	Approve on 2013-05-29
Review via email: mp+165854@code.launchpad.net