git.iko.soy/unity8
on xenial help sign in
Rename PreviewRating to PreviewRatingInput
05d8ae8Andrea Cimitan
qml/Dash/Previews/PreviewRating.qml → qml/Dash/Previews/PreviewRatingInput.qmlrenamed
compare with xenial
unifiedsplit

The content is the same.

qml/Dash/Previews/PreviewWidgetFactory.qml+1−1
@@ -48,7 +48,7 @@ Loader {
48 case "header": return "PreviewHeader.qml";
48 case "header": return "PreviewHeader.qml";
49 case "image": return "PreviewZoomableImage.qml"
49 case "image": return "PreviewZoomableImage.qml"
50 case "progress": return "PreviewProgress.qml";
50 case "progress": return "PreviewProgress.qml";
51− case "rating-input": return "PreviewRating.qml";
51+ case "rating-input": return "PreviewRatingInput.qml";
52 case "text": return "PreviewTextSummary.qml";
52 case "text": return "PreviewTextSummary.qml";
53 case "video": return "PreviewVideoPlayback.qml";
53 case "video": return "PreviewVideoPlayback.qml";
54 default: return "";
54 default: return "";
tests/qmltests/CMakeLists.txt+1−1
@@ -62,7 +62,7 @@ add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_I
62add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
62add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
63add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
63add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
64add_qml_test(Dash/Previews PreviewProgress IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
64add_qml_test(Dash/Previews PreviewProgress IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
65−add_qml_test(Dash/Previews PreviewRating IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
65+add_qml_test(Dash/Previews PreviewRatingInput IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
66add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
66add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
67add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
67add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
68add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
68add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
tests/qmltests/Dash/Previews/tst_PreviewRating.qml → tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qmlrenamed+15−15
@@ -43,12 +43,12 @@ Rectangle {
43
43
44 property var widgetDataNewLabels: { "visible": "both", "required": "both", "rating-label": "TestRatingLabel", "review-label": "TestReviewLabel", "submit-label": "TestSubmitLabel" }
44 property var widgetDataNewLabels: { "visible": "both", "required": "both", "rating-label": "TestRatingLabel", "review-label": "TestReviewLabel", "submit-label": "TestSubmitLabel" }
45
45
46− PreviewRating {
46+ PreviewRatingInput {
47− id: previewRating
47+ id: previewRatingInput
48 anchors.left: parent.left
48 anchors.left: parent.left
49 anchors.right: parent.right
49 anchors.right: parent.right
50 widgetData: widgetDataBoth
50 widgetData: widgetDataBoth
51− widgetId: "previewRating"
51+ widgetId: "previewRatingInput"
52 }
52 }
53
53
54 SignalSpy {
54 SignalSpy {
@@ -57,12 +57,12 @@ Rectangle {
57 }
57 }
58
58
59 UT.UnityTestCase {
59 UT.UnityTestCase {
60− name: "PreviewRatingTest"
60+ name: "PreviewRatingInputTest"
61 when: windowShown
61 when: windowShown
62
62
63− property var rating: findChild(previewRating, "rating")
63+ property var rating: findChild(previewRatingInput, "rating")
64− property var reviewTextArea: findChild(previewRating, "reviewTextArea")
64+ property var reviewTextArea: findChild(previewRatingInput, "reviewTextArea")
65− property var submitButton: findChild(previewRating, "submitButton")
65+ property var submitButton: findChild(previewRatingInput, "submitButton")
66
66
67 function init() {
67 function init() {
68 rating.value = -1;
68 rating.value = -1;
@@ -70,10 +70,10 @@ Rectangle {
70 }
70 }
71
71
72 function test_labels() {
72 function test_labels() {
73− var ratingLabel = findChild(previewRating, "ratingLabel");
73+ var ratingLabel = findChild(previewRatingInput, "ratingLabel");
74− var reviewLabel = findChild(previewRating, "reviewLabel");
74+ var reviewLabel = findChild(previewRatingInput, "reviewLabel");
75
75
76− previewRating.widgetData = widgetDataNewLabels;
76+ previewRatingInput.widgetData = widgetDataNewLabels;
77 compare(ratingLabel.text, widgetDataNewLabels["rating-label"]);
77 compare(ratingLabel.text, widgetDataNewLabels["rating-label"]);
78 compare(reviewLabel.text, widgetDataNewLabels["review-label"]);
78 compare(reviewLabel.text, widgetDataNewLabels["review-label"]);
79 compare(submitButton.text, widgetDataNewLabels["submit-label"]);
79 compare(submitButton.text, widgetDataNewLabels["submit-label"]);
@@ -106,9 +106,9 @@ Rectangle {
106
106
107 function test_submit_and_visibility(data) {
107 function test_submit_and_visibility(data) {
108 spy.clear();
108 spy.clear();
109− spy.target = previewRating;
109+ spy.target = previewRatingInput;
110
110
111− previewRating.widgetData = data.widgetData;
111+ previewRatingInput.widgetData = data.widgetData;
112
112
113 if (data.widgetData["visible"] !== "review") {
113 if (data.widgetData["visible"] !== "review") {
114 verify(rating.visible === true);
114 verify(rating.visible === true);
@@ -161,9 +161,9 @@ Rectangle {
161
161
162 function test_triggered(data) {
162 function test_triggered(data) {
163 spy.clear();
163 spy.clear();
164− spy.target = previewRating;
164+ spy.target = previewRatingInput;
165
165
166− previewRating.widgetData = data.widgetData;
166+ previewRatingInput.widgetData = data.widgetData;
167
167
168 if (data.inputRating > 0) rating.value = data.inputRating;
168 if (data.inputRating > 0) rating.value = data.inputRating;
169 if (data.inputText !== "") {
169 if (data.inputText !== "") {
@@ -173,7 +173,7 @@ Rectangle {
173
173
174 compare(spy.count, 1);
174 compare(spy.count, 1);
175 var args = spy.signalArguments[0];
175 var args = spy.signalArguments[0];
176− compare(args[0], previewRating.widgetId);
176+ compare(args[0], previewRatingInput.widgetId);
177 compare(args[1], data.widgetData["required"]);
177 compare(args[1], data.widgetData["required"]);
178 compare(args[2]["rating"], data.triggeredData["rating"]);
178 compare(args[2]["rating"], data.triggeredData["rating"]);
179 compare(args[2]["review"], data.triggeredData["review"]);
179 compare(args[2]["review"], data.triggeredData["review"]);
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+1−1
@@ -81,7 +81,7 @@ Rectangle {
81 { tag: "Header", type: "header", source: "PreviewHeader.qml" },
81 { tag: "Header", type: "header", source: "PreviewHeader.qml" },
82 { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
82 { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
83 { tag: "Progress", type: "progress", source: "PreviewProgress.qml" },
83 { tag: "Progress", type: "progress", source: "PreviewProgress.qml" },
84− { tag: "Rating Input", type: "rating-input", source: "PreviewRating.qml" },
84+ { tag: "Rating Input", type: "rating-input", source: "PreviewRatingInput.qml" },
85 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
85 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
86 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
86 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
87 ];
87 ];