@@ -32,27 +32,27 @@ Rectangle {
3232 }
3333
3434 property var tracksModel1: {
35− "tracks": [ { title: "Some track name", length: "30", source: "../../tests/qmltests/Dash/Music/data/testsound1.ogg" } ]
35+ "tracks": [ { title: "Some track name", length: "30", source: "/not/existing/path/testsound1" } ]
3636 }
3737
3838 property var tracksModel2: {
39− "tracks": [ { title: "Some track name", length: "30", source: "../../tests/qmltests/Dash/Music/data/testsound1.ogg" },
40− { title: "Some other track name", subtitle: "Subtitle", length: "83", source: "../../tests/qmltests/Dash/Music/data/testsound2.ogg" },
41− { title: "And another one", length: "7425", source: "../../tests/qmltests/Dash/Music/data/testsound3.ogg" } ]
39+ "tracks": [ { title: "Some track name", length: "30", source: "/not/existing/path/testsound1" },
40+ { title: "Some other track name", subtitle: "Subtitle", length: "83", source: "/not/existing/path/testsound2" },
41+ { title: "And another one", length: "7425", source: "/not/existing/path/testsound3" } ]
4242 }
4343
44− AudioPlayer {
45− id: audioPlayer
44+ AudioWidget {
45+ id: audioWidget
4646 anchors.fill: parent
4747 widgetData: tracksModel2
4848 }
4949
5050 UT.UnityTestCase {
51− name: "AudioPlayerTest"
51+ name: "AudioWidgetTest"
5252 when: windowShown
5353
5454 function init() {
55− waitForRendering(audioPlayer);
55+ waitForRendering(audioWidget);
5656 }
5757
5858 function test_time_formatter_data() {
@@ -66,7 +66,7 @@ Rectangle {
6666 }
6767
6868 function test_time_formatter(data) {
69− var audio = findInvisibleChild(audioPlayer, "audio");
69+ var audio = findInvisibleChild(audioWidget, "audio");
7070 compare(audio.lengthToString(data.value), data.result)
7171 }
7272
@@ -79,14 +79,14 @@ Rectangle {
7979 }
8080
8181 function test_tracks(data) {
82− audioPlayer.widgetData = data.tracksModel;
83− waitForRendering(audioPlayer);
82+ audioWidget.widgetData = data.tracksModel;
83+ waitForRendering(audioWidget);
8484
85− var trackRepeater = findChild(audioPlayer, "trackRepeater");
85+ var trackRepeater = findChild(audioWidget, "trackRepeater");
8686 compare(trackRepeater.count, data.tracksModel["tracks"].length)
8787
8888 for (var i = 0; i < data.tracksModel["tracks"].length; ++i) {
89− var trackItem = findChild(audioPlayer, "trackItem" + i);
89+ var trackItem = findChild(audioWidget, "trackItem" + i);
9090 var titleLabel = findChild(trackItem, "trackTitleLabel");
9191 compare(titleLabel.text, data.tracksModel["tracks"][i]["title"])
9292 var subtitleLabel = findChild(trackItem, "trackSubtitleLabel");
@@ -100,19 +100,19 @@ Rectangle {
100100 }
101101
102102 function checkPlayerSource(index) {
103− var modelFilename = audioPlayer.widgetData["tracks"][index]["source"].replace(/^.*[\\\/]/, '');
104− var playerFilename = findInvisibleChild(audioPlayer, "audio").source.toString().replace(/^.*[\\\/]/, '');
103+ var modelFilename = audioWidget.widgetData["tracks"][index]["source"].replace(/^.*[\\\/]/, '');
104+ var playerFilename = findInvisibleChild(audioWidget, "audio").source.toString().replace(/^.*[\\\/]/, '');
105105
106106 compare(modelFilename, playerFilename, "Player source is not set correctly.");
107107 }
108108
109109 function test_playback() {
110− audioPlayer.widgetData = tracksModel2;
111− waitForRendering(audioPlayer);
110+ audioWidget.widgetData = tracksModel2;
111+ waitForRendering(audioWidget);
112112
113− var track0Item = findChild(audioPlayer, "trackItem0");
114− var track1Item = findChild(audioPlayer, "trackItem1");
115− var track2Item = findChild(audioPlayer, "trackItem2");
113+ var track0Item = findChild(audioWidget, "trackItem0");
114+ var track1Item = findChild(audioWidget, "trackItem1");
115+ var track2Item = findChild(audioWidget, "trackItem2");
116116
117117 var track0ProgressBar = findChild(track0Item, "progressBarFill");
118118 var track1ProgressBar = findChild(track1Item, "progressBarFill");
@@ -122,7 +122,7 @@ Rectangle {
122122 var track1PlayButton = findChild(track1Item, "playButton");
123123 var track2PlayButton = findChild(track2Item, "playButton");
124124
125− var audio = findInvisibleChild(audioPlayer, "audio");
125+ var audio = findInvisibleChild(audioWidget, "audio");
126126
127127 // All progress bars must be hidden in the beginning
128128 compare(track0ProgressBar.visible, false);
@@ -170,8 +170,8 @@ Rectangle {
170170 tryCompare(track1ProgressBar, "visible", false);
171171 tryCompare(track2ProgressBar, "visible", true);
172172
173− // Calling stop() should make all players shut up!
174− audioPlayer.focused = false
173+ // Changing preview should make all players shut up!
174+ audioWidget.isCurrentPreview = false
175175 tryCompare(audio, "playbackState", Audio.StoppedState);
176176 }
177177 }