1
=== modified file 'click/manifest.json.in'
2
--- click/manifest.json.in	2014-09-08 08:08:13 +0000
3
+++ click/manifest.json.in	2014-09-25 16:56:36 +0000
4
@@ -20,6 +20,12 @@
5
20
        "vcs-bzr-revno": "@BZR_REVNO@"
20
        "vcs-bzr-revno": "@BZR_REVNO@"
6
21
    },
21
    },
7
22
    "x-test": {
22
    "x-test": {
9
23
        "autopilot": "@AUTOPILOT_DIR@"
23
        "autopilot": {
10
24
            "autopilot_module": "@AUTOPILOT_DIR@",
11
25
            "depends": [
12
26
                "python3-fixtures",
13
27
                "url-dispatcher-tools"
14
28
            ]
15
29
        }
16
24
    }
30
    }
17
25
}
31
}
18
26
32
19
=== modified file 'debian/control'
20
--- debian/control	2014-09-08 13:24:22 +0000
21
+++ debian/control	2014-09-25 16:56:36 +0000
22
@@ -39,7 +39,9 @@
23
39
Depends: libautopilot-qt (>= 1.4),
39
Depends: libautopilot-qt (>= 1.4),
24
40
         libqt5test5,
40
         libqt5test5,
25
41
         music-app (= ${source:Version}),
41
         music-app (= ${source:Version}),
26
42
         python3-fixtures,
27
42
         ubuntu-ui-toolkit-autopilot,
43
         ubuntu-ui-toolkit-autopilot,
28
44
         url-dispatcher-tools,
29
43
         ${misc:Depends},
45
         ${misc:Depends},
30
44
Description: Autopilot tests for Music App
46
Description: Autopilot tests for Music App
31
45
 This package contains the autopilot tests for the Music App
47
 This package contains the autopilot tests for the Music App
32
46
48
33
=== modified file 'music-app.qml'
34
--- music-app.qml	2014-09-23 15:59:28 +0000
35
+++ music-app.qml	2014-09-25 16:56:36 +0000
36
@@ -204,22 +204,17 @@
37
204
        target: UriHandler
204
        target: UriHandler
38
205
205
39
206
        function processAlbum(uri) {
206
        function processAlbum(uri) {
40
207
            selectedAlbum = true;
41
208
            var split = uri.split("/");
207
            var split = uri.split("/");
42
209
208
43
210
            if (split.length < 2) {
209
            if (split.length < 2) {
44
211
                console.debug("Unknown artist-album " + uri + ", skipping")
210
                console.debug("Unknown artist-album " + uri + ", skipping")
46
212
                return;
211
            } else {
47
212
                selectedAlbum = true;
48
213
49
214
                // Filter by artist and album
50
215
                songsAlbumArtistModel.artist = decodeURIComponent(split[0]);
51
216
                songsAlbumArtistModel.album = decodeURIComponent(split[1]);
52
213
            }
217
            }
53
214
54
215
            // Filter by artist and album
55
216
            songsAlbumArtistModel.artist = decodeURIComponent(split[0]);
56
217
            songsAlbumArtistModel.album = decodeURIComponent(split[1]);
57
218
58
219
            // Add album to recent list
59
220
            Library.addRecent(songsAlbumArtistModel.album, songsAlbumArtistModel.artist, songsAlbumArtistModel.art, songsAlbumArtistModel.album, "album")
60
221
            mainView.hasRecent = true
61
222
            recentModel.filterRecent()
62
223
        }
218
        }
63
224
219
64
225
        function processFile(uri, play) {
220
        function processFile(uri, play) {
65
@@ -230,20 +225,19 @@
66
230
225
67
231
            if (!track) {
226
            if (!track) {
68
232
                console.debug("Unknown file " + uri + ", skipping")
227
                console.debug("Unknown file " + uri + ", skipping")
83
233
                return;
228
            } else {
84
234
            }
229
                if (play) {
85
235
230
                    // clear play queue
86
236
            if (play) {
231
                    trackQueue.model.clear()
87
237
                // clear play queue
232
                }
88
238
                trackQueue.model.clear()
233
89
239
            }
234
                // enqueue
90
240
235
                trackQueue.append(makeDict(track));
91
241
            // enqueue
236
92
242
            trackQueue.append(makeDict(track));
237
                // play first URI
93
243
238
                if (play) {
94
244
            // play first URI
239
                    trackQueueClick(trackQueue.model.count - 1);
95
245
            if (play) {
240
                }
82
246
                trackQueueClick(trackQueue.model.count - 1);
96
247
            }
241
            }
97
248
        }
242
        }
