Merge lp:~cr3/checkbox/touchpad_tests into lp:checkbox

[Marc Tardif]

Merged improvements to touchpad tests by cr3.

These are the changes resulting from usability testing the touchpad tests. Once this branch is merged, the corresponding one in checkbox-certification should be merged.

[Daniel Manrique (roadmr)]

Looks good to me, thanks! Merging.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-17 13:44:17 +0000
+++ debian/changelog	2012-10-17 19:28:20 +0000
@@ -25,6 +25,8 @@
   * setup.py: added support for installing in virtualenv
   * setup.py: made build dependency on qt4-make optional
   * debian/control: Added python3-gi to run checkbox-qt.
+  * jobs/input.txt.in, jobs/touchpad.txt.in: Added input/pointing tests
+    and simplified horizontal/vertical scrolling tests.
 
   [Sean Feole]
   * [FEATURE] jobs/optical.txt.in: modified existing automation test

=== modified file 'jobs/input.txt.in'
--- jobs/input.txt.in	2012-08-20 13:55:05 +0000
+++ jobs/input.txt.in	2012-10-17 19:28:20 +0000
@@ -1,3 +1,22 @@
+plugin: local
+name: input/pointing
+requires:
+ device.category == 'MOUSE' or device.category == 'TOUCH'
+_description: Pointing device tests.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=MOUSE" -w "category=TOUCH"'
+ plugin: manual
+ name: input/pointing_`basename $path`
+ requires: device.path == "$path"
+ description:
+  PURPOSE:
+      This will test your $product device
+  STEPS:
+      1. Move the cursor with your $product.
+  VERIFICATION:
+      Did the cursor move?
+ EOF
+
 plugin: manual
 name: input/mouse
 requires: device.category == 'MOUSE' or device.category == 'TOUCH'

=== modified file 'jobs/touchpad.txt.in'
--- jobs/touchpad.txt.in	2012-09-28 21:57:21 +0000
+++ jobs/touchpad.txt.in	2012-10-17 19:28:20 +0000
@@ -4,41 +4,36 @@
  PURPOSE:
      Touchpad verification
  STEPS:
-     1. Make sure that touchpad is enabled
-     2. Try to move pointer using touchpad
-     3. Pointer should move accordingly
+     1. Make sure that touchpad is enabled.
+     2. Move cursor using the touchpad.
  VERIFICATION:
-     Did touchpad work as expected?
+     Did the cursor move?
 
 plugin: manual
 name: touchpad/horizontal
 requires: touchpad_scroll.horizontal_scroll == 'supported'
-depends: touchpad/basic
 command: touchpad_test right left
 _description:
  PURPOSE:
-     Touchpad verification
+     Touchpad horizontal scroll verification
  STEPS:
-     1. Make sure that touchpad is enabled
-     2. Select "Test" when ready and place your cursor within the borders of the displayed test window.
-     3. Verify that you can move the horizontal slider by moving your finger side by side in the lower part of the touchpad
+     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:
-     Did touchpad work as expected?
+     Could you scroll right and left?
 
 plugin: manual
 name: touchpad/vertical
 requires: touchpad_scroll.vertical_scroll == 'supported'
-depends: touchpad/basic
 command: touchpad_test up down
 _description:
  PURPOSE:
-     Touchpad verification
+     Touchpad vertical scroll verification
  STEPS:
-     1. Make sure that touchpad is enabled
-     2. Select "Test" when ready and place your cursor within the borders of the displayed test window.
-     3. Verify that you can move the vertical slider by moving your finger side by side in the right part of the touchpad
+     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:
-     Did touchpad work as expected?
+     Could you scroll up and down?
 
 plugin: shell
 name: touchpad/singletouch-automated

=== modified file 'scripts/touchpad_test'
--- scripts/touchpad_test	2012-06-11 19:14:08 +0000
+++ scripts/touchpad_test	2012-10-17 19:28:20 +0000
@@ -60,8 +60,9 @@
         self.label = self._add_label(vbox)
         button_hbox = self._add_hbox(vbox)
         validation_hbox = self._add_hbox(vbox)
-        exit_button = self._add_button(vbox, Gtk.STOCK_CLOSE)
-        exit_button.connect("clicked", lambda w: self.quit())
+        self.status = self._add_label(vbox)
+        self.exit_button = self._add_button(vbox, Gtk.STOCK_CLOSE)
+        self.exit_button.connect("clicked", lambda w: self.quit())
 
         # Add widgets for each direction.
         self.icons = {}
@@ -70,8 +71,10 @@
             self.icons[direction] = self._add_image(
                 validation_hbox, Gtk.STOCK_INDEX)
 
-        self.show_text(_("Please move the mouse cursor to this window."))
-        self.show_text(_("Then scroll in each direction on your touchpad."))
+        self.show_text(
+            _("Please move the mouse cursor to this window.") +
+            "\n" + 
+            _("Then scroll in each direction on your touchpad."))
 
     def _add_button(self, context, stock):
         button = self.button_factory(stock=stock)
@@ -124,9 +127,7 @@
 
         Gtk.main()
 
-    def quit(self, exit_code=EXIT_WITH_FAILURE):
-        self.exit_code = exit_code
-
+    def quit(self):
         # Reset touchpad settings.
         touchpad_settings = Gio.Settings.new(self.touchpad_key)
         touchpad_settings.set_boolean(
@@ -136,8 +137,10 @@
 
         Gtk.main_quit()
 
-    def show_text(self, string):
-        self.label.set_text(self.label.get_text() + "\n" + string)
+    def show_text(self, text, widget=None):
+        if widget is None:
+            widget = self.label
+        widget.set_text(text)
 
     def found_direction(self, direction):
         direction.tested = True
@@ -147,8 +150,10 @@
 
     def check_directions(self):
         if all([direction.tested for direction in self.directions]):
-            self.show_text(_("All required directions have been tested!"))
-            self.quit(EXIT_WITH_SUCCESS)
+            self.show_text(
+                _("All required directions have been tested!"), self.status)
+            self.exit_code = EXIT_WITH_SUCCESS
+            self.exit_button.grab_focus()
 
     def on_scroll(self, window, event):
         for direction in self.directions:
@@ -181,7 +186,7 @@
     try:
         scroller.run()
     except KeyboardInterrupt:
-        scroller.show_text(_("Test interrupted"))
+        scroller.show_text(_("Test interrupted"), self.status)
         scroller.quit()
 
     return scroller.exit_code