modify: graphic/wireless, separate touch and webcam

5 files changed, 116 insertions, 40 deletions

diff --git a/units/oem-generic-graphic.pxu b/units/oem-generic-graphic.pxu
index 768ea73..0b4f338 100644
--- a/units/oem-generic-graphic.pxu
+++ b/units/oem-generic-graphic.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.1 2020-03-11
+# Version: 1.2 2022-08-10
 id: oem-generic-graphic
 _name: OEM Generic Graphic
 unit: test plan
@@ -13,7 +13,6 @@ nested_part:
 com.canonical.certification::graphics-discrete-gpu-cert-full
 com.canonical.certification::monitor-discrete-gpu-cert-full
 com.canonical.certification::keys-cert-full
- com.canonical.certification::before-suspend-reference-cert-full
 # Test discrete card first, if present, since it's the one we will be using
 # after coming back from suspend if the system has hybrid graphics.
 com.canonical.certification::after-suspend-graphics-discrete-gpu-cert-full
@@ -22,7 +21,6 @@ nested_part:
 # restart of checkbox.
 com.canonical.certification::after-suspend-graphics-integrated-gpu-cert-full
 com.canonical.certification::after-suspend-monitor-integrated-gpu-cert-full
- com.canonical.certification::after-suspend-reference-cert-full
 com.canonical.certification::after-suspend-keys-cert-full
 # Automated Tests
 # The following tests are purely automated and/or lenghty stress tests.
@@ -42,27 +40,19 @@ exclude:
 com.canonical.certification::keys/wireless
 com.canonical.certification::keys/keyboard-backlight
 com.canonical.certification::keys/microphone-mute