98
249
243
99
@@ -257,7 +251,6 @@
100
257
            else if (uri.indexOf("music://") === 0) {
251
            else if (uri.indexOf("music://") === 0) {
101
258
                uriHandler.processFile(uri.substring(8), play);
252
                uriHandler.processFile(uri.substring(8), play);
102
259
            }
253
            }
103
260
104
261
            else {
254
            else {
105
262
                console.debug("Unsupported URI " + uri + ", skipping")
255
                console.debug("Unsupported URI " + uri + ", skipping")
106
263
            }
256
            }
107
@@ -735,6 +728,11 @@
108
735
                // Play album it tracks exist
728
                // Play album it tracks exist
109
736
                if (rowCount > 0 && selectedAlbum) {
729
                if (rowCount > 0 && selectedAlbum) {
110
737
                    trackClicked(songsAlbumArtistModel, 0, true, true);
730
                    trackClicked(songsAlbumArtistModel, 0, true, true);
111
731
112
732
                    // Add album to recent list
113
733
                    Library.addRecent(songsAlbumArtistModel.album, songsAlbumArtistModel.artist, null, songsAlbumArtistModel.album, "album")
114
734
                    mainView.hasRecent = true
115
735
                    recentModel.filterRecent()
116
738
                } else if (selectedAlbum) {
736
                } else if (selectedAlbum) {
117
739
                    console.debug("Unknown artist-album " + artist + "/" + album + ", skipping")
737
                    console.debug("Unknown artist-album " + artist + "/" + album + ", skipping")
118
740
                }
738
                }
119
741
739
120
=== modified file 'tests/autopilot/music_app/__init__.py'
121
--- tests/autopilot/music_app/__init__.py	2014-09-05 22:20:29 +0000
122
+++ tests/autopilot/music_app/__init__.py	2014-09-25 16:56:36 +0000
123
@@ -6,6 +6,7 @@
124
6
# by the Free Software Foundation.
6
# by the Free Software Foundation.
125
7
7
126
8
"""music-app tests and emulators - top level package."""
8
"""music-app tests and emulators - top level package."""
127
9
from music_app.url_dispatcher import URLDispatcher
128
9
from ubuntuuitoolkit import MainView, UbuntuUIToolkitCustomProxyObjectBase
10
from ubuntuuitoolkit import MainView, UbuntuUIToolkitCustomProxyObjectBase
129
10
11
130
11
12
131
@@ -32,7 +33,7 @@
132
32
    return func_wrapper
33
    return func_wrapper
133
33
34
134
34
35
136
35
class MusicApp(object):
36
class MusicApp():
137
36
    """Autopilot helper object for the Music application."""
37
    """Autopilot helper object for the Music application."""
138
37
38
139
38
    def __init__(self, app_proxy):
39
    def __init__(self, app_proxy):
140
@@ -40,6 +41,10 @@
141
40
        self.main_view = self.app.wait_select_single(MainView)
41
        self.main_view = self.app.wait_select_single(MainView)
142
41
        self.player = self.app.select_single(Player, objectName='player')
42
        self.player = self.app.select_single(Player, objectName='player')
143
42
43
144
44
    def call_url_dispatcher(self, protocol, path):
145
45
        dispatcher = URLDispatcher()
146
46
        dispatcher.call_dispatcher(protocol, path)
147
47
148
43
    def get_add_to_playlist_page(self):
48
    def get_add_to_playlist_page(self):
149
44
        return self.app.wait_select_single(Page11,
49
        return self.app.wait_select_single(Page11,
150
45
                                           objectName="addToPlaylistPage")
50
                                           objectName="addToPlaylistPage")
151
46
51
152
=== modified file 'tests/autopilot/music_app/tests/__init__.py'
153
--- tests/autopilot/music_app/tests/__init__.py	2014-09-25 00:39:47 +0000
154
+++ tests/autopilot/music_app/tests/__init__.py	2014-09-25 16:56:36 +0000
155
@@ -62,10 +62,10 @@
156
62
62
157
63
    def setUp(self):
