git.iko.soy/unity8
on xenial help sign in
update tests
a33874aMichael Zanetti
qml/Components/VirtualTouchPad.qml+14−2
compare with xenial
unifiedsplit
@@ -188,6 +188,7 @@ Item {
188
188
189 MouseArea {
189 MouseArea {
190 id: leftButton
190 id: leftButton
191+ objectName: "leftButton"
191 Layout.fillWidth: true
192 Layout.fillWidth: true
192 Layout.fillHeight: true
193 Layout.fillHeight: true
193 onPressed: uinput.pressMouse(UInput.ButtonLeft);
194 onPressed: uinput.pressMouse(UInput.ButtonLeft);
@@ -202,6 +203,7 @@ Item {
202
203
203 MouseArea {
204 MouseArea {
204 id: rightButton
205 id: rightButton
206+ objectName: "rightButton"
205 Layout.fillWidth: true
207 Layout.fillWidth: true
206 Layout.fillHeight: true
208 Layout.fillHeight: true
207 onPressed: uinput.pressMouse(UInput.ButtonRight);
209 onPressed: uinput.pressMouse(UInput.ButtonRight);
@@ -217,6 +219,7 @@ Item {
217
219
218 AbstractButton {
220 AbstractButton {
219 id: oskButton
221 id: oskButton
222+ objectName: "oskButton"
220 anchors { right: parent.right; top: parent.top; margins: internalGu * 2 }
223 anchors { right: parent.right; top: parent.top; margins: internalGu * 2 }
221 height: internalGu * 6
224 height: internalGu * 6
222 width: height
225 width: height
@@ -252,29 +255,35 @@ Item {
252
255
253 Label {
256 Label {
254 id: tutorialLabel
257 id: tutorialLabel
258+ objectName: "tutorialLabel"
255 anchors { left: parent.left; top: parent.top; right: parent.right; margins: internalGu * 4; topMargin: internalGu * 10 }
259 anchors { left: parent.left; top: parent.top; right: parent.right; margins: internalGu * 4; topMargin: internalGu * 10 }
256 opacity: 0
260 opacity: 0
261+ visible: opacity > 0
257− font.pixelSize: 2.5 * internalGu
262+ font.pixelSize: 2 * internalGu
258 color: "white"
263 color: "white"
259 wrapMode: Text.WordWrap
264 wrapMode: Text.WordWrap
260 }
265 }
261
266
262 Icon {
267 Icon {
263 id: tutorialImage
268 id: tutorialImage
269+ objectName: "tutorialImage"
264 height: internalGu * 8
270 height: internalGu * 8
265 width: height
271 width: height
266 name: "input-touchpad-symbolic"
272 name: "input-touchpad-symbolic"
267 color: "white"
273 color: "white"
268 opacity: 0
274 opacity: 0
275+ visible: opacity > 0
269 anchors { top: tutorialLabel.bottom; horizontalCenter: parent.horizontalCenter; margins: internalGu * 2 }
276 anchors { top: tutorialLabel.bottom; horizontalCenter: parent.horizontalCenter; margins: internalGu * 2 }
270 }
277 }
271
278
272 Item {
279 Item {
273 id: tutorialFinger1
280 id: tutorialFinger1
281+ objectName: "tutorialFinger1"
274 width: internalGu * 5
282 width: internalGu * 5
275 height: width
283 height: width
276 property real scale: 1
284 property real scale: 1
277 opacity: 0
285 opacity: 0
286+ visible: opacity > 0
278 Rectangle {
287 Rectangle {
279 width: parent.width * parent.scale
288 width: parent.width * parent.scale
280 height: width
289 height: width
@@ -286,10 +295,12 @@ Item {
286
295
287 Item {
296 Item {
288 id: tutorialFinger2
297 id: tutorialFinger2
298+ objectName: "tutorialFinger2"
289 width: internalGu * 5
299 width: internalGu * 5
290 height: width
300 height: width
291 property real scale: 1
301 property real scale: 1
292 opacity: 0
302 opacity: 0
303+ visible: opacity > 0
293 Rectangle {
304 Rectangle {
294 width: parent.width * parent.scale
305 width: parent.width * parent.scale
295 height: width
306 height: width
@@ -301,13 +312,14 @@ Item {
301
312
302 SequentialAnimation {
313 SequentialAnimation {
303 id: tutorial
314 id: tutorial
315+ objectName: "tutorialAnimation"
304
316
305 PropertyAction { targets: [leftButton, rightButton, oskButton]; property: "enabled"; value: false }
317 PropertyAction { targets: [leftButton, rightButton, oskButton]; property: "enabled"; value: false }
306 PropertyAction { targets: [leftButton, rightButton, oskButton]; property: "opacity"; value: 0 }
318 PropertyAction { targets: [leftButton, rightButton, oskButton]; property: "opacity"; value: 0 }
307 PropertyAction { target: tutorialLabel; property: "text"; value: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the pointer.") }
319 PropertyAction { target: tutorialLabel; property: "text"; value: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the pointer.") }
308 UbuntuNumberAnimation { targets: [tutorialLabel, tutorialImage]; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
320 UbuntuNumberAnimation { targets: [tutorialLabel, tutorialImage]; property: "opacity"; to: 1; duration: UbuntuAnimation.FastDuration }
309 PropertyAction { target: tutorial; property: "paused"; value: true }
321 PropertyAction { target: tutorial; property: "paused"; value: true }
310− PauseAnimation { duration: 100 } // it takes a bit until pausing actually takes effect
322+ PauseAnimation { duration: 500 } // it takes a bit until pausing actually takes effect
311 UbuntuNumberAnimation { targets: [tutorialLabel, tutorialImage]; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
323 UbuntuNumberAnimation { targets: [tutorialLabel, tutorialImage]; property: "opacity"; to: 0; duration: UbuntuAnimation.FastDuration }
312
324
313 UbuntuNumberAnimation { target: leftButton; property: "opacity"; to: 1 }
325 UbuntuNumberAnimation { target: leftButton; property: "opacity"; to: 1 }
tests/qmltests/tst_DisabledScreenNotice.qml+36−7
@@ -101,13 +101,6 @@ Item {
101 name: "DisabledScreenNotice"
101 name: "DisabledScreenNotice"
102 when: windowShown
102 when: windowShown
103
103
104− function test_mouseAreaHidesOnFirstTap() {
105− var noticeArea = findChild(touchScreenPad, "infoNoticeArea")
106− compare(noticeArea.visible, true)
107− tap(root)
108− tryCompare(noticeArea, "visible", false)
109− }
110−
111 function test_rotation_data() {
104 function test_rotation_data() {
112 return [
105 return [
113 {tag: "portrait", selectedOrientation: 0, expectedAngle: 0},
106 {tag: "portrait", selectedOrientation: 0, expectedAngle: 0},
@@ -138,5 +131,41 @@ Item {
138 // And make sure it catches up to the expected angle
131 // And make sure it catches up to the expected angle
139 tryCompare(content, "rotation", data.expectedAngle);
132 tryCompare(content, "rotation", data.expectedAngle);
140 }
133 }
134+
135+ function test_tutorial() {
136+ var oskButton = findChild(touchScreenPad, "oskButton");
137+ var leftButton = findChild(touchScreenPad, "leftButton");
138+ var rightButton = findChild(touchScreenPad, "rightButton");
139+ var touchPad = findChild(touchScreenPad, "virtualTouchPad")
140+ var tutorial = findInvisibleChild(touchScreenPad, "tutorialAnimation")
141+ var tutorialFinger1 = findChild(touchScreenPad, "tutorialFinger1");
142+ var tutorialFinger2 = findChild(touchScreenPad, "tutorialFinger2");
143+ var tutorialLabel = findChild(touchScreenPad, "tutorialLabel");
144+ var tutorialImage = findChild(touchScreenPad, "tutorialImage");
145+
146+ // run the tutorial
147+ touchPad.runTutorial();
148+ tryCompare(tutorial, "running", true)
149+
150+ // Wait for it to pause
151+ tryCompare(tutorial, "paused", true)
152+
153+ // Click somewhere to make it continue
154+ mouseClick(root, root.width / 2, root.height /2)
155+ tryCompare(tutorial, "paused", false)
156+
157+ // Wait for it to finish
158+ tryCompare(tutorial, "running", false, 60000)
159+
160+ // Make sure after the tutorial, all the visible states are proper
161+ tryCompare(oskButton, "visible", true)
162+ tryCompare(leftButton, "visible", true)
163+ tryCompare(rightButton, "visible", true)
164+
165+ tryCompare(tutorialFinger1, "visible", false)
166+ tryCompare(tutorialFinger2, "visible", false)
167+ tryCompare(tutorialImage, "visible", false)
168+ tryCompare(tutorialLabel, "visible", false)
169+ }
141 }
170 }
142}
171}