195f67d · unity8 · git.iko.soy

git.iko.soy/unity8

Adapt unit test to DashAudioPlayer changes

commit195f67ddb35dc296bfbbff4c1c930ec180ad135c authorAlfonso Sanchez-Beato <alfonso.sanchez-beato@canonical.com> dateFri 26 Aug 2016, 09:21 (10 years ago) parent7ba539b

2 files changed+8−9

compare with xenial

unifiedsplit

plugins/Dash/DashAudioPlayer.qml+1 tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+7−9

plugins/Dash/DashAudioPlayer.qml+1

@@ -27,6 +27,7 @@ QtObject {

2727 readonly property bool stopped: priv.audio ? priv.audio.playbackState === Audio.StoppedState : true

2828 readonly property int position: priv.audio ? priv.audio.position : 0

2929 readonly property url currentSource: priv.audio ? priv.audio.playlist.currentItemSource : ""

30+ readonly property Playlist playlist: priv.audio ? priv.audio.playlist : null

3031

3132 function playSource(newSource, newPlaylist) {

3233 if (!priv.audio) {

tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+7−9

@@ -127,8 +127,6 @@ Rectangle {

127127 var track1PlayButton = findChild(track1Item, "playButton");

128128 var track2PlayButton = findChild(track2Item, "playButton");

129129

130− var audio = DashAudioPlayer.audio;

131−

132130 // All progress bars must be hidden in the beginning

133131 compare(track0ProgressBar.visible, false);

134132 compare(track1ProgressBar.visible, false);

@@ -137,7 +135,7 @@ Rectangle {

137135 // Playing track 0 should make progress bar 0 visible

138136 mouseClick(track0PlayButton);

139137

140− tryCompare(audio, "playbackState", Audio.PlayingState);

138+ verify(DashAudioPlayer.playing == true);

141139 checkPlayerSource(0);

142140

143141 tryCompare(track0ProgressBar, "visible", true);

@@ -146,25 +144,25 @@ Rectangle {

146144

147145 // Clicking the button again should pause it. The progress bar should stay visible

148146 mouseClick(track0PlayButton);

149− tryCompare(audio, "playbackState", Audio.PausedState);

147+ verify(DashAudioPlayer.paused == true);

150148 checkPlayerSource(0);

151149 tryCompare(track0ProgressBar, "visible", true);

152150

153151 // Continue playback

154152 mouseClick(track0PlayButton);

155− tryCompare(audio, "playbackState", Audio.PlayingState);

153+ verify(DashAudioPlayer.playing == true);

156154 checkPlayerSource(0);

157155

158156 // Playing track 1 should make progress bar 1 visible and hide progress bar 0 again

159157 mouseClick(track1PlayButton);

160158

161− tryCompare(audio, "playbackState", Audio.PlayingState);

159+ verify(DashAudioPlayer.playing == true);

162160 checkPlayerSource(1);

163161

164162 // Check the playlist is song 0, 1, 2

165− checkPlayerUrls(tracksModel2["tracks"][0].source, audio.playlist.itemSource(0));

166− checkPlayerUrls(tracksModel2["tracks"][1].source, audio.playlist.itemSource(1));

167− checkPlayerUrls(tracksModel2["tracks"][2].source, audio.playlist.itemSource(2));

163+ checkPlayerUrls(tracksModel2["tracks"][0].source, DashAudioPlayer.playlist.itemSource(0));

164+ checkPlayerUrls(tracksModel2["tracks"][1].source, DashAudioPlayer.playlist.itemSource(1));

165+ checkPlayerUrls(tracksModel2["tracks"][2].source, DashAudioPlayer.playlist.itemSource(2));

168166

169167 tryCompare(track0ProgressBar, "visible", false);

170168 tryCompare(track1ProgressBar, "visible", true);