63
    def setUp(self):
158
64
        super(BaseTestCaseWithPatchedHome, self).setUp()
64
        super(BaseTestCaseWithPatchedHome, self).setUp()
161
65
        _, test_type = self.get_launcher_method_and_type()
65
        launcher_method, self.test_type = self.get_launcher_method_and_type()
162
66
        self.home_dir = self._patch_home(test_type)
66
        self.home_dir = self._patch_home(self.test_type)
163
67
67
165
68
        self._create_music_library(test_type)
68
        self._create_music_library(self.test_type)
166
69
69
167
70
    @autopilot_logging.log_action(logger.info)
70
    @autopilot_logging.log_action(logger.info)
168
71
    def launch_test_local(self):
71
    def launch_test_local(self):
169
72
72
170
=== modified file 'tests/autopilot/music_app/tests/test_music.py'
171
--- tests/autopilot/music_app/tests/test_music.py	2014-09-23 20:45:41 +0000
172
+++ tests/autopilot/music_app/tests/test_music.py	2014-09-25 16:56:36 +0000
173
@@ -11,6 +11,7 @@
174
11
11
175
12
import logging
12
import logging
176
13
from autopilot.matchers import Eventually
13
from autopilot.matchers import Eventually
177
14
import os
178
14
from testtools.matchers import Equals, GreaterThan, LessThan, NotEquals
15
from testtools.matchers import Equals, GreaterThan, LessThan, NotEquals
179
15
16
180
16
17
181
@@ -47,6 +48,9 @@
182
47
            }
48
            }
183
48
        ]
49
        ]
184
49
50
185
51
    def is_click(self):
186
52
        return self.test_type == "click"
187
53
188
50
    @property
54
    @property
189
51
    def player(self):
55
    def player(self):
190
52
        return self.app.player
56
        return self.app.player
191
@@ -627,6 +631,62 @@
192
627
                        Eventually(Equals(self.tracks[-1]["title"])))
631
                        Eventually(Equals(self.tracks[-1]["title"])))
193
628
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
632
        self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
194
629
633
195
634
    def test_launch_album_from_url_dispatcher_must_play_it(self):
196
635
        """Test that the album:// url plays the correct album/artist"""
197
636
198
637
        # Url dispatcher only works in a click-based env for now
199
638
        if not self.is_click():
200
639
            self.skipTest("URL dispatcher works only for installed click "
201
640
                          "packages.")
202
641
203
642
        # create path for album://
204
643
        album_artist = os.path.join(os.path.sep, self.tracks[1]["artist"],
205
644
                                    self.tracks[1]["album"])
206
645
207
646
        # Run url-dispatcher call
208
647
        self.app.call_url_dispatcher("album://", album_artist)
209
648
210
649
        self.player.isPlaying.wait_for(True)  # ensure track is playing
211
650
212
651
        # Check that the album and artist are correct
213
652
        self.assertThat(self.player.currentMetaArtist,
214
653
                        Eventually(Equals(self.tracks[1]["artist"])))
215
654
        self.assertThat(self.player.currentMetaAlbum,
216
655
                        Eventually(Equals(self.tracks[1]["album"])))
217
656
218
657
        # Check now playing page is shown
219
658
        now_playing_page = self.app.get_now_playing_page()
220
659
        now_playing_page.visible.wait_for(True)
221
660
222
661
        # Check that the play queue count is correct
223
662
        self.assertThat(now_playing_page.get_count(), Eventually(Equals(1)))
224
663
225
664
    def test_launch_music_from_url_dispatcher_must_play_it(self):
226
665
        """Test that the music:// url plays the correct file"""
227
666
228
667
        # Url dispatcher only works in a click-based env for now
229
668
        if not self.is_click():
230
669
            self.skipTest("URL dispatcher works only for installed click "
231
670
                          "packages.")
232
671
233
672
        path = os.path.join(self.home_dir, "Music", self.tracks[0]["source"])
234
673
235
674
        # Run url-dispatcher call
236
675
        self.app.call_url_dispatcher("music://", path)
237
676
238
677
        self.player.isPlaying.wait_for(True)  # ensure track is playing
