git.iko.soy/unity8
on xenial help sign in
Renamed preview image
b354215Andrea Cimitan
qml/Dash/Previews/PreviewImage.qml → qml/Dash/Previews/PreviewZoomableImage.qmlrenamed+1−1
compare with xenial
unifiedsplit
@@ -29,7 +29,7 @@ PreviewWidget {
29 implicitHeight: units.gu(22)
29 implicitHeight: units.gu(22)
30
30
31 LazyImage {
31 LazyImage {
32− objectName: "lazyImage"
32+ objectName: "image"
33 anchors.fill: parent
33 anchors.fill: parent
34 scaleTo: "height"
34 scaleTo: "height"
35 source: widgetData["source"]
35 source: widgetData["source"]
tests/qmltests/CMakeLists.txt+1−1
@@ -55,9 +55,9 @@ add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} $
55add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
55add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
56add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
56add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
57add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
57add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
58−add_qml_test(Dash/Previews PreviewImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
59add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
58add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
60add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
59add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
60+add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
61add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
61add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
62 PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
62 PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
63add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
63add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
tests/qmltests/Dash/Previews/tst_PreviewImage.qml → tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qmlrenamed+8−8
@@ -34,24 +34,24 @@ Rectangle {
34 "zoomable": false
34 "zoomable": false
35 }
35 }
36
36
37− PreviewImage {
37+ PreviewZoomableImage {
38− id: image
38+ id: zoomableImage
39 width: parent.width
39 width: parent.width
40 widgetData: widgetData1
40 widgetData: widgetData1
41 }
41 }
42
42
43 UT.UnityTestCase {
43 UT.UnityTestCase {
44− name: "PreviewImageTest"
44+ name: "PreviewZoomableImageTest"
45 when: windowShown
45 when: windowShown
46
46
47 function test_loadImage() {
47 function test_loadImage() {
48− var lazyImage = findChild(image, "lazyImage");
48+ var image = findChild(zoomableImage, "image");
49
49
50− image.widgetData = widgetData0;
50+ zoomableImage.widgetData = widgetData0;
51− tryCompare(lazyImage.state, "default");
51+ tryCompare(image.state, "default");
52
52
53− image.widgetData = widgetData1;
53+ zoomableImage.widgetData = widgetData1;
54− tryCompare(lazyImage.state, "ready");
54+ tryCompare(image.state, "ready");
55 }
55 }
56 }
56 }
57}
57}