From b394d55e851566d20fd17ba2ddc6859c3eb72f93 Mon Sep 17 00:00:00 2001 From: Pierre Equoy Date: Mon, 18 Sep 2017 11:29:52 +0800 Subject: Add after suspend jobs for related touchpad jobs It would be interesting to check that the touchpad functions still work properly after suspend. This commit adds *-after-suspend jobs (e.g. touchpad/palm-rejection-after-suspend) that can be added into test plans to check the behavior after suspending. --- jobs/touchpad.txt.in | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/jobs/touchpad.txt.in b/jobs/touchpad.txt.in index 49d74ad6..d46e6dd8 100644 --- a/jobs/touchpad.txt.in +++ b/jobs/touchpad.txt.in @@ -11,6 +11,9 @@ _description: 2. Move cursor using the touchpad. VERIFICATION: Did the cursor move? +_siblings: + [{ "id": "touchpad/basic-after-suspend", + "depends": "suspend/suspend_advanced touchpad/basic" }] plugin: user-interact category_id: com.canonical.plainbox::touchpad @@ -28,6 +31,9 @@ _description: 2. Verify that you can move the horizontal slider by moving your finger right and left in the lower part of the touchpad. VERIFICATION: Could you scroll right and left? +_siblings: + [{ "id": "touchpad/horizontal-after-suspend", + "depends": "suspend/suspend_advanced touchpad/horizontal" }] plugin: user-interact category_id: com.canonical.plainbox::touchpad @@ -45,6 +51,9 @@ _description: 2. Verify that you can move the vertical slider by moving your finger up and down in the right part of the touchpad. VERIFICATION: Could you scroll up and down? +_siblings: + [{ "id": "touchpad/vertical-after-suspend", + "depends": "suspend/suspend_advanced touchpad/vertical" }] plugin: shell category_id: com.canonical.plainbox::touchpad @@ -110,6 +119,9 @@ _description: 2. Double tap and drag the cursor across several file. VERIFICATION: Did a selection window open and were several files selected? +_siblings: + [{ "id": "touchpad/singletouch-selection-after-suspend", + "depends": "suspend/suspend_advanced touchpad/singletouch-selection" }] plugin: manual category_id: com.canonical.plainbox::touchpad @@ -126,6 +138,9 @@ _description: 3. 2-touch tap. VERIFICATION: Did the right click pop up menu appear? +_siblings: + [{ "id": "touchpad/multitouch-rightclick-after-suspend", + "depends": "suspend/suspend_advanced touchpad/multitouch-rightclick" }] plugin: user-interact category_id: com.canonical.plainbox::touchpad @@ -141,6 +156,9 @@ _description: 2. Verify that you can move the horizontal slider by moving 2 fingers right and left along the touchpad. VERIFICATION: Could you scroll right and left? +_siblings: + [{ "id": "touchpad/multitouch-horizontal-after-suspend", + "depends": "suspend/suspend_advanced touchpad/multitouch-horizontal" }] plugin: user-interact category_id: com.canonical.plainbox::touchpad @@ -156,6 +174,9 @@ _description: 2. Verify that you can move the vertical slider by moving 2 fingers up and down along the touchpad. VERIFICATION: Could you scroll up and down? +_siblings: + [{ "id": "touchpad/multitouch-vertical-after-suspend", + "depends": "suspend/suspend_advanced touchpad/multitouch-vertical" }] plugin: manual category_id: com.canonical.plainbox::touchpad @@ -171,6 +192,9 @@ _description: 2. Drag the selected folder to the desktop and remove finger from touchpad. VERIFICATION: Did a selected folder move to the desktop? +_siblings: + [{ "id": "touchpad/drag-and-drop-after-suspend", + "depends": "suspend/suspend_advanced touchpad/drag-and-drop" }] plugin: manual category_id: com.canonical.plainbox::touchpad @@ -203,6 +227,10 @@ _description: 1. 4-touch tap (tap with 4 fingers) anywhere on the touchpad VERIFICATION: Did the tap open the Dash? +_siblings: + [{ "id": "touchpad/multitouch-dash-after-suspend", + "depends": "suspend/suspend_advanced touchpad/multitouch-dash", + "_summary": "Check 4-finger tap gesture after suspend (S3)" }] plugin: shell category_id: com.canonical.plainbox::touchpad @@ -219,6 +247,9 @@ command: fi _description: This test will check if your touchpad was detected as a mouse. +_siblings: + [{ "id": "touchpad/detected-as-mouse-after-suspend", + "depends": "suspend/suspend_advanced touchpad/detected-as-mouse" }] plugin: user-interact category_id: com.canonical.plainbox::touchpad @@ -234,6 +265,9 @@ _description: You'll need to keep moving your finger on the touchpad for 10 seconds. VERIFICATION: Did the mouse cursor move without interruption? +_siblings: + [{ "id": "touchpad/continuous-move-after-suspend", + "depends": "suspend/suspend_advanced touchpad/continuous-move" }] plugin: qml category_id: com.canonical.plainbox::touchpad @@ -243,3 +277,6 @@ estimated_duration: 20 _description: This test checks if touchpad ignores palm touches qml_file: palm_rejection.qml +_siblings: + [{ "id": "touchpad/palm-rejection-after-suspend", + "depends": "suspend/suspend_advanced touchpad/palm-rejection" }] -- cgit v1.2.3 From 102539046ad3948b2eb57b7ee0da920c72bef061 Mon Sep 17 00:00:00 2001 From: Pierre Equoy Date: Mon, 18 Sep 2017 11:33:39 +0800 Subject: Replace deprecated `description` field in touchpad jobs The `description` field has been deprecated for a while, so this commit replaces it with the `purpose`, `steps` and `verificatoin` ones for the touchpad jobs. --- jobs/touchpad.txt.in | 162 ++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 86 deletions(-) diff --git a/jobs/touchpad.txt.in b/jobs/touchpad.txt.in index d46e6dd8..ed23ad21 100644 --- a/jobs/touchpad.txt.in +++ b/jobs/touchpad.txt.in @@ -3,14 +3,13 @@ category_id: com.canonical.plainbox::touchpad id: touchpad/basic requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] estimated_duration: 120.0 -_description: - PURPOSE: - Touchpad manual verification - STEPS: - 1. Make sure that touchpad is enabled. - 2. Move cursor using the touchpad. - VERIFICATION: - Did the cursor move? +_purpose: + Touchpad manual verification +_steps: + 1. Make sure that touchpad is enabled. + 2. Move cursor using the touchpad. +_verification: + Did the cursor move? _siblings: [{ "id": "touchpad/basic-after-suspend", "depends": "suspend/suspend_advanced touchpad/basic" }] @@ -23,13 +22,12 @@ requires: 'Button Horiz Wheel Left' in xinput.button_labels and 'Button Horiz Wheel Right' in xinput.button_labels command: touchpad_test right left --edge-scroll estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Touchpad horizontal scroll verification - STEPS: - 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. - 2. Verify that you can move the horizontal slider by moving your finger right and left in the lower part of the touchpad. - VERIFICATION: +_steps: + 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. + 2. Verify that you can move the horizontal slider by moving your finger right and left in the lower part of the touchpad. +_verification: Could you scroll right and left? _siblings: [{ "id": "touchpad/horizontal-after-suspend", @@ -43,13 +41,12 @@ requires: 'Button Wheel Up' in xinput.button_labels and 'Button Wheel Down' in xinput.button_labels command: touchpad_test up down --edge-scroll estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Touchpad vertical scroll verification - STEPS: - 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. - 2. Verify that you can move the vertical slider by moving your finger up and down in the right part of the touchpad. - VERIFICATION: +_steps: + 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. + 2. Verify that you can move the vertical slider by moving your finger up and down in the right part of the touchpad. +_verification: Could you scroll up and down? _siblings: [{ "id": "touchpad/vertical-after-suspend", @@ -63,7 +60,7 @@ requires: xinput.device_class == 'XITouchClass' and xinput.touch_mode != 'dependent' command: true estimated_duration: 1.2 -_description: +_purpose: Determine whether the touchpad is detected as a singletouch device automatically. plugin: shell @@ -74,7 +71,7 @@ requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] xinput.device_class == 'XITouchClass' and xinput.touch_mode == 'dependent' command: true -_description: +_purpose: Determine whether the touchpad is detected as a multitouch device automatically. plugin: manual @@ -83,27 +80,28 @@ id: touchpad/multitouch-manual requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] depends: touchpad/singletouch-automated estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Touchpad manual detection of multitouch. - STEPS: - 1. Look at the specifications for your system. - VERIFICATION: +_steps: + 1. Look at the specifications for your system. +_verification: Is the touchpad supposed to be multitouch? +_siblings: + [{ "id": "touchpad/multitouch-manual-after-suspend", + "depends": "suspend/suspend_advanced touchpad/multitouch-manual" }] plugin: manual category_id: com.canonical.plainbox::touchpad id: touchpad/singletouch-corner requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Determine that the hot corner feature is working as expected - STEPS: - 1. Launch a browser. - 2. Go to a website, and hover the cursor over a link. - 3. Tap the upper right corner on the touchpad. - VERIFICATION: +_steps: + 1. Launch a browser. + 2. Go to a website, and hover the cursor over a link. + 3. Tap the upper right corner on the touchpad. +_verification: Did the tap trigger a new tab to be opened? plugin: manual @@ -111,13 +109,12 @@ category_id: com.canonical.plainbox::touchpad id: touchpad/singletouch-selection requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Determine that the selection window function is working as expected. - STEPS: - 1. Open a file folder - 2. Double tap and drag the cursor across several file. - VERIFICATION: +_steps: + 1. Open a file folder + 2. Double tap and drag the cursor across several file. +_verification: Did a selection window open and were several files selected? _siblings: [{ "id": "touchpad/singletouch-selection-after-suspend", @@ -129,14 +126,13 @@ id: touchpad/multitouch-rightclick requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] depends: touchpad/multitouch-automated estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Determine that the right click function is working as expected. - STEPS: - 1. Open a file folder - 2. Hover cursor over file in folder - 3. 2-touch tap. - VERIFICATION: +_steps: + 1. Open a file folder + 2. Hover cursor over file in folder + 3. 2-touch tap. +_verification: Did the right click pop up menu appear? _siblings: [{ "id": "touchpad/multitouch-rightclick-after-suspend", @@ -148,13 +144,12 @@ id: touchpad/multitouch-horizontal requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] command: touchpad_test right left estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Touchpad 2-touch horizontal scroll verification - STEPS: - 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. - 2. Verify that you can move the horizontal slider by moving 2 fingers right and left along the touchpad. - VERIFICATION: +_steps: + 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. + 2. Verify that you can move the horizontal slider by moving 2 fingers right and left along the touchpad. +_verification: Could you scroll right and left? _siblings: [{ "id": "touchpad/multitouch-horizontal-after-suspend", @@ -166,13 +161,12 @@ id: touchpad/multitouch-vertical requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] command: touchpad_test up down estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Touchpad 2-touch vertical scroll verification - STEPS: - 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. - 2. Verify that you can move the vertical slider by moving 2 fingers up and down along the touchpad. - VERIFICATION: +_steps: + 1. Select "Test" when ready and place your cursor within the borders of the displayed test window. + 2. Verify that you can move the vertical slider by moving 2 fingers up and down along the touchpad. +_verification: Could you scroll up and down? _siblings: [{ "id": "touchpad/multitouch-vertical-after-suspend", @@ -183,14 +177,13 @@ category_id: com.canonical.plainbox::touchpad id: touchpad/drag-and-drop requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] estimated_duration: 120.0 -_description: - PURPOSE: +_purpose: Determine that the drag and drop function is working as expected. - STEPS: - 1. Browse to the examples folder in the current user's home directory - 2. Double tap and hold to select the "Ubuntu_Free_Culture_Showcase" folder - 2. Drag the selected folder to the desktop and remove finger from touchpad. - VERIFICATION: +_steps: + 1. Browse to the examples folder in the current user's home directory + 2. Double tap and hold to select the "Ubuntu_Free_Culture_Showcase" folder + 3. Drag the selected folder to the desktop and remove finger from touchpad. +_verification: Did a selected folder move to the desktop? _siblings: [{ "id": "touchpad/drag-and-drop-after-suspend", @@ -203,14 +196,13 @@ requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] depends: touchpad/multitouch-automated estimated_duration: 120.0 _summary: Check touchpad pinch-to-zoom gesture -_description: - PURPOSE: +_purpose: Check touchpad pinch gesture for zoom - STEPS: - 1. Open gallery-app with an image - 2. Place two fingers on the touchpad and pinch them together - 3. Place two fingers on the touchpad and move them apart - VERIFICATION: +_steps: + 1. Open gallery-app with an image + 2. Place two fingers on the touchpad and pinch them together + 3. Place two fingers on the touchpad and move them apart +_verification: Does the image zoom in and out? plugin: manual @@ -220,12 +212,11 @@ requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] depends: touchpad/multitouch-automated estimated_duration: 120.0 _summary: Check 4-finger tap gesture -_description: - PURPOSE: +_purpose: Validate that 4-touch tap is operating as expected - STEPS: - 1. 4-touch tap (tap with 4 fingers) anywhere on the touchpad - VERIFICATION: +_steps: + 1. 4-touch tap (tap with 4 fingers) anywhere on the touchpad +_verification: Did the tap open the Dash? _siblings: [{ "id": "touchpad/multitouch-dash-after-suspend", @@ -245,7 +236,7 @@ command: echo "$info" exit 1 fi -_description: +_purpose: This test will check if your touchpad was detected as a mouse. _siblings: [{ "id": "touchpad/detected-as-mouse-after-suspend", @@ -257,13 +248,12 @@ id: touchpad/continuous-move requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] estimated_duration: 12 command: qmlscene -qt5 --fullscreen $PLAINBOX_PROVIDER_DATA/touch_continuous_move_test.qml 2>&1 | grep -o PASS -_description: - PURPOSE: +_purpose: Touchpad continuous move verification - STEPS: - 1. Select "Test" when ready and continuously move your cursor within the borders of the displayed test window. - You'll need to keep moving your finger on the touchpad for 10 seconds. - VERIFICATION: +_steps: + 1. Select "Test" when ready and continuously move your cursor within the borders of the displayed test window. + You'll need to keep moving your finger on the touchpad for 10 seconds. +_verification: Did the mouse cursor move without interruption? _siblings: [{ "id": "touchpad/continuous-move-after-suspend", @@ -274,7 +264,7 @@ category_id: com.canonical.plainbox::touchpad id: touchpad/palm-rejection requires: dmi.product in ['Notebook','Laptop','Portable','Convertible'] estimated_duration: 20 -_description: +_purpose: This test checks if touchpad ignores palm touches qml_file: palm_rejection.qml _siblings: -- cgit v1.2.3