on xenial help sign in
Renamings
commitee2b67deca81ff5a052070870e5baa896f4af0aa authorAndrea Cimitan <andrea.cimitan@gmail.com> dateTue 4 Feb 2014, 14:51 (13 years ago) parent9ac9560
3 files changed+11−11
qml/Dash/Previews/TextSummary.qml → qml/Dash/Previews/TextWidget.qml tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Dash/Previews/tst_TextSummary.qml → tests/qmltests/Dash/Previews/tst_TextWidget.qml+10−10
qml/Dash/Previews/TextSummary.qml → qml/Dash/Previews/TextWidget.qmlrenamed

The content is the same.

tests/qmltests/CMakeLists.txt+1−1
@@ -55,7 +55,7 @@ add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} $
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)
5757add_qml_test(Dash/Previews AudioPlayer IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
58−add_qml_test(Dash/Previews TextSummary 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)
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_TextSummary.qml → tests/qmltests/Dash/Previews/tst_TextWidget.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− TextSummary {
44− id: textSummary
43+ TextWidget {
44+ id: textWidget
4545 anchors.fill: parent
4646 widgetData: widgetDataComplete
4747 }
4848
4949 UT.UnityTestCase {
50− name: "TextSummaryTest"
50+ name: "TextWidgetTest"
5151 when: windowShown
5252
53− property var textLabel: findChild(textSummary, "textLabel")
53+ property var textLabel: findChild(textWidget, "textLabel")
5454
5555 function test_optional_title() {
56− var titleLabel = findChild(textSummary, "titleLabel")
56+ var titleLabel = findChild(textWidget, "titleLabel")
5757
58− textSummary.widgetData = widgetDataComplete
58+ textWidget.widgetData = widgetDataComplete
5959
6060 compare(titleLabel.visible, true)
6161 var mappedTextLabel = root.mapFromItem(textLabel, 0, 0)
6262 compare(mappedTextLabel.y, titleLabel.height)
6363
64− textSummary.widgetData = widgetDataNoTitle
64+ textWidget.widgetData = widgetDataNoTitle
6565
6666 compare(titleLabel.visible, false)
6767 verify(mappedTextLabel.y, 0)
6868 }
6969
7070 function test_see_more() {
71− var seeMore = findChild(textSummary, "seeMore")
71+ var seeMore = findChild(textWidget, "seeMore")
7272
73− textSummary.widgetData = widgetDataComplete
73+ textWidget.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− textSummary.widgetData = widgetDataShortText
93+ textWidget.widgetData = widgetDataShortText
9494
9595 verify(textLabel.lineCount <= 7)
9696 compare(seeMore.visible, false)