git.iko.soy/unity8
on xenial help sign in
Renamings
commitae5ff2d9bd08a89a6d90b7cdf9b9cb6e84d158d6 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 4 Feb 2014, 14:54 (13 years ago) parent6535be5
3 files changed+29−22
compare with xenial
unifiedsplit
qml/Dash/Previews/AudioPlayer.qml → qml/Dash/Previews/AudioWidget.qml+10−3 tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Dash/Previews/tst_AudioPlayer.qml → tests/qmltests/Dash/Previews/tst_AudioWidget.qml+18−18
qml/Dash/Previews/AudioPlayer.qml → qml/Dash/Previews/AudioWidget.qmlrenamed+10−3
@@ -21,9 +21,16 @@ import Ubuntu.Components.ListItems 0.1
2121
2222/*! \brief Preview widget for audio tracks.
2323
24− This widget shows tracks contained in widgetData["tracks"],
25− with source specified by widgetData["source"] along with a title that comes from widgetData["title"],
26− a subtitle coming from widgetData["subtitle"] and length from widgetData["length"].
24+ This widget shows tracks contained in widgetData["tracks"], each of which should be of the form:
25+
26+ \code{.json}
27+ {
28+ "source" "uri://to/file",
29+ "title": "Title",
30+ "subtitle": "Subtitle", // optional
31+ "length": 125 // in seconds
32+ }
33+ \endcode
2734 */
2835
2936PreviewWidget {
tests/qmltests/CMakeLists.txt+1−1
@@ -53,7 +53,7 @@ add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IM
5353add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5454add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5555add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
56−add_qml_test(Dash/Previews AudioPlayer IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
56+add_qml_test(Dash/Previews AudioWidget IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5757add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
5858 PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
5959add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
tests/qmltests/Dash/Previews/tst_AudioPlayer.qml → tests/qmltests/Dash/Previews/tst_AudioWidget.qmlrenamed+18−18
@@ -41,18 +41,18 @@ Rectangle {
4141 { 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);
@@ -171,7 +171,7 @@ Rectangle {
171171 tryCompare(track2ProgressBar, "visible", true);
172172
173173 // Changing preview should make all players shut up!
174− audioPlayer.isCurrentPreview = false
174+ audioWidget.isCurrentPreview = false
175175 tryCompare(audio, "playbackState", Audio.StoppedState);
176176 }
177177 }