summaryrefslogtreecommitdiff
path: root/units/touchscreen
diff options
authorMaciej Kisielewski <maciej.kisielewski@canonical.com>2018-08-20 20:38:13 +0200
committerMaciej Kisielewski <maciej.kisielewski@canonical.com>2018-08-20 22:42:18 +0200
commit90511d7514745a216dede11cd911ba94f0c378a4 (patch)
tree80b58ae1bbcbc511710efd8eff2bba36b50e95f3 /units/touchscreen
parent62fc4c729a9fc835c13a49867583c8562ea59f76 (diff)
add multi-finger tap test for non-unity system
Signed-off-by: Maciej Kisielewski <maciej.kisielewski@canonical.com>
Diffstat (limited to 'units/touchscreen')
-rw-r--r--units/touchscreen/jobs.pxu22
1 files changed, 18 insertions, 4 deletions
diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu
index b500c306..225c1689 100644
--- a/units/touchscreen/jobs.pxu
+++ b/units/touchscreen/jobs.pxu
@@ -135,19 +135,27 @@ _description:
Validate that 3-touch tap is operating as expected
STEPS:
1. Commence the test
+ {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
2. Tap the screen within the test area with 3 fingers simultaneously.
3. Once 3 fingers are on the screen you should see the indicator they are recognized.
VERIFICATION:
Did you see the green circles around the three fingers?
+ {%- else %}
+ 2. Tap the screen with 3 fingers simultaneously.
+ 3. If the tap is not detected the test will time out after 20 seconds.
+ VERIFICATION:
+ Was the tap detected?
+ {% endif %}
command:
{%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
manage_compiz_plugin unityshell disable
- {% endif %}
qmlscene -qt5 3 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS
EXIT=$?
sleep 5
- {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
manage_compiz_plugin unityshell enable
+ {%- else %}
+ timeout 20 multitap_test.py 3 || (>&2 echo "FAILED TO DETECT TAP"; false)
+ EXIT=$?
{% endif %}
exit $EXIT
@@ -163,18 +171,24 @@ _description:
Validate that 4-touch tap is operating as expected
STEPS:
1. Commence the test
+ {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
2. Tap the screen within the test area with 4 fingers simultaneously.
3. Once 4 fingers are on the screen you should see the indicator they are recognized.
VERIFICATION:
Did you see the green circles around the four fingers?
+ {%- else %}
+ 2. Tap the screen with 4 fingers simultaneously.
+ 3. If the tap is not detected the test will time out after 20 seconds.
+ {% endif %}
command:
{%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
manage_compiz_plugin unityshell disable
- {% endif %}
qmlscene -qt5 4 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS
EXIT=$?
sleep 5
- {%- if 'Unity' in __system_env__["XDG_CURRENT_DESKTOP"] %}
manage_compiz_plugin unityshell enable
+ {%- else %}
+ timeout 20 multitap_test.py 4 || (>&2 echo "FAILED TO DETECT TAP"; false)
+ EXIT=$?
{% endif %}
exit $EXIT