git.iko.soy/unity8
on xenial help sign in
More renamings
fdf142aAndrea Cimitan
qml/Dash/Previews/AudioWidget.qml → qml/Dash/Previews/PreviewAudioPlayback.qmlrenamed
compare with xenial
unifiedsplit

The content is the same.

tests/qmltests/CMakeLists.txt+1−1
@@ -53,7 +53,7 @@ add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IM
53add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
53add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
54add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
54add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
55add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
55add_qml_test(Dash/Music MusicPreview 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)
56+add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
57add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
57add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
58 PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
58 PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
59add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
59add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
tests/qmltests/Dash/Previews/tst_AudioWidget.qml → tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qmlrenamed+18−18
@@ -41,18 +41,18 @@ Rectangle {
41 { title: "And another one", length: "7425", source: "/not/existing/path/testsound3" } ]
41 { title: "And another one", length: "7425", source: "/not/existing/path/testsound3" } ]
42 }
42 }
43
43
44− AudioWidget {
44+ PreviewAudioPlayback {
45− id: audioWidget
45+ id: previewAudioPlayback
46 anchors.fill: parent
46 anchors.fill: parent
47 widgetData: tracksModel2
47 widgetData: tracksModel2
48 }
48 }
49
49
50 UT.UnityTestCase {
50 UT.UnityTestCase {
51− name: "AudioWidgetTest"
51+ name: "PreviewAudioPlaybackTest"
52 when: windowShown
52 when: windowShown
53
53
54 function init() {
54 function init() {
55− waitForRendering(audioWidget);
55+ waitForRendering(previewAudioPlayback);
56 }
56 }
57
57
58 function test_time_formatter_data() {
58 function test_time_formatter_data() {
@@ -66,7 +66,7 @@ Rectangle {
66 }
66 }
67
67
68 function test_time_formatter(data) {
68 function test_time_formatter(data) {
69− var audio = findInvisibleChild(audioWidget, "audio");
69+ var audio = findInvisibleChild(previewAudioPlayback, "audio");
70 compare(audio.lengthToString(data.value), data.result)
70 compare(audio.lengthToString(data.value), data.result)
71 }
71 }
72
72
@@ -79,14 +79,14 @@ Rectangle {
79 }
79 }
80
80
81 function test_tracks(data) {
81 function test_tracks(data) {
82− audioWidget.widgetData = data.tracksModel;
82+ previewAudioPlayback.widgetData = data.tracksModel;
83− waitForRendering(audioWidget);
83+ waitForRendering(previewAudioPlayback);
84
84
85− var trackRepeater = findChild(audioWidget, "trackRepeater");
85+ var trackRepeater = findChild(previewAudioPlayback, "trackRepeater");
86 compare(trackRepeater.count, data.tracksModel["tracks"].length)
86 compare(trackRepeater.count, data.tracksModel["tracks"].length)
87
87
88 for (var i = 0; i < data.tracksModel["tracks"].length; ++i) {
88 for (var i = 0; i < data.tracksModel["tracks"].length; ++i) {
89− var trackItem = findChild(audioWidget, "trackItem" + i);
89+ var trackItem = findChild(previewAudioPlayback, "trackItem" + i);
90 var titleLabel = findChild(trackItem, "trackTitleLabel");
90 var titleLabel = findChild(trackItem, "trackTitleLabel");
91 compare(titleLabel.text, data.tracksModel["tracks"][i]["title"])
91 compare(titleLabel.text, data.tracksModel["tracks"][i]["title"])
92 var subtitleLabel = findChild(trackItem, "trackSubtitleLabel");
92 var subtitleLabel = findChild(trackItem, "trackSubtitleLabel");
@@ -100,19 +100,19 @@ Rectangle {
100 }
100 }
101
101
102 function checkPlayerSource(index) {
102 function checkPlayerSource(index) {
103− var modelFilename = audioWidget.widgetData["tracks"][index]["source"].replace(/^.*[\\\/]/, '');
103+ var modelFilename = previewAudioPlayback.widgetData["tracks"][index]["source"].replace(/^.*[\\\/]/, '');
104− var playerFilename = findInvisibleChild(audioWidget, "audio").source.toString().replace(/^.*[\\\/]/, '');
104+ var playerFilename = findInvisibleChild(previewAudioPlayback, "audio").source.toString().replace(/^.*[\\\/]/, '');
105
105
106 compare(modelFilename, playerFilename, "Player source is not set correctly.");
106 compare(modelFilename, playerFilename, "Player source is not set correctly.");
107 }
107 }
108
108
109 function test_playback() {
109 function test_playback() {
110− audioWidget.widgetData = tracksModel2;
110+ previewAudioPlayback.widgetData = tracksModel2;
111− waitForRendering(audioWidget);
111+ waitForRendering(previewAudioPlayback);
112
112
113− var track0Item = findChild(audioWidget, "trackItem0");
113+ var track0Item = findChild(previewAudioPlayback, "trackItem0");
114− var track1Item = findChild(audioWidget, "trackItem1");
114+ var track1Item = findChild(previewAudioPlayback, "trackItem1");
115− var track2Item = findChild(audioWidget, "trackItem2");
115+ var track2Item = findChild(previewAudioPlayback, "trackItem2");
116
116
117 var track0ProgressBar = findChild(track0Item, "progressBarFill");
117 var track0ProgressBar = findChild(track0Item, "progressBarFill");
118 var track1ProgressBar = findChild(track1Item, "progressBarFill");
118 var track1ProgressBar = findChild(track1Item, "progressBarFill");
@@ -122,7 +122,7 @@ Rectangle {
122 var track1PlayButton = findChild(track1Item, "playButton");
122 var track1PlayButton = findChild(track1Item, "playButton");
123 var track2PlayButton = findChild(track2Item, "playButton");
123 var track2PlayButton = findChild(track2Item, "playButton");
124
124
125− var audio = findInvisibleChild(audioWidget, "audio");
125+ var audio = findInvisibleChild(previewAudioPlayback, "audio");
126
126
127 // All progress bars must be hidden in the beginning
127 // All progress bars must be hidden in the beginning
128 compare(track0ProgressBar.visible, false);
128 compare(track0ProgressBar.visible, false);
@@ -171,7 +171,7 @@ Rectangle {
171 tryCompare(track2ProgressBar, "visible", true);
171 tryCompare(track2ProgressBar, "visible", true);
172
172
173 // Changing preview should make all players shut up!
173 // Changing preview should make all players shut up!
174− audioWidget.isCurrentPreview = false
174+ previewAudioPlayback.isCurrentPreview = false
175 tryCompare(audio, "playbackState", Audio.StoppedState);
175 tryCompare(audio, "playbackState", Audio.StoppedState);
176 }
176 }
177 }
177 }