1
=== modified file 'src/photo/photo.cpp'
2
--- src/photo/photo.cpp	2013-06-17 12:57:21 +0000
3
+++ src/photo/photo.cpp	2013-06-24 11:17:26 +0000
4
@@ -802,7 +802,7 @@
5
802
    QImage enhanced_image(width, height, dest_format);
802
    QImage enhanced_image(width, height, dest_format);
6
803
803
7
804
    for (int j = 0; j < height; j++) {
804
    for (int j = 0; j < height; j++) {
9
805
        QApplication::processEvents();
805
        //QApplication::processEvents();
10
806
        for (int i = 0; i < width; i++) {
806
        for (int i = 0; i < width; i++) {
11
807
            QColor px = enhance_txn.transformPixel(
807
            QColor px = enhance_txn.transformPixel(
12
808
                        QColor(unenhanced_img.pixel(i, j)));
808
                        QColor(unenhanced_img.pixel(i, j)));
13
809
809
14
=== modified file 'tests/autopilot/gallery_app/emulators/photo_viewer.py'
15
--- tests/autopilot/gallery_app/emulators/photo_viewer.py	2013-06-18 13:22:53 +0000
16
+++ tests/autopilot/gallery_app/emulators/photo_viewer.py	2013-06-24 11:17:26 +0000
17
@@ -70,6 +70,10 @@
18
70
        """Returns the revert to original menu item in the edit dialog."""
70
        """Returns the revert to original menu item in the edit dialog."""
19
71
        return self.app.select_single("Standard", objectName="revertListItem")
71
        return self.app.select_single("Standard", objectName="revertListItem")
20
72
72
21
73
    def get_auto_enhance_menu_item(self):
22
74
        """Returns the 'auto enhance' menu item in the edit dialog."""
23
75
        return self.app.select_single("Standard", objectName='enhanceListItem')
24
76
25
73
    def get_delete_popover_delete_item(self):
77
    def get_delete_popover_delete_item(self):
26
74
        """Returns the delete button of the delete popover."""
78
        """Returns the delete button of the delete popover."""
27
75
        return self.app.select_single("Button",
79
        return self.app.select_single("Button",
28
76
80
29
=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
30
--- tests/autopilot/gallery_app/tests/__init__.py	2013-06-18 07:56:00 +0000
31
+++ tests/autopilot/gallery_app/tests/__init__.py	2013-06-24 11:17:26 +0000
32
@@ -162,7 +162,7 @@
33
162
162
34
163
            self.pointing_device.drag(tx, ty, tx / 8, ty)
163
            self.pointing_device.drag(tx, ty, tx / 8, ty)
35
164
        else:
164
        else:
37
165
            self.click_item(tabs_bar)
165
            self.click_item(tabs_bar, delay=0.5)
38
166
166
39
167
        albums_tab_button = self.gallery_utils.get_albums_tab_button()
167
        albums_tab_button = self.gallery_utils.get_albums_tab_button()
40
168
        # Due to some timing issues sometimes mouse moves to the location a bit
168
        # Due to some timing issues sometimes mouse moves to the location a bit
41
169
169
42
=== modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
43
--- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2013-06-19 15:47:39 +0000
44
+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2013-06-24 11:17:26 +0000
45
@@ -62,6 +62,7 @@
46
62
    def test_photo_delete_works(self):
62
    def test_photo_delete_works(self):
47
63
        """Clicking the trash button must show the delete dialog."""
63
        """Clicking the trash button must show the delete dialog."""
48
64
        trash_button = self.photo_viewer.get_toolbar_delete_button()
64
        trash_button = self.photo_viewer.get_toolbar_delete_button()
49
65
        photo_viewer = self.photo_viewer.get_main_photo_viewer()
50
65
66
51
66
        self.pointing_device.move_to_object(trash_button)
67
        self.pointing_device.move_to_object(trash_button)
52
67
        self.pointing_device.click()
68
        self.pointing_device.click()
53
@@ -89,6 +90,17 @@
54
89
        self.assertThat(lambda: exists(self.sample_file),
90
        self.assertThat(lambda: exists(self.sample_file),
55
90
                        Eventually(Equals(False)))
91
                        Eventually(Equals(False)))
56
91
92
57
93
        self.reveal_toolbar()
58
94
        self.pointing_device.click_object(trash_button)
59
95
60
96
        delete_dialog = self.photo_viewer.get_delete_dialog()
61
97
        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
62
98
63
99
        delete_item = self.photo_viewer.get_delete_popover_delete_item()
64
100
        self.click_item(delete_item)
65
101
66
102
        self.assertThat(photo_viewer.visible, Eventually(Equals(False)))
67
103
68
92
    # def test_nav_bar_album_picker_button(self):
104
    # def test_nav_bar_album_picker_button(self):
69
93
    #     """Clicking the album picker must show the picker dialog."""
105
    #     """Clicking the album picker must show the picker dialog."""
70
94
    #     album_button = self.photo_viewer.get_toolbar_album_button()
106
    #     album_button = self.photo_viewer.get_toolbar_album_button()
71
@@ -165,6 +177,10 @@
72
165
        revert_item = self.photo_viewer.get_revert_menu_item()
177
        revert_item = self.photo_viewer.get_revert_menu_item()
73
166
        self.click_item(revert_item)
178
        self.click_item(revert_item)
74
167
179
75
180
    def click_enhance_item(self):
76
181
        enhance_item = self.photo_viewer.get_auto_enhance_menu_item()
77
182
        self.click_item(enhance_item)
78
183
79
168
    def test_photo_editor_crop(self):
184
    def test_photo_editor_crop(self):
80
169
        """Cropping a photo must crop it."""
185
        """Cropping a photo must crop it."""
81
170
        old_file_size = os.path.getsize(self.sample_file)
186
        old_file_size = os.path.getsize(self.sample_file)
82
@@ -176,6 +192,7 @@
83
176
        self.click_crop_item()
192
        self.click_crop_item()
84
177
193
85
178
        self.assertThat(crop_box.state, Eventually(Equals("shown")))
194
        self.assertThat(crop_box.state, Eventually(Equals("shown")))
86
195
        self.assertThat(crop_box.opacity, Eventually(Equals(1)))
87
179
196
88
180
        crop_corner = self.photo_viewer.get_top_left_crop_corner()
197
        crop_corner = self.photo_viewer.get_top_left_crop_corner()
89
181
        x, y, h, w = crop_corner.globalRect
198
        x, y, h, w = crop_corner.globalRect
90
@@ -254,7 +271,7 @@
91
254
        # implemented properly
271
        # implemented properly
92
255
        sleep(1)
272
        sleep(1)
93
256
273
95
257
    def test_photo_editor_redo_undo_revert_to_original_states(self):
274
    def test_photo_editor_redo_undo_revert_enhance_states(self):
96
258
        undo_item = self.photo_viewer.get_undo_menu_item()
275
        undo_item = self.photo_viewer.get_undo_menu_item()
97
259
        redo_item = self.photo_viewer.get_redo_menu_item()
276
        redo_item = self.photo_viewer.get_redo_menu_item()
98
260
        revert_item = self.photo_viewer.get_revert_menu_item()
277
        revert_item = self.photo_viewer.get_revert_menu_item()
99
@@ -310,3 +327,11 @@
100
310
        self.assertThat(undo_item.enabled, Eventually(Equals(True)))
327
        self.assertThat(undo_item.enabled, Eventually(Equals(True)))
101
311
        self.assertThat(redo_item.enabled, Eventually(Equals(False)))
328
        self.assertThat(redo_item.enabled, Eventually(Equals(False)))
102
312
        self.assertThat(revert_item.enabled, Eventually(Equals(False)))
329
        self.assertThat(revert_item.enabled, Eventually(Equals(False)))
103
330
104
331
        self.click_enhance_item()
105
332
106
333
        self.reveal_toolbar()
107
334
        self.click_edit_button()
108
335
109
336
        revert_item = self.photo_viewer.get_revert_menu_item()
110
337
        self.assertThat(lambda: revert_item.enabled, Eventually(Equals(True)))
Status:	Merged
Approved by:	Omer Akram on 2013-06-24
Approved revision:	735
Merged at revision:	746
Proposed branch:	lp:~om26er/gallery-app/add_test_for_auto_enhance
Merge into:	lp:gallery-app
Diff against target:	110 lines (+32/-3) 4 files modified src/photo/photo.cpp (+1/-1) tests/autopilot/gallery_app/emulators/photo_viewer.py (+4/-0) tests/autopilot/gallery_app/tests/__init__.py (+1/-1) tests/autopilot/gallery_app/tests/test_photo_viewer.py (+26/-1)
To merge this branch:	bzr merge lp:~om26er/gallery-app/add_test_for_auto_enhance
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-06-24
Günter Schwann (community)		2013-06-18	Approve on 2013-06-18
Review via email: mp+170054@code.launchpad.net