239
678
240
679
        # Check that the source of the file is correct
241
680
        self.assertThat(self.player.source,
242
681
                        Eventually(Equals("file://" + path)))
243
682
244
683
        # Check now playing page is shown
245
684
        now_playing_page = self.app.get_now_playing_page()
246
685
        now_playing_page.visible.wait_for(True)
247
686
248
687
        # Check that the play queue count is correct
249
688
        self.assertThat(now_playing_page.get_count(), Eventually(Equals(1)))
250
689
251
630
    def test_pressing_prev_after_5_seconds(self):
690
    def test_pressing_prev_after_5_seconds(self):
252
631
        """Pressing previous after 5s jumps to the start of current song"""
691
        """Pressing previous after 5s jumps to the start of current song"""
253
632
692
254
633
693
255
=== added file 'tests/autopilot/music_app/url_dispatcher.py'
256
--- tests/autopilot/music_app/url_dispatcher.py	1970-01-01 00:00:00 +0000
257
+++ tests/autopilot/music_app/url_dispatcher.py	2014-09-25 16:56:36 +0000
258
@@ -0,0 +1,22 @@
259
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
260
2
# Copyright 2014 Canonical
261
3
#
262
4
# This program is free software: you can redistribute it and/or modify it
263
5
# under the terms of the GNU General Public License version 3, as published
264
6
# by the Free Software Foundation.
265
7
266
8
import autopilot.logging as autopilot_logging
267
9
import logging
268
10
import subprocess
269
11
270
12
logger = logging.getLogger(__name__)
271
13
272
14
273
15
class URLDispatcher(object):
274
16
275
17
    """Helper for the URLDispatcher"""
276
18
277
19
    @autopilot_logging.log_action(logger.info)
278
20
    def call_dispatcher(self, protocol, path):
279
21
        # Run call to url-dispatcher
280
22
        return subprocess.check_call(["url-dispatcher", protocol + path])
