git.iko.soy/unity8
on xenial help sign in
Trying to get notification's qmltest working for the SwipeToAct-widget.
71c42edMirco Müller
cmake/modules/QmlTest.cmake+1−1
compare with xenial
unifiedsplit
@@ -118,7 +118,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
118
118
119 set(qmltest_command
119 set(qmltest_command
120 env ${test_env} ${qmltest_ENVIRONMENT}
120 env ${test_env} ${qmltest_ENVIRONMENT}
121− ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
121+ ${qmltestrunner_exe} -eventdelay 500 -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
122 ${qmltestrunner_imports}
122 ${qmltestrunner_imports}
123 ${ITERATIONS_STRING}
123 ${ITERATIONS_STRING}
124 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
124 -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
qml/Notifications/SwipeToAct.qml+1
@@ -263,6 +263,7 @@ Item {
263
263
264 MouseArea {
264 MouseArea {
265 id: mouseArea
265 id: mouseArea
266+ objectName: "swipeMouseArea"
266
267
267 anchors.fill: row
268 anchors.fill: row
268 drag.target: slider
269 drag.target: slider
tests/qmltests/Notifications/tst_Notifications.qml+7−6
@@ -536,11 +536,12 @@ Item {
536 if(data.hasSwipeToAct) {
536 if(data.hasSwipeToAct) {
537 var swipeButton = findChild(buttonRow, "notify_swipe_button")
537 var swipeButton = findChild(buttonRow, "notify_swipe_button")
538 var slider = findChild(swipeButton, "slider")
538 var slider = findChild(swipeButton, "slider")
539− var x = slider.x + slider.width / 2
539+ var swipeMouseArea = findChild(buttonRow, "swipeMouseArea")
540+ var x = swipeMouseArea.width / 2
540− var y = slider.y + slider.height / 2
541+ var y = swipeMouseArea.height / 2
541− mousePress(slider, x, y)
542+ mousePress(swipeMouseArea, x, y, Qt.LeftButton, Qt.NoModifier, 0)
542− mouseMove(slider, x + units.gu(15), y)
543+ mouseMove(swipeMouseArea, x + units.gu(15), y)
543− mouseRelease(slider)
544+ mouseRelease(swipeMouseArea, x + units.gu(15), y)
544 } else {
545 } else {
545 var buttonCancel = findChild(buttonRow, "notify_button1")
546 var buttonCancel = findChild(buttonRow, "notify_button1")
546 var buttonAccept = findChild(buttonRow, "notify_button0")
547 var buttonAccept = findChild(buttonRow, "notify_button0")
@@ -559,7 +560,7 @@ Item {
559 tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
560 tryCompareFunction(function() { mouseClick(buttonAccept, buttonAccept.width / 2, buttonAccept.height / 2); return actionSpy.signalArguments.length > 0; }, true);
560 compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
561 compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")
561 actionSpy.clear()
562 actionSpy.clear()
562− (notification)
563+ waitForRendering (notification)
563
564
564 // check if there's a ComboButton created due to more actions being passed
565 // check if there's a ComboButton created due to more actions being passed
565 if (data.actions.length > 2) {
566 if (data.actions.length > 2) {