1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-12-16 21:49:56 +0000
3
+++ CMakeLists.txt	2014-02-13 20:52:22 +0000
4
@@ -56,20 +56,22 @@
5
56
set(DESKTOP_FILE ${GALLERY}.desktop)
56
set(DESKTOP_FILE ${GALLERY}.desktop)
6
57
57
7
58
if(CLICK_MODE)
58
if(CLICK_MODE)
8
59
    if(NOT DEFINED BZR_SOURCE)
9
60
        set(BZR_SOURCE "lp:gallery-app")
10
61
    endif(NOT DEFINED BZR_SOURCE)
11
59
    set(APP_PACKAGE_NAME "com.ubuntu.gallery")
62
    set(APP_PACKAGE_NAME "com.ubuntu.gallery")
12
60
    set(CMAKE_INSTALL_PREFIX /)
63
    set(CMAKE_INSTALL_PREFIX /)
13
61
    set(CMAKE_INSTALL_BINDIR /)
64
    set(CMAKE_INSTALL_BINDIR /)
14
62
    set(GALLERY_DIR "")
65
    set(GALLERY_DIR "")
15
63
    set(CLICK_TAG click)
66
    set(CLICK_TAG click)
16
67
	set (GETTEXT_PACKAGE "${APP_PACKAGE_NAME}")
17
64
else(CLICK_MODE)
68
else(CLICK_MODE)
18
65
    set(GALLERY_DIR ${CMAKE_INSTALL_DATADIR}/${GALLERY})
69
    set(GALLERY_DIR ${CMAKE_INSTALL_DATADIR}/${GALLERY})
19
70
	# for dh_translations to extract the domain
20
71
	# (regarding syntax consistency, see http://pad.lv/1181187)
21
72
	set (GETTEXT_PACKAGE "${GALLERY}")
