git.iko.soy/unity8
on xenial help sign in
Update tst_MultiGreeter.qml
7bd554aDaniel d'Andrada
tests/qmltests/Greeter/tst_MultiGreeter.qml+15−15
compare with xenial
unifiedsplit
@@ -56,9 +56,9 @@ Item {
56 }
56 }
57
57
58 SignalSpy {
58 SignalSpy {
59− id: teaseSpy
59+ id: tappedSpy
60 target: greeter
60 target: greeter
61− signalName: "tease"
61+ signalName: "tapped"
62 }
62 }
63
63
64 UT.UnityTestCase {
64 UT.UnityTestCase {
@@ -323,18 +323,18 @@ Item {
323 compare(greeter.model.data(index, LightDM.UserRoles.BackgroundPathRole), "")
323 compare(greeter.model.data(index, LightDM.UserRoles.BackgroundPathRole), "")
324 }
324 }
325
325
326− function test_teasingArea_data() {
326+ function test_tappedSignal_data() {
327 return [
327 return [
328− {tag: "left", posX: units.gu(2), leftPressed: true, rightPressed: false},
328+ {tag: "left", posX: units.gu(2)},
329− {tag: "right", posX: greeter.width - units.gu(2), leftPressed: false, rightPressed: true}
329+ {tag: "right", posX: greeter.width - units.gu(2)}
330 ]
330 ]
331 }
331 }
332
332
333− function test_teasingArea(data) {
333+ function test_tappedSignal(data) {
334− teaseSpy.clear()
334+ select_user("no-password");
335+ tappedSpy.clear();
335− mouseClick(greeter, data.posX, greeter.height - units.gu(1))
336+ tap(greeter, data.posX, greeter.height - units.gu(1))
336− teaseSpy.wait()
337− tryCompare(teaseSpy, "count", 1)
337+ tryCompare(tappedSpy, "count", 1)
338 }
338 }
339
339
340 function test_teaseLockedUnlocked_data() {
340 function test_teaseLockedUnlocked_data() {
@@ -345,18 +345,18 @@ Item {
345 }
345 }
346
346
347 function test_teaseLockedUnlocked(data) {
347 function test_teaseLockedUnlocked(data) {
348− teaseSpy.clear()
348+ tappedSpy.clear()
349 greeter.locked = data.locked;
349 greeter.locked = data.locked;
350
350
351− mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
351+ tap(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
352
352
353 if (!data.locked || data.narrow) {
353 if (!data.locked || data.narrow) {
354− teaseSpy.wait()
354+ tappedSpy.wait()
355− tryCompare(teaseSpy, "count", 1);
355+ tryCompare(tappedSpy, "count", 1);
356 } else {
356 } else {
357 // waiting 100ms to make sure nothing happens
357 // waiting 100ms to make sure nothing happens
358 wait(100);
358 wait(100);
359− compare(teaseSpy.count, 0, "Greeter teasing not disabled even though it's locked.");
359+ compare(tappedSpy.count, 0, "Greeter teasing not disabled even though it's locked.");
360 }
360 }
361
361
362 // Reset value
362 // Reset value