Status:	Work in progress
Proposed branch:	lp:~ahayzen/music-app/add-url-dispatcher-tests
Merge into:	lp:music-app/trusty
Diff against target:	280 lines (+124/-31) 7 files modified click/manifest.json.in (+7/-1) debian/control (+2/-0) music-app.qml (+24/-26) tests/autopilot/music_app/__init__.py (+6/-1) tests/autopilot/music_app/tests/__init__.py (+3/-3) tests/autopilot/music_app/tests/test_music.py (+60/-0) tests/autopilot/music_app/url_dispatcher.py (+22/-0)
To merge this branch:	bzr merge lp:~ahayzen/music-app/add-url-dispatcher-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration	Approve on 2014-09-25
Leo Arias (community)	code review of the autopilot code	Approve on 2014-09-25
Andrew Hayzen		Abstain on 2014-09-25
Review via email: mp+233840@code.launchpad.net
1	=== modified file 'click/manifest.json.in'
2	--- click/manifest.json.in 2014-09-08 08:08:13 +0000
3	+++ click/manifest.json.in 2014-09-25 16:56:36 +0000
4	@@ -20,6 +20,12 @@
5	20	"vcs-bzr-revno": "@BZR_REVNO@"	20	"vcs-bzr-revno": "@BZR_REVNO@"
6	21	},	21	},
7	22	"x-test": {	22	"x-test": {
9	23	"autopilot": "@AUTOPILOT_DIR@"	23	"autopilot": {
10			24	"autopilot_module": "@AUTOPILOT_DIR@",
11			25	"depends": [
12			26	"python3-fixtures",
13			27	"url-dispatcher-tools"
14			28	]
15			29	}
16	24	}	30	}
17	25	}	31	}
18	26		32
19	=== modified file 'debian/control'
20	--- debian/control 2014-09-08 13:24:22 +0000
21	+++ debian/control 2014-09-25 16:56:36 +0000
22	@@ -39,7 +39,9 @@
23	39	Depends: libautopilot-qt (>= 1.4),	39	Depends: libautopilot-qt (>= 1.4),
24	40	libqt5test5,	40	libqt5test5,
25	41	music-app (= ${source:Version}),	41	music-app (= ${source:Version}),
26			42	python3-fixtures,
27	42	ubuntu-ui-toolkit-autopilot,	43	ubuntu-ui-toolkit-autopilot,
28			44	url-dispatcher-tools,
29	43	${misc:Depends},	45	${misc:Depends},
30	44	Description: Autopilot tests for Music App	46	Description: Autopilot tests for Music App
31	45	This package contains the autopilot tests for the Music App	47	This package contains the autopilot tests for the Music App
32	46		48
33	=== modified file 'music-app.qml'
34	--- music-app.qml 2014-09-23 15:59:28 +0000
35	+++ music-app.qml 2014-09-25 16:56:36 +0000
36	@@ -204,22 +204,17 @@
37	204	target: UriHandler	204	target: UriHandler
38	205		205
39	206	function processAlbum(uri) {	206	function processAlbum(uri) {
40	207	selectedAlbum = true;
41	208	var split = uri.split("/");	207	var split = uri.split("/");
42	209		208
43	210	if (split.length < 2) {	209	if (split.length < 2) {
44	211	console.debug("Unknown artist-album " + uri + ", skipping")	210	console.debug("Unknown artist-album " + uri + ", skipping")
46	212	return;	211	} else {
47			212	selectedAlbum = true;
48			213
49			214	// Filter by artist and album
50			215	songsAlbumArtistModel.artist = decodeURIComponent(split[0]);
51			216	songsAlbumArtistModel.album = decodeURIComponent(split[1]);
52	213	}	217	}
53	214
54	215	// Filter by artist and album
55	216	songsAlbumArtistModel.artist = decodeURIComponent(split[0]);
56	217	songsAlbumArtistModel.album = decodeURIComponent(split[1]);
57	218
58	219	// Add album to recent list
59	220	Library.addRecent(songsAlbumArtistModel.album, songsAlbumArtistModel.artist, songsAlbumArtistModel.art, songsAlbumArtistModel.album, "album")
60	221	mainView.hasRecent = true
61	222	recentModel.filterRecent()
62	223	}	218	}
63	224		219
64	225	function processFile(uri, play) {	220	function processFile(uri, play) {
65	@@ -230,20 +225,19 @@
66	230		225
67	231	if (!track) {	226	if (!track) {
68	232	console.debug("Unknown file " + uri + ", skipping")	227	console.debug("Unknown file " + uri + ", skipping")
83	233	return;	228	} else {
84	234	}	229	if (play) {
85	235		230	// clear play queue
86	236	if (play) {	231	trackQueue.model.clear()
87	237	// clear play queue	232	}
88	238	trackQueue.model.clear()	233
89	239	}	234	// enqueue
90	240		235	trackQueue.append(makeDict(track));
91	241	// enqueue	236
92	242	trackQueue.append(makeDict(track));	237	// play first URI
93	243		238	if (play) {
94	244	// play first URI	239	trackQueueClick(trackQueue.model.count - 1);
95	245	if (play) {	240	}
82	246	trackQueueClick(trackQueue.model.count - 1);
96	247	}	241	}
97	248	}	242	}
98	249		243
99	@@ -257,7 +251,6 @@
100	257	else if (uri.indexOf("music://") === 0) {	251	else if (uri.indexOf("music://") === 0) {
101	258	uriHandler.processFile(uri.substring(8), play);	252	uriHandler.processFile(uri.substring(8), play);
102	259	}	253	}
103	260
104	261	else {	254	else {
105	262	console.debug("Unsupported URI " + uri + ", skipping")	255	console.debug("Unsupported URI " + uri + ", skipping")
106	263	}	256	}
107	@@ -735,6 +728,11 @@
108	735	// Play album it tracks exist	728	// Play album it tracks exist
109	736	if (rowCount > 0 && selectedAlbum) {	729	if (rowCount > 0 && selectedAlbum) {
110	737	trackClicked(songsAlbumArtistModel, 0, true, true);	730	trackClicked(songsAlbumArtistModel, 0, true, true);
111			731
112			732	// Add album to recent list
113			733	Library.addRecent(songsAlbumArtistModel.album, songsAlbumArtistModel.artist, null, songsAlbumArtistModel.album, "album")
114			734	mainView.hasRecent = true
115			735	recentModel.filterRecent()
116	738	} else if (selectedAlbum) {	736	} else if (selectedAlbum) {
117	739	console.debug("Unknown artist-album " + artist + "/" + album + ", skipping")	737	console.debug("Unknown artist-album " + artist + "/" + album + ", skipping")
118	740	}	738	}
119	741		739
120	=== modified file 'tests/autopilot/music_app/__init__.py'
121	--- tests/autopilot/music_app/__init__.py 2014-09-05 22:20:29 +0000
122	+++ tests/autopilot/music_app/__init__.py 2014-09-25 16:56:36 +0000
123	@@ -6,6 +6,7 @@
124	6	# by the Free Software Foundation.	6	# by the Free Software Foundation.
125	7		7
126	8	"""music-app tests and emulators - top level package."""	8	"""music-app tests and emulators - top level package."""
127			9	from music_app.url_dispatcher import URLDispatcher
128	9	from ubuntuuitoolkit import MainView, UbuntuUIToolkitCustomProxyObjectBase	10	from ubuntuuitoolkit import MainView, UbuntuUIToolkitCustomProxyObjectBase
129	10		11
130	11		12
131	@@ -32,7 +33,7 @@
132	32	return func_wrapper	33	return func_wrapper
133	33		34
134	34		35
136	35	class MusicApp(object):	36	class MusicApp():
137	36	"""Autopilot helper object for the Music application."""	37	"""Autopilot helper object for the Music application."""
138	37		38
139	38	def __init__(self, app_proxy):	39	def __init__(self, app_proxy):
140	@@ -40,6 +41,10 @@
141	40	self.main_view = self.app.wait_select_single(MainView)	41	self.main_view = self.app.wait_select_single(MainView)
142	41	self.player = self.app.select_single(Player, objectName='player')	42	self.player = self.app.select_single(Player, objectName='player')
143	42		43
144			44	def call_url_dispatcher(self, protocol, path):
145			45	dispatcher = URLDispatcher()
146			46	dispatcher.call_dispatcher(protocol, path)
147			47
148	43	def get_add_to_playlist_page(self):	48	def get_add_to_playlist_page(self):
149	44	return self.app.wait_select_single(Page11,	49	return self.app.wait_select_single(Page11,
150	45	objectName="addToPlaylistPage")	50	objectName="addToPlaylistPage")
151	46		51
152	=== modified file 'tests/autopilot/music_app/tests/__init__.py'
153	--- tests/autopilot/music_app/tests/__init__.py 2014-09-25 00:39:47 +0000
154	+++ tests/autopilot/music_app/tests/__init__.py 2014-09-25 16:56:36 +0000
155	@@ -62,10 +62,10 @@
156	62		62
157	63	def setUp(self):	63	def setUp(self):
158	64	super(BaseTestCaseWithPatchedHome, self).setUp()	64	super(BaseTestCaseWithPatchedHome, self).setUp()
161	65	_, test_type = self.get_launcher_method_and_type()	65	launcher_method, self.test_type = self.get_launcher_method_and_type()
162	66	self.home_dir = self._patch_home(test_type)	66	self.home_dir = self._patch_home(self.test_type)
163	67		67
165	68	self._create_music_library(test_type)	68	self._create_music_library(self.test_type)
166	69		69
167	70	@autopilot_logging.log_action(logger.info)	70	@autopilot_logging.log_action(logger.info)
168	71	def launch_test_local(self):	71	def launch_test_local(self):
169	72		72
170	=== modified file 'tests/autopilot/music_app/tests/test_music.py'
171	--- tests/autopilot/music_app/tests/test_music.py 2014-09-23 20:45:41 +0000
172	+++ tests/autopilot/music_app/tests/test_music.py 2014-09-25 16:56:36 +0000
173	@@ -11,6 +11,7 @@
174	11		11
175	12	import logging	12	import logging
176	13	from autopilot.matchers import Eventually	13	from autopilot.matchers import Eventually
177			14	import os
178	14	from testtools.matchers import Equals, GreaterThan, LessThan, NotEquals	15	from testtools.matchers import Equals, GreaterThan, LessThan, NotEquals
179	15		16
180	16		17
181	@@ -47,6 +48,9 @@
182	47	}	48	}
183	48	]	49	]
184	49		50
185			51	def is_click(self):
186			52	return self.test_type == "click"
187			53
188	50	@property	54	@property
189	51	def player(self):	55	def player(self):
190	52	return self.app.player	56	return self.app.player
191	@@ -627,6 +631,62 @@
192	627	Eventually(Equals(self.tracks[-1]["title"])))	631	Eventually(Equals(self.tracks[-1]["title"])))
193	628	self.assertThat(self.player.isPlaying, Eventually(Equals(True)))	632	self.assertThat(self.player.isPlaying, Eventually(Equals(True)))
194	629		633
195			634	def test_launch_album_from_url_dispatcher_must_play_it(self):
196			635	"""Test that the album:// url plays the correct album/artist"""
197			636
198			637	# Url dispatcher only works in a click-based env for now
199			638	if not self.is_click():
200			639	self.skipTest("URL dispatcher works only for installed click "
201			640	"packages.")
202			641
203			642	# create path for album://
204			643	album_artist = os.path.join(os.path.sep, self.tracks[1]["artist"],
205			644	self.tracks[1]["album"])
206			645
207			646	# Run url-dispatcher call
208			647	self.app.call_url_dispatcher("album://", album_artist)
209			648
210			649	self.player.isPlaying.wait_for(True) # ensure track is playing
211			650
212			651	# Check that the album and artist are correct
213			652	self.assertThat(self.player.currentMetaArtist,
214			653	Eventually(Equals(self.tracks[1]["artist"])))
215			654	self.assertThat(self.player.currentMetaAlbum,
216			655	Eventually(Equals(self.tracks[1]["album"])))
217			656
218			657	# Check now playing page is shown
219			658	now_playing_page = self.app.get_now_playing_page()
220			659	now_playing_page.visible.wait_for(True)
221			660
222			661	# Check that the play queue count is correct
223			662	self.assertThat(now_playing_page.get_count(), Eventually(Equals(1)))
224			663
225			664	def test_launch_music_from_url_dispatcher_must_play_it(self):
226			665	"""Test that the music:// url plays the correct file"""
227			666
228			667	# Url dispatcher only works in a click-based env for now
229			668	if not self.is_click():
230			669	self.skipTest("URL dispatcher works only for installed click "
231			670	"packages.")
232			671
233			672	path = os.path.join(self.home_dir, "Music", self.tracks[0]["source"])
234			673
235			674	# Run url-dispatcher call
236			675	self.app.call_url_dispatcher("music://", path)
237			676
238			677	self.player.isPlaying.wait_for(True) # ensure track is playing
239			678
240			679	# Check that the source of the file is correct
241			680	self.assertThat(self.player.source,
242			681	Eventually(Equals("file://" + path)))
243			682
244			683	# Check now playing page is shown
245			684	now_playing_page = self.app.get_now_playing_page()
246			685	now_playing_page.visible.wait_for(True)
247			686
248			687	# Check that the play queue count is correct
249			688	self.assertThat(now_playing_page.get_count(), Eventually(Equals(1)))
250			689
251	630	def test_pressing_prev_after_5_seconds(self):	690	def test_pressing_prev_after_5_seconds(self):
252	631	"""Pressing previous after 5s jumps to the start of current song"""	691	"""Pressing previous after 5s jumps to the start of current song"""
253	632		692
254	633		693
255	=== added file 'tests/autopilot/music_app/url_dispatcher.py'
256	--- tests/autopilot/music_app/url_dispatcher.py 1970-01-01 00:00:00 +0000
257	+++ tests/autopilot/music_app/url_dispatcher.py 2014-09-25 16:56:36 +0000
258	@@ -0,0 +1,22 @@
259			1	# -- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 --
260			2	# Copyright 2014 Canonical
261			3	#
262			4	# This program is free software: you can redistribute it and/or modify it
263			5	# under the terms of the GNU General Public License version 3, as published
264			6	# by the Free Software Foundation.
265			7
266			8	import autopilot.logging as autopilot_logging
267			9	import logging
268			10	import subprocess
269			11
270			12	logger = logging.getLogger(__name__)
271			13
272			14
273			15	class URLDispatcher(object):
274			16
275			17	"""Helper for the URLDispatcher"""
276			18
277			19	@autopilot_logging.log_action(logger.info)
278			20	def call_dispatcher(self, protocol, path):
279			21	# Run call to url-dispatcher
280			22	return subprocess.check_call(["url-dispatcher", protocol + path])