Refactory UI to grab shortcut keys, and tests to not look for triggers.

client/site_tests/factory_Display/factory_Display.py

 # -*- coding: utf-8 -*-
 #
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # DESCRIPTION :
 #
 # This is a factory test to test the LCD display.
@@ skipping 92 matching lines @@
             self._fs_window = None
             self._current_pattern_shown = True
         elif event.keyval == gtk.keysyms.Tab and self._current_pattern_shown:
             self._status_map[pattern_name] = ful.FAILED
             self.goto_next_pattern()
         elif event.keyval == gtk.keysyms.Return and self._current_pattern_shown:
             self._status_map[pattern_name] = ful.PASSED
             self.goto_next_pattern()
         elif event.keyval == ord('Q'):
             gtk.main_quit()
-        else:
-            self._ft_state.exit_on_trigger(event)
         self._test_widget.queue_draw()
         return True
 
     def label_status_expose(self, widget, event, name=None):
         status = self._status_map[name]
         widget.set_text(status)
         widget.modify_fg(gtk.STATE_NORMAL, ful.LABEL_COLORS[status])
 
     def make_pattern_label_box(self, name):
 
@@ skipping 15 matching lines @@
         eb.modify_bg(gtk.STATE_NORMAL, ful.BLACK)
         eb.add(hbox)
         return eb
 
     def register_callbacks(self, window):
         window.connect('key-press-event', self.key_press_callback)
         window.add_events(gdk.KEY_PRESS_MASK)
         window.connect('key-release-event', self.key_release_callback)
         window.add_events(gdk.KEY_RELEASE_MASK)
 
-    def run_once(self,
-                 test_widget_size=None,
-                 trigger_set=None):
+    def run_once(self):
 
         factory.log('%s run_once' % self.__class__)
 
-        self._ft_state = ful.State(trigger_set)
-
         self._pattern_queue = [x for x in reversed(_PATTERN_LIST)]
         self._status_map = dict((n, ful.UNTESTED) for n, f in _PATTERN_LIST)
 
         self._prompt_label = ful.make_label(_MESSAGE_STR, alignment=(0.5, 0.5))
 
         vbox = gtk.VBox()
         vbox.pack_start(self._prompt_label, False, False)
 
         for name, cb_fun in _PATTERN_LIST:
             label_box = self.make_pattern_label_box(name)
             vbox.pack_start(label_box, False, False)
 
         test_widget = gtk.EventBox()
         test_widget.modify_bg(gtk.STATE_NORMAL, ful.BLACK)
         test_widget.add(vbox)
         self._test_widget = test_widget
 
         self.goto_next_pattern()
 
         self._fs_window = None
 
-        self._ft_state.run_test_widget(
-            test_widget=test_widget,
-            test_widget_size=test_widget_size,
+        ful.run_test_widget(self.job, test_widget,
             window_registration_callback=self.register_callbacks)
 
         failed_set = set(name for name, status in self._status_map.items()
                          if status is not ful.PASSED)
         if failed_set:
             raise error.TestFail('some patterns failed\n' \
                                  '以下圖樣測試未通過: %s' %
                                  ', '.join(failed_set))
 
         factory.log('%s run_once finished' % self.__class__)