22
66
endif(CLICK_MODE)
73
endif(CLICK_MODE)
23
67
74
24
68
25
69
# for dh_translations to extract the domain
26
70
# (regarding syntax consistency, see http://pad.lv/1181187)
27
71
set (GETTEXT_PACKAGE "${GALLERY}")
28
72
29
73
file(GLOB_RECURSE I18N_SRC_FILES
75
file(GLOB_RECURSE I18N_SRC_FILES
30
74
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
76
     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
31
75
     rc/**.qml desktop/**.desktop.in)
77
     rc/**.qml desktop/**.desktop.in)
32
76
78
33
=== added file 'click-build.sh'
34
--- click-build.sh	1970-01-01 00:00:00 +0000
35
+++ click-build.sh	2014-02-13 20:52:22 +0000
36
@@ -0,0 +1,16 @@
37
1
#!/bin/sh
38
2
39
3
export LC_ALL=C
40
4
41
5
BZR_SOURCE=${1:-lp:gallery-app}
42
6
43
7
CLICKARCH=armhf
44
8
rm -rf $CLICKARCH-build
45
9
mkdir $CLICKARCH-build
46
10
cd $CLICKARCH-build
47
11
cmake .. -DINSTALL_TESTS=off -DCLICK_MODE=on \
48
12
	-DBZR_REVNO=$(cd ..; bzr revno) \
49
13
	-DBZR_SOURCE="$BZR_SOURCE"
50
14
make DESTDIR=../package install
51
15
cd ..
52
16
click build package
53
0
17
54
=== modified file 'click/CMakeLists.txt'
55
--- click/CMakeLists.txt	2013-10-06 23:41:40 +0000
56
+++ click/CMakeLists.txt	2014-02-13 20:52:22 +0000
57
@@ -5,6 +5,6 @@
58
5
    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
5
    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
59
6
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
6
    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
60
7
            DESTINATION ${CMAKE_INSTALL_PREFIX})
7
            DESTINATION ${CMAKE_INSTALL_PREFIX})
62
8
    install(FILES gallery-apparmor.json
8
    install(FILES gallery-apparmor.json gallery-content.json
63
9
            DESTINATION ${CMAKE_INSTALL_PREFIX})
9
            DESTINATION ${CMAKE_INSTALL_PREFIX})
64
10
endif(CLICK_MODE)
10
endif(CLICK_MODE)
65
11
11
66
=== modified file 'click/gallery-apparmor.json'
67
--- click/gallery-apparmor.json	2013-10-06 23:41:40 +0000
68
+++ click/gallery-apparmor.json	2014-02-13 20:52:22 +0000
69
@@ -4,6 +4,7 @@
70
4
                      "content_exchange",
4
                      "content_exchange",
71
5
                      "content_exchange_source",
5
                      "content_exchange_source",
72
6
                      "picture_files",
6
                      "picture_files",
73
7
                      "friends",
74
7
                      "video",
8
                      "video",
75
8
                      "video_files"
9
                      "video_files"
76
9
                      ], 
10
                      ], 
77
10
11
78
=== added file 'click/gallery-content.json'
79
--- click/gallery-content.json	1970-01-01 00:00:00 +0000
80
+++ click/gallery-content.json	2014-02-13 20:52:22 +0000
81
@@ -0,0 +1,5 @@
82
1
{
83
2
    "source": [
84
3
        "pictures"
85
4
    ]
86
5
}
87
0
6
88
=== modified file 'click/manifest.json.in'
89
--- click/manifest.json.in	2013-10-06 23:41:40 +0000
90
+++ click/manifest.json.in	2014-02-13 20:52:22 +0000
91
@@ -6,16 +6,17 @@
92
6
    "hooks": {
6
    "hooks": {
93
7
        "gallery": {
7
        "gallery": {
94
8
            "apparmor": "gallery-apparmor.json", 
8
            "apparmor": "gallery-apparmor.json", 
95
9
            "content-hub": "gallery-content.json",
96
9
            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
10
            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
97
10
        }
11
        }
98
11
    }, 
12
    }, 
100
12
    "icon": "share/icons/ubuntu-mobile/app/144/gallery-app.png",
13
    "icon": "share/icons/gallery-app.svg",
101
13
    "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
14
    "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
102
14
    "name": "@APP_PACKAGE_NAME@", 
15
    "name": "@APP_PACKAGE_NAME@", 
103
15
    "title": "Gallery", 
16
    "title": "Gallery", 
105
16
    "version": "2.9.1",
17
    "version": "2.9.1.@BZR_REVNO@",
106
17
    "x-source": {
18
    "x-source": {
108
18
        "vcs-bzr": "lp:gallery-app", 
19
        "vcs-bzr": "@BZR_SOURCE@", 
109
19
        "vcs-bzr-revno": "@BZR_REVNO@"
20
        "vcs-bzr-revno": "@BZR_REVNO@"
110
20
    }
21
    }
111
21
}
22
}
112
22
23
113
=== modified file 'desktop/CMakeLists.txt'
114
--- desktop/CMakeLists.txt	2013-10-06 23:52:24 +0000
115
+++ desktop/CMakeLists.txt	2014-02-13 20:52:22 +0000
116
@@ -1,15 +1,22 @@
117
1
if(CLICK_MODE)
118
2
    install(FILES gallery-app.svg DESTINATION
119
3
        ${CMAKE_INSTALL_DATADIR}/icons)
120
4
	set(ICON "${CMAKE_INSTALL_DATADIR}/icons/${GALLERY}.svg")
121
5
	set(APP_EXEC "./${GALLERY}")
122
6
else(CLICK_MODE)
123
7
    install(DIRECTORY icons/hicolor DESTINATION DESTINATION
124
8
            ${CMAKE_INSTALL_DATADIR}/icons FILES_MATCHING PATTERN *.png)
125
9
	set(APP_EXEC "${GALLERY}")
126
10
	set(ICON "${GALLERY}")
127
11
endif(CLICK_MODE)
128
12
129
1
file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
13
file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
130
2
file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
14
file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
131
3
foreach(LINE ${DESKTOP_FILE_CONTENTS})
15
foreach(LINE ${DESKTOP_FILE_CONTENTS})
132
4
    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
16
    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
133
17
    string(CONFIGURE "${LINE}" LINE)
134
5
    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
18
    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
135
6
endforeach(LINE)
19
endforeach(LINE)
136
7
20
137
8
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
21
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
138
9
        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
22
        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
139
10
140
11
install(DIRECTORY icons/hicolor DESTINATION DESTINATION
141
12
        ${CMAKE_INSTALL_DATADIR}/icons FILES_MATCHING PATTERN *.png)
142
13
# ubuntu-mobile-icons already installs this file
143
14
#install(DIRECTORY icons/ubuntu-mobile DESTINATION DESTINATION
144
15
#        ${CMAKE_INSTALL_DATADIR}/icons FILES_MATCHING PATTERN *.png)
145
16
23
146
=== modified file 'desktop/gallery-app.desktop.in'
147
--- desktop/gallery-app.desktop.in	2013-09-19 18:37:24 +0000
148
+++ desktop/gallery-app.desktop.in	2014-02-13 20:52:22 +0000
149
@@ -4,15 +4,14 @@
150
4
GenericName=tr("Ubuntu Photo Viewer")
4
GenericName=tr("Ubuntu Photo Viewer")
151
5
X-GNOME-Fullname=tr("Ubuntu Photo Viewer")
5
X-GNOME-Fullname=tr("Ubuntu Photo Viewer")
152
6
Comment=tr("Browse your photographs")
6
Comment=tr("Browse your photographs")
156
7
TryExec=gallery-app
7
Exec=@APP_EXEC@ %u
157
8
Exec=gallery-app --fullscreen %u
8
Icon=@ICON@
155
9
Icon=gallery-app
158
10
StartupNotify=true
9
StartupNotify=true
159
11
Terminal=false
10
Terminal=false
160
12
Type=Application
11
Type=Application
163
13
MimeType=image/jpg;image/jpeg
12
MimeType=image/jpg;image/jpeg;
164
14
Categories=Graphics;Photography;RasterGraphics;Viewer
13
Categories=Graphics;Photography;RasterGraphics;Viewer;
165
15
X-Ayatana-Appmenu-Show-Stubs=false
14
X-Ayatana-Appmenu-Show-Stubs=false
166
16
X-Ubuntu-Touch=true
15
X-Ubuntu-Touch=true
168
17
X-Ubuntu-Gettext-Domain=gallery-app
16
X-Ubuntu-Gettext-Domain=@GETTEXT_PACKAGE@
169
18
X-Ubuntu-Single-Instance=true
17
X-Ubuntu-Single-Instance=true
170
19
18
171
=== modified file 'rc/qml/AlbumsOverview.qml'
172
--- rc/qml/AlbumsOverview.qml	2013-12-17 13:11:37 +0000
173
+++ rc/qml/AlbumsOverview.qml	2014-02-13 20:52:22 +0000
174
@@ -202,7 +202,7 @@
175
202
            action: Action {
202
            action: Action {
176
203
                text: i18n.tr("Camera")
203
                text: i18n.tr("Camera")
177
204
                iconSource: Qt.resolvedUrl("../img/camera.png")
204
                iconSource: Qt.resolvedUrl("../img/camera.png")
179
205
                onTriggered: Qt.openUrlExternally("application:///camera-app.desktop")
205
                onTriggered: Qt.openUrlExternally("appid://com.ubuntu.camera/camera/current-user-version")
180
206
            }
206
            }
181
207
        }
207
        }
182
208
    }
208
    }
183
209
209
184
=== modified file 'rc/qml/Utility/PhotosToolbarActions.qml'
185
--- rc/qml/Utility/PhotosToolbarActions.qml	2013-09-30 17:01:38 +0000
186
+++ rc/qml/Utility/PhotosToolbarActions.qml	2014-02-13 20:52:22 +0000
187
@@ -45,6 +45,6 @@
188
45
        objectName: "cameraButton"
45
        objectName: "cameraButton"
189
46
        text: i18n.tr("Camera")
46
        text: i18n.tr("Camera")
190
47
        iconSource: Qt.resolvedUrl("../../img/camera.png")
47
        iconSource: Qt.resolvedUrl("../../img/camera.png")
192
48
        onTriggered: Qt.openUrlExternally("application:///camera-app.desktop")
48
        onTriggered: Qt.openUrlExternally("appid://com.ubuntu.camera/camera/current-user-version")
193
49
    }
49
    }
194
50
}
50
}
195
51
51
196
=== added file 'tests/autopilot/gallery_app/data/default/.database/gallery_confined.sqlite'
197
52
Binary files tests/autopilot/gallery_app/data/default/.database/gallery_confined.sqlite	1970-01-01 00:00:00 +0000 and tests/autopilot/gallery_app/data/default/.database/gallery_confined.sqlite	2014-02-13 20:52:22 +0000 differ
52
Binary files tests/autopilot/gallery_app/data/default/.database/gallery_confined.sqlite	1970-01-01 00:00:00 +0000 and tests/autopilot/gallery_app/data/default/.database/gallery_confined.sqlite	2014-02-13 20:52:22 +0000 differ
198
=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
199
--- tests/autopilot/gallery_app/tests/__init__.py	2013-12-17 14:20:17 +0000
200
+++ tests/autopilot/gallery_app/tests/__init__.py	2014-02-13 20:52:22 +0000
201
@@ -43,6 +43,10 @@
202
43
    tap_press_time = 1
43
    tap_press_time = 1
203
44
    local_location = "../../src/gallery-app"
44
    local_location = "../../src/gallery-app"
204
45
45
205
46
    _db = '~/.local/share/com.ubuntu.gallery/gallery-app/' \
206
47
          'database/gallery.sqlite'
207
48
    _thumbs = '~/.cache/com.ubuntu.gallery/gallery-app/thumbnails'
208
49
209
46
    _default_sample_destination_dir = "/tmp/gallery-ap_sd"
50
    _default_sample_destination_dir = "/tmp/gallery-ap_sd"
210
47
51
211
48
    _sample_dirs = {
52
    _sample_dirs = {
212
@@ -77,15 +81,36 @@
213
77
            else:
81
            else:
214
78
                return EnvironmentTypes.click
82
                return EnvironmentTypes.click
215
79
83
219
80
    def _get_sample_destination_dir(self):
84
    def _get_sample_destination_dir(self, env_type):
220
81
        if self.env_type == EnvironmentTypes.click:
85
        if env_type == EnvironmentTypes.click:
221
82
            return os.path.expanduser("~/Pictures")
86
            pic_dir = os.path.expanduser("~/Pictures")
222
87
            shutil.move(pic_dir, pic_dir + '.bak')
223
88
            self.addCleanup(
224
89
                logger.debug, "Restoring backed up pics to %s" % pic_dir)
225
90
            self.addCleanup(shutil.move, pic_dir + '.bak', pic_dir)
226
91
            return pic_dir
227
83
        else:
92
        else:
228
84
            return self._default_sample_destination_dir
93
            return self._default_sample_destination_dir
229
85
94
233
86
    def configure_sample_files(self):
95
    def configure_db(self):
234
87
        self.sample_dir = self._sample_dirs[self.env_type]
96
        db = os.path.expanduser(self._db)
235
88
        self.sample_destination_dir = self._get_sample_destination_dir()
97
        shutil.move(db, db + '.apbak')
236
98
        self.addCleanup(shutil.move, db + '.apbak', db)
237
99
        mock_db = os.path.join(self.sample_destination_dir, '.database',
238
100
                               'gallery_confined.sqlite')
239
101
        shutil.move(mock_db, db)
240
102
241
103
    def configure_thumbnails(self):
242
104
        thumbs = os.path.expanduser(self._thumbs)
243
105
        shutil.move(thumbs, thumbs + '.apbak')
244
106
        self.addCleanup(shutil.move, thumbs + '.apbak', thumbs)
245
107
        mock_thumbs = os.path.join(self.sample_destination_dir, '.thumbnails')
246
108
        shutil.move(mock_thumbs, thumbs)
247
109
248
110
    def configure_sample_files(self, env_type):
249
111
        self.sample_dir = self._sample_dirs[env_type]
250
112
        self.sample_destination_dir = \
251
113
            self._get_sample_destination_dir(env_type)
252
89
        if (os.path.exists(self.sample_destination_dir)):
114
        if (os.path.exists(self.sample_destination_dir)):
253
90
            shutil.rmtree(self.sample_destination_dir)
115
            shutil.rmtree(self.sample_destination_dir)
254
91
        self.assertFalse(os.path.exists(self.sample_destination_dir))
116
        self.assertFalse(os.path.exists(self.sample_destination_dir))
255
@@ -104,24 +129,28 @@
256
104
        self.sample_file_source = \
129
        self.sample_file_source = \
257
105
            default_data_dir + self.sample_file_source
130
            default_data_dir + self.sample_file_source
258
106
131
259
132
        if env_type == EnvironmentTypes.click:
260
133
            self.configure_db()
261
134
            self.configure_thumbnails()
262
135
263
107
    def do_reset_config(self):
136
    def do_reset_config(self):
265
108
        config = os.path.expanduser(os.path.join("~", ".config", "gallery-app.conf"))
137
        config = os.path.expanduser(
266
138
            os.path.join("~", ".config", "gallery-app.conf"))
267
109
        if os.path.exists(config):
139
        if os.path.exists(config):
268
110
            remove(config)
140
            remove(config)
269
111
141
271
112
    def prepare(self):
142
    def setUp(self):
272
113
        self.pointing_device = toolkit_emulators.get_pointing_device()
143
        self.pointing_device = toolkit_emulators.get_pointing_device()
273
114
        super(GalleryTestCase, self).setUp()
144
        super(GalleryTestCase, self).setUp()
274
115
145
284
116
        self.env_type = self._get_environment_launch_type()
146
        env_type = self._get_environment_launch_type()
285
117
        self.configure_sample_files()
147
        self.configure_sample_files(env_type)
286
118
        self.do_reset_config()
148
287
119
149
        self.launch_gallery_app(env_type)
288
120
    def start_app(self, cleanup = False):
150
289
121
        self.launch_gallery_app()
151
        self.addCleanup(shutil.rmtree, self.sample_destination_dir)
290
122
152
        self.addCleanup(logger.debug,
291
123
        if cleanup:
153
                        "Deleting %s" % self.sample_destination_dir)
283
124
            self.addCleanup(shutil.rmtree, self.sample_destination_dir)
292
125
154
293
126
        """ This is needed to wait for the application to start.
155
        """ This is needed to wait for the application to start.
294
127
        In the testfarm, the application may take some time to show up."""
156
        In the testfarm, the application may take some time to show up."""
295
@@ -133,19 +162,15 @@
296
133
        for switching to the albums view. Therefore this hack of a second"""
162
        for switching to the albums view. Therefore this hack of a second"""
297
134
        sleep(1)
163
        sleep(1)
298
135
164
305
136
    def setUp(self):
165
    def launch_gallery_app(self, env_type):
306
137
        self.prepare()
166
        if env_type == EnvironmentTypes.installed:
301
138
        self.start_app(True)
302
139
303
140
    def launch_gallery_app(self):
304
141
        if self.env_type == EnvironmentTypes.installed:
307
142
            self.launch_test_installed()
167
            self.launch_test_installed()
309
143
        elif self.env_type == EnvironmentTypes.local:
168
        elif env_type == EnvironmentTypes.local:
310
144
            self.launch_test_local()
169
            self.launch_test_local()
312
145
        elif self.env_type == EnvironmentTypes.click:
170
        elif env_type == EnvironmentTypes.click:
313
146
            self.launch_test_click()
171
            self.launch_test_click()
314
147
        else:
172
        else:
316
148
            raise ValueError("Unknown environment type: %s", self.env_type)
173
            raise ValueError("Unknown environment type: %s", env_type)
317
149
174
318
150
    def launch_test_local(self):
175
    def launch_test_local(self):
319
151
        logger.debug("Launching local gallery-app binary.")
176
        logger.debug("Launching local gallery-app binary.")
320
@@ -186,6 +211,7 @@
321
186
        logger.debug("Launching gallery-app via click package.")
211
        logger.debug("Launching gallery-app via click package.")
322
187
        self.app = self.launch_click_package(
212
        self.app = self.launch_click_package(
323
188
            package_id="com.ubuntu.gallery",
213
            package_id="com.ubuntu.gallery",
324
214
            app_uris=' '.join(self.ARGS),
325
189
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
215
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
326
190
216
327
191
    def ui_update(self):
217
    def ui_update(self):
328
@@ -259,15 +285,18 @@
329
259
            self.keyboard.press_and_release("Alt+F4")
285
            self.keyboard.press_and_release("Alt+F4")
330
260
        else:
286
        else:
331
261
            # On unity8 at the moment we have no clean way to close the app.
287
            # On unity8 at the moment we have no clean way to close the app.
335
262
            # So we ask the shell first to show the home, unfocusing our app, which will
288
            # So we ask the shell first to show the home, unfocusing our app,
336
263
            # save its state. Then we simply send it a SIGTERM to force it to quit.
289
            # which will save its state. Then we simply send it a SIGTERM to
337
264
            # See bug https://bugs.launchpad.net/unity8/+bug/1261720 for more details.
290
            # force it to quit.
338
291
            # See bug https://bugs.launchpad.net/unity8/+bug/1261720 for more
339
292
            # details.
340
265
            from unity8 import process_helpers
293
            from unity8 import process_helpers
341
266
            pid = process_helpers._get_unity_pid()
294
            pid = process_helpers._get_unity_pid()
342
267
            unity8 = get_proxy_object_for_existing_process(pid)
295
            unity8 = get_proxy_object_for_existing_process(pid)
343
268
            shell = unity8.select_single("Shell")
296
            shell = unity8.select_single("Shell")
344
269
            shell.slots.showHome()
297
            shell.slots.showHome()
346
270
            self.assertThat(shell.currentFocusedAppId, Eventually(NotEquals("gallery-app")))
298
            self.assertThat(shell.currentFocusedAppId,
347
299
                            Eventually(NotEquals("gallery-app")))
348
271
            self.app.process.send_signal(signal.SIGTERM)
300
            self.app.process.send_signal(signal.SIGTERM)
349
272
301
350
273
        # Either way, we wait for the underlying process to be fully finished.
302
        # Either way, we wait for the underlying process to be fully finished.
351
@@ -288,4 +317,3 @@
352
288
        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
317
        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
353
289
        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
318
        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
354
290
        return delete_dialog
319
        return delete_dialog
355
291
356
292
320
357
=== modified file 'tests/autopilot/gallery_app/tests/test_album_view.py'
358
--- tests/autopilot/gallery_app/tests/test_album_view.py	2014-01-13 17:29:44 +0000
359
+++ tests/autopilot/gallery_app/tests/test_album_view.py	2014-02-13 20:52:22 +0000
360
@@ -18,7 +18,9 @@
361
18
from gallery_app.emulators.media_selector import MediaSelector
18
from gallery_app.emulators.media_selector import MediaSelector
362
19
from gallery_app.emulators import album_editor
19
from gallery_app.emulators import album_editor
363
20
from gallery_app.tests import GalleryTestCase
20
from gallery_app.tests import GalleryTestCase
365
21
import unittest
21
366
22
from unittest import skip
367
23
368
22
24
369
23
class TestAlbumView(GalleryTestCase):
25
class TestAlbumView(GalleryTestCase):
370
24
    """Tests the album view of the gallery app"""
26
    """Tests the album view of the gallery app"""
371
@@ -88,6 +90,7 @@
372
88
            lambda: self.album_view.number_of_photos(),
90
            lambda: self.album_view.number_of_photos(),
373
89
            Eventually(Equals(num_photos_start + 1)))
91
            Eventually(Equals(num_photos_start + 1)))
374
90
92
375
93
    @skip("UnicodeEncodeError: 'ascii' codec can't encode character u'xa2'")
376
91
    def test_add_photo_to_new_album(self):
94
    def test_add_photo_to_new_album(self):
377
92
        self.main_view.open_toolbar().click_button("addButton")
95
        self.main_view.open_toolbar().click_button("addButton")
378
93
        self.ui_update()
96
        self.ui_update()
379
@@ -116,7 +119,8 @@
380
116
            lambda: self.album_view.number_of_photos(),
119
            lambda: self.album_view.number_of_photos(),
381
117
            Eventually(Equals(num_photos_start + 1)))
120
            Eventually(Equals(num_photos_start + 1)))
382
118
121
384
119
    @unittest.skip("Temporarily disable as it fails in some cases, supposedly due to problems with the infrastructure")
122
    @skip("Temporarily disable as it fails in some cases, supposedly due to "
385
123
          "problems with the infrastructure")
386
120
    def test_save_state(self):
124
    def test_save_state(self):
387
121
        self.main_view.close_toolbar()
125
        self.main_view.close_toolbar()
388
122
        self.open_first_album()
126
        self.open_first_album()
389
@@ -130,7 +134,8 @@
390
130
        self.assertThat(view.visible, Eventually(Equals(True)))
134
        self.assertThat(view.visible, Eventually(Equals(True)))
391
131
        self.assertThat(view.albumId, Eventually(Equals(id)))
135
        self.assertThat(view.albumId, Eventually(Equals(id)))
392
132
136
394
133
    @unittest.skip("Temporarily disable as it fails in some cases, supposedly due to problems with the infrastructure")
137
    @skip("Temporarily disable as it fails in some cases, supposedly due to "
395
138
          "problems with the infrastructure")
396
134
    def test_no_save_state_on_back(self):
139
    def test_no_save_state_on_back(self):
397
135
        self.main_view.close_toolbar()
140
        self.main_view.close_toolbar()
398
136
        self.open_first_album()
141
        self.open_first_album()
399
137
142
400
=== modified file 'tests/autopilot/gallery_app/tests/test_picker_mode.py'
401
--- tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-01-13 17:29:44 +0000
402
+++ tests/autopilot/gallery_app/tests/test_picker_mode.py	2014-02-13 20:52:22 +0000
403
@@ -35,6 +35,7 @@
404
35
        first_media = self.picker_view.first_media_in_events_view()
35
        first_media = self.picker_view.first_media_in_events_view()
405
36
        self.click_item(first_media)
36
        self.click_item(first_media)
406
37
37
407
38
    @unittest.skip("Temporarily disable as it fails in some cases, supposedly due to problems with the infrastructure")
408
38
    def test_pick_first_photo(self):
39
    def test_pick_first_photo(self):
409
39
        """Check if the button enabled state follows the selection"""
40
        """Check if the button enabled state follows the selection"""
410
40
        pick_button = self.picker_view.pick_button()
41
        pick_button = self.picker_view.pick_button()
Status:	Superseded
Proposed branch:	lp:~bfiller/gallery-app/click-support
Merge into:	lp:gallery-app
Diff against target:	410 lines (+122/-57) 13 files modified CMakeLists.txt (+7/-5) click-build.sh (+16/-0) click/CMakeLists.txt (+1/-1) click/gallery-apparmor.json (+1/-0) click/gallery-content.json (+5/-0) click/manifest.json.in (+4/-3) desktop/CMakeLists.txt (+13/-6) desktop/gallery-app.desktop.in (+5/-6) rc/qml/AlbumsOverview.qml (+1/-1) rc/qml/Utility/PhotosToolbarActions.qml (+1/-1) tests/autopilot/gallery_app/tests/__init__.py (+59/-31) tests/autopilot/gallery_app/tests/test_album_view.py (+8/-3) tests/autopilot/gallery_app/tests/test_picker_mode.py (+1/-0)
To merge this branch:	bzr merge lp:~bfiller/gallery-app/click-support
Related bugs:	Link a bug report
Related blueprints:	Converting remaining touch apps to click (High)
Reviewer	Review Type	Status
PS Jenkins bot	continuous-integration	Approve on 2014-02-13
Ken VanDine		Approve on 2014-01-30
Bill Filler (community)		Needs Fixing on 2014-01-13
Review via email: mp+201238@code.launchpad.net