on xenial help sign in
More renamings
commit8865696e7e4afe3657402841f0a7566a90e1f282 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 4 Feb 2014, 15:11 (13 years ago) parent408f00cfdf142a
5 files changed+30−30
qml/Dash/Previews/AudioWidget.qml → qml/Dash/Previews/PreviewAudioPlayback.qml qml/Dash/Previews/TextWidget.qml → qml/Dash/Previews/PreviewTextSummary.qml tests/qmltests/CMakeLists.txt+2−2 tests/qmltests/Dash/Previews/tst_AudioWidget.qml → tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml+18−18 tests/qmltests/Dash/Previews/tst_TextWidget.qml → tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml+10−10
qml/Dash/Previews/AudioWidget.qml → qml/Dash/Previews/PreviewAudioPlayback.qmlrenamed

The content is the same.

qml/Dash/Previews/TextWidget.qml → qml/Dash/Previews/PreviewTextSummary.qmlrenamed

The content is the same.

tests/qmltests/CMakeLists.txt+2−2
@@ -54,8 +54,8 @@ add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IM
5454add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5555add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5656add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
57−add_qml_test(Dash/Previews AudioWidget IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
58−add_qml_test(Dash/Previews TextWidget IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
57+add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
58+add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
5959add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
6060 PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
6161add_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 {
4141 { title: "And another one", length: "7425", source: "/not/existing/path/testsound3" } ]
4242 }
4343
44− AudioWidget {
45− id: audioWidget
44+ PreviewAudioPlayback {
45+ id: previewAudioPlayback
4646 anchors.fill: parent
4747 widgetData: tracksModel2
4848 }
4949
5050 UT.UnityTestCase {
51− name: "AudioWidgetTest"
51+ name: "PreviewAudioPlaybackTest"
5252 when: windowShown
5353
5454 function init() {
55− waitForRendering(audioWidget);
55+ waitForRendering(previewAudioPlayback);
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(audioWidget, "audio");
69+ var audio = findInvisibleChild(previewAudioPlayback, "audio");
7070 compare(audio.lengthToString(data.value), data.result)
7171 }
7272
@@ -79,14 +79,14 @@ Rectangle {
7979 }
8080
8181 function test_tracks(data) {
82− audioWidget.widgetData = data.tracksModel;
83− waitForRendering(audioWidget);
82+ previewAudioPlayback.widgetData = data.tracksModel;
83+ waitForRendering(previewAudioPlayback);
8484
85− var trackRepeater = findChild(audioWidget, "trackRepeater");
85+ var trackRepeater = findChild(previewAudioPlayback, "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(audioWidget, "trackItem" + i);
89+ var trackItem = findChild(previewAudioPlayback, "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 = audioWidget.widgetData["tracks"][index]["source"].replace(/^.*[\\\/]/, '');
104− var playerFilename = findInvisibleChild(audioWidget, "audio").source.toString().replace(/^.*[\\\/]/, '');
103+ var modelFilename = previewAudioPlayback.widgetData["tracks"][index]["source"].replace(/^.*[\\\/]/, '');
104+ var playerFilename = findInvisibleChild(previewAudioPlayback, "audio").source.toString().replace(/^.*[\\\/]/, '');
105105
106106 compare(modelFilename, playerFilename, "Player source is not set correctly.");
107107 }
108108
109109 function test_playback() {
110− audioWidget.widgetData = tracksModel2;
111− waitForRendering(audioWidget);
110+ previewAudioPlayback.widgetData = tracksModel2;
111+ waitForRendering(previewAudioPlayback);
112112
113− var track0Item = findChild(audioWidget, "trackItem0");
114− var track1Item = findChild(audioWidget, "trackItem1");
115− var track2Item = findChild(audioWidget, "trackItem2");
113+ var track0Item = findChild(previewAudioPlayback, "trackItem0");
114+ var track1Item = findChild(previewAudioPlayback, "trackItem1");
115+ var track2Item = findChild(previewAudioPlayback, "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(audioWidget, "audio");
125+ var audio = findInvisibleChild(previewAudioPlayback, "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− audioWidget.isCurrentPreview = false
174+ previewAudioPlayback.isCurrentPreview = false
175175 tryCompare(audio, "playbackState", Audio.StoppedState);
176176 }
177177 }
tests/qmltests/Dash/Previews/tst_TextWidget.qml → tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qmlrenamed+10−10
@@ -40,37 +40,37 @@ Rectangle {
4040 "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
4141 }
4242
43− TextWidget {
44− id: textWidget
43+ PreviewTextSummary {
44+ id: previewTextSummary
4545 anchors.fill: parent
4646 widgetData: widgetDataComplete
4747 }
4848
4949 UT.UnityTestCase {
50− name: "TextWidgetTest"
50+ name: "PreviewTextSummaryTest"
5151 when: windowShown
5252
53− property var textLabel: findChild(textWidget, "textLabel")
53+ property var textLabel: findChild(previewTextSummary, "textLabel")
5454
5555 function test_optional_title() {
56− var titleLabel = findChild(textWidget, "titleLabel")
56+ var titleLabel = findChild(previewTextSummary, "titleLabel")
5757
58− textWidget.widgetData = widgetDataComplete
58+ previewTextSummary.widgetData = widgetDataComplete
5959
6060 compare(titleLabel.visible, true)
6161 var mappedTextLabel = root.mapFromItem(textLabel, 0, 0)
6262 compare(mappedTextLabel.y, titleLabel.height)
6363
64− textWidget.widgetData = widgetDataNoTitle
64+ previewTextSummary.widgetData = widgetDataNoTitle
6565
6666 compare(titleLabel.visible, false)
6767 verify(mappedTextLabel.y, 0)
6868 }
6969
7070 function test_see_more() {
71− var seeMore = findChild(textWidget, "seeMore")
71+ var seeMore = findChild(previewTextSummary, "seeMore")
7272
73− textWidget.widgetData = widgetDataComplete
73+ previewTextSummary.widgetData = widgetDataComplete
7474
7575 // when it's more than 7 lines of text, show SeeMore component
7676 verify(textLabel.lineCount > 7)
@@ -90,7 +90,7 @@ Rectangle {
9090 tryCompare(textLabel, "height", initialTextLabelHeight)
9191
9292 // text SeeMore automatic hiding
93− textWidget.widgetData = widgetDataShortText
93+ previewTextSummary.widgetData = widgetDataShortText
9494
9595 verify(textLabel.lineCount <= 7)
9696 compare(seeMore.visible, false)