- com.canonical.certification::after-suspend-manual-keys/lock-screen
- com.canonical.certification::after-suspend-manual-keys/super
- com.canonical.certification::after-suspend-manual-keys/battery-info
- com.canonical.certification::after-suspend-manual-keys/media-control
- com.canonical.certification::after-suspend-manual-keys/mute
- com.canonical.certification::after-suspend-manual-keys/volume
- com.canonical.certification::after-suspend-manual-keys/wireless
- com.canonical.certification::after-suspend-manual-keys/keyboard-backlight
- com.canonical.certification::after-suspend-manual-keys/microphone-mute
- com.canonical.certification::suspend/network_before_suspend
- com.canonical.certification::suspend/cpu_before_suspend
- com.canonical.certification::suspend/memory_before_suspend
- com.canonical.certification::suspend/bluetooth_obex_send_before_suspend
- com.canonical.certification::suspend/bluetooth_obex_browse_before_suspend
- com.canonical.certification::suspend/bluetooth_obex_get_before_suspend
- com.canonical.certification::bluetooth4/beacon_eddystone_url_.*
- com.canonical.certification::suspend/network_after_suspend
- com.canonical.certification::suspend/cpu_after_suspend
- com.canonical.certification::suspend/memory_after_suspend
- com.canonical.certification::suspend/bluetooth_detect_after_suspend
- com.canonical.certification::suspend/bluetooth_obex_send_after_suspend
- com.canonical.certification::suspend/bluetooth_obex_browse_after_suspend
- com.canonical.certification::suspend/bluetooth_obex_get_after_suspend
- com.canonical.certification::after-suspend-manual-bluetooth4/beacon_eddystone_url_.* 
+ com.canonical.certification::keys/power-button
+ com.canonical.certification::keys/power-button-event
+ com.canonical.certification::keys/fn-lock
+ com.canonical.certification::power-management/light_sensor
+ com.canonical.certification::after-suspend-power-management/light_sensor
+ com.canonical.certification::after-suspend-keys/lock-screen
+ com.canonical.certification::after-suspend-keys/super
+ com.canonical.certification::after-suspend-keys/battery-info
+ com.canonical.certification::after-suspend-keys/media-control
+ com.canonical.certification::after-suspend-keys/mute
+ com.canonical.certification::after-suspend-keys/volume
+ com.canonical.certification::after-suspend-keys/wireless
+ com.canonical.certification::after-suspend-keys/keyboard-backlight
+ com.canonical.certification::after-suspend-keys/microphone-mute
+ com.canonical.certification::after-suspend-keys/power-button
+ com.canonical.certification::after-suspend-keys/fn-lock \ No newline at end of file
diff --git a/units/oem-generic-light-sensor.pxu b/units/oem-generic-light-sensor.pxu
new file mode 100644
index 0000000..2419d42
--- /dev/null
+++ b/units/oem-generic-light-sensor.pxu
@@ -0,0 +1,8 @@
+# Version: 1.1 2022-08-10
+id: oem-generic-light-sensor
+_name: OEM Generic Light Sensor
+unit: test plan
+_description: The generic light sensor test plan for OEM projects.
+include:
+ com.canonical.certification::power-management/light_sensor
+ com.canonical.certification::after-suspend-power-management/light_sensor \ No newline at end of file
diff --git a/units/oem-generic-touch.pxu b/units/oem-generic-touch.pxu
new file mode 100644
index 0000000..e7a31fe
--- /dev/null
+++ b/units/oem-generic-touch.pxu
@@ -0,0 +1,25 @@
+# Version: 1.1 2022-08-10
+id: oem-generic-touch
+_name: OEM Generic Touch
+unit: test plan
+_description: The generic touchpad, touchscreen test plan for OEM projects.
+include:
+ com.canonical.certification::recovery_info_attachment
+nested_part:
+ com.canonical.certification::submission-cert-full
+ com.canonical.certification::input-cert-full
+ com.canonical.certification::touchpad-cert-full
+ com.canonical.certification::touchscreen-cert-full
+ com.canonical.certification::fingerprint-full
+ # suspend
+ com.canonical.certification::after-suspend-input-cert-full
+ com.canonical.certification::after-suspend-touchpad-cert-full
+ com.canonical.certification::after-suspend-touchscreen-cert-full
+ # Automated Tests
+ # The following tests are purely automated and/or lenghty stress tests.
+ # They have been moved to the end of the test run to improve the testing
+ # process.
+ com.canonical.certification::misc-client-cert-full
+ com.canonical.certification::info-attachment-cert-full
+mandatory_include:
+ com.canonical.certification::miscellanea/tester-info
diff --git a/units/oem-generic-webcam.pxu b/units/oem-generic-webcam.pxu
new file mode 100644
index 0000000..f789527
--- /dev/null
+++ b/units/oem-generic-webcam.pxu
@@ -0,0 +1,47 @@
+# Version: 1.1 2022-08-10
+id: oem-generic-webcam
+_name: OEM Generic Webcam
+unit: test plan
+_description: The generic webcam test plan for OEM projects.
+include:
+ com.canonical.certification::recovery_info_attachment
+nested_part:
+ com.canonical.certification::submission-cert-full
+ com.canonical.certification::camera-cert-full
+ com.canonical.certification::led-cert-full
+ com.canonical.ce::oem-generic-light-sensor
+ # suspend
+ com.canonical.certification::after-suspend-camera-cert-full
+ com.canonical.certification::after-suspend-led-cert-full
+ # Automated Tests
+ # The following tests are purely automated and/or lenghty stress tests.
+ # They have been moved to the end of the test run to improve the testing
+ # process.
+ com.canonical.certification::misc-client-cert-full
+ com.canonical.certification::info-attachment-cert-full
+mandatory_include:
+ com.canonical.certification::miscellanea/tester-info
+exclude:
+ com.canonical.certification::led/battery-charged
+ com.canonical.certification::led/battery-charging
+ com.canonical.certification::led/battery-low
+ com.canonical.certification::led/caps-lock
+ com.canonical.certification::led/power
+ com.canonical.certification::led/numeric-keypad
+ com.canonical.certification::led/bluetooth
+ com.canonical.certification::led/wlan
+ com.canonical.certification::led/wlan-disabled
+ com.canonical.certification::led/fn
+ com.canonical.certification::led/microphone-mute
+ com.canonical.certification::suspend/led_after_suspend/bluetooth
+ com.canonical.certification::suspend/led_after_suspend/wlan
+ com.canonical.certification::suspend/led_after_suspend/wlan-disabled
+ com.canonical.certification::suspend/led_after_suspend/battery-charged
+ com.canonical.certification::suspend/led_after_suspend/battery-charging
+ com.canonical.certification::suspend/led_after_suspend/battery-low
+ com.canonical.certification::suspend/led_after_suspend/caps-lock
+ com.canonical.certification::suspend/led_after_suspend/power
+ com.canonical.certification::suspend/led_after_suspend/numeric-keypad
+ com.canonical.certification::after-suspend-led/microphone-mute
+ com.canonical.certification::after-suspend-led/mute
+ com.canonical.certification::after-suspend-led/fn \ No newline at end of file
diff --git a/units/oem-generic-wireless.pxu b/units/oem-generic-wireless.pxu
index 6ba373b..68700ca 100644
--- a/units/oem-generic-wireless.pxu
+++ b/units/oem-generic-wireless.pxu
@@ -1,4 +1,4 @@
-# Version: 1.1.1 2020-03-11
+# Version: 1.2 2022-08-10
 id: oem-generic-wireless
 _name: OEM Generic Wireless
 unit: test plan
@@ -16,6 +16,7 @@ nested_part:
 com.canonical.certification::wireless-cert-full
 com.canonical.certification::before-suspend-reference-cert-full
 com.canonical.certification::after-suspend-reference-cert-full
+ com.canonical.certification::after-suspend-bluetooth-cert-automated
 com.canonical.certification::after-suspend-wireless-cert-full
 com.canonical.certification::after-suspend-keys-cert-full
 com.canonical.certification::info-attachment-cert-full
@@ -32,18 +33,23 @@ exclude:
 com.canonical.certification::keys/video-out
 com.canonical.certification::keys/keyboard-backlight
 com.canonical.certification::keys/microphone-mute
- com.canonical.certification::after-suspend-manual-keys/lock-screen
- com.canonical.certification::after-suspend-manual-keys/super
- com.canonical.certification::after-suspend-manual-keys/battery-info
- com.canonical.certification::after-suspend-manual-keys/brightness
- com.canonical.certification::after-suspend-manual-keys/media-control
- com.canonical.certification::after-suspend-manual-keys/mute
- com.canonical.certification::after-suspend-manual-keys/volume
- com.canonical.certification::after-suspend-manual-keys/video-out
- com.canonical.certification::after-suspend-manual-keys/keyboard-backlight
- com.canonical.certification::after-suspend-manual-keys/microphone-mute
+ com.canonical.certification::keys/power-button
+ com.canonical.certification::keys/power-button-event
+ com.canonical.certification::keys/fn-lock
+ com.canonical.certification::after-suspend-keys/lock-screen
+ com.canonical.certification::after-suspend-keys/super
+ com.canonical.certification::after-suspend-keys/battery-info
+ com.canonical.certification::after-suspend-keys/brightness
+ com.canonical.certification::after-suspend-keys/media-control
+ com.canonical.certification::after-suspend-keys/mute
+ com.canonical.certification::after-suspend-keys/volume
+ com.canonical.certification::after-suspend-keys/video-out
+ com.canonical.certification::after-suspend-keys/keyboard-backlight
+ com.canonical.certification::after-suspend-keys/microphone-mute
+ com.canonical.certification::after-suspend-keys/power-button
+ com.canonical.certification::after-suspend-keys/fn-lock
 com.canonical.certification::suspend/cpu_before_suspend
 com.canonical.certification::suspend/memory_before_suspend
- com.canonical.certification::suspend/cpu_after_suspend
- com.canonical.certification::suspend/memory_after_suspend
+ com.canonical.certification::suspend/cpu_after_suspend_auto
+ com.canonical.certification::suspend/memory_after_suspend_auto