git.iko.soy/unity8
on xenial help sign in
Adapt unit test to DashAudioPlayer changes
195f67dAlfonso Sanchez-Beato
plugins/Dash/DashAudioPlayer.qml+1
compare with xenial
unifiedsplit
@@ -27,6 +27,7 @@ QtObject {
27 readonly property bool stopped: priv.audio ? priv.audio.playbackState === Audio.StoppedState : true
27 readonly property bool stopped: priv.audio ? priv.audio.playbackState === Audio.StoppedState : true
28 readonly property int position: priv.audio ? priv.audio.position : 0
28 readonly property int position: priv.audio ? priv.audio.position : 0
29 readonly property url currentSource: priv.audio ? priv.audio.playlist.currentItemSource : ""
29 readonly property url currentSource: priv.audio ? priv.audio.playlist.currentItemSource : ""
30+ readonly property Playlist playlist: priv.audio ? priv.audio.playlist : null
30
31
31 function playSource(newSource, newPlaylist) {
32 function playSource(newSource, newPlaylist) {
32 if (!priv.audio) {
33 if (!priv.audio) {
tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+7−9
@@ -127,8 +127,6 @@ Rectangle {
127 var track1PlayButton = findChild(track1Item, "playButton");
127 var track1PlayButton = findChild(track1Item, "playButton");
128 var track2PlayButton = findChild(track2Item, "playButton");
128 var track2PlayButton = findChild(track2Item, "playButton");
129
129
130− var audio = DashAudioPlayer.audio;
131−
132 // All progress bars must be hidden in the beginning
130 // All progress bars must be hidden in the beginning
133 compare(track0ProgressBar.visible, false);
131 compare(track0ProgressBar.visible, false);
134 compare(track1ProgressBar.visible, false);
132 compare(track1ProgressBar.visible, false);
@@ -137,7 +135,7 @@ Rectangle {
137 // Playing track 0 should make progress bar 0 visible
135 // Playing track 0 should make progress bar 0 visible
138 mouseClick(track0PlayButton);
136 mouseClick(track0PlayButton);
139
137
140− tryCompare(audio, "playbackState", Audio.PlayingState);
138+ verify(DashAudioPlayer.playing == true);
141 checkPlayerSource(0);
139 checkPlayerSource(0);
142
140
143 tryCompare(track0ProgressBar, "visible", true);
141 tryCompare(track0ProgressBar, "visible", true);
@@ -146,25 +144,25 @@ Rectangle {
146
144
147 // Clicking the button again should pause it. The progress bar should stay visible
145 // Clicking the button again should pause it. The progress bar should stay visible
148 mouseClick(track0PlayButton);
146 mouseClick(track0PlayButton);
149− tryCompare(audio, "playbackState", Audio.PausedState);
147+ verify(DashAudioPlayer.paused == true);
150 checkPlayerSource(0);
148 checkPlayerSource(0);
151 tryCompare(track0ProgressBar, "visible", true);
149 tryCompare(track0ProgressBar, "visible", true);
152
150
153 // Continue playback
151 // Continue playback
154 mouseClick(track0PlayButton);
152 mouseClick(track0PlayButton);
155− tryCompare(audio, "playbackState", Audio.PlayingState);
153+ verify(DashAudioPlayer.playing == true);
156 checkPlayerSource(0);
154 checkPlayerSource(0);
157
155
158 // Playing track 1 should make progress bar 1 visible and hide progress bar 0 again
156 // Playing track 1 should make progress bar 1 visible and hide progress bar 0 again
159 mouseClick(track1PlayButton);
157 mouseClick(track1PlayButton);
160
158
161− tryCompare(audio, "playbackState", Audio.PlayingState);
159+ verify(DashAudioPlayer.playing == true);
162 checkPlayerSource(1);
160 checkPlayerSource(1);
163
161
164 // Check the playlist is song 0, 1, 2
162 // Check the playlist is song 0, 1, 2
165− checkPlayerUrls(tracksModel2["tracks"][0].source, audio.playlist.itemSource(0));
163+ checkPlayerUrls(tracksModel2["tracks"][0].source, DashAudioPlayer.playlist.itemSource(0));
166− checkPlayerUrls(tracksModel2["tracks"][1].source, audio.playlist.itemSource(1));
164+ checkPlayerUrls(tracksModel2["tracks"][1].source, DashAudioPlayer.playlist.itemSource(1));
167− checkPlayerUrls(tracksModel2["tracks"][2].source, audio.playlist.itemSource(2));
165+ checkPlayerUrls(tracksModel2["tracks"][2].source, DashAudioPlayer.playlist.itemSource(2));
168
166
169 tryCompare(track0ProgressBar, "visible", false);
167 tryCompare(track0ProgressBar, "visible", false);
170 tryCompare(track1ProgressBar, "visible", true);
168 tryCompare(track1ProgressBar, "visible", true);