Relocate library files for wider access and re-use; also associated cleanup.

client/site_tests/factory_Camera/factory_Camera.py

 # 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 test looks in "/dev/video0" for a v4l2 video capture device,
 # and starts streaming captured frames on the monitor.
 # The observer then decides if the captured image looks good or defective,
 # pressing enter key to let it pass or tab key to fail.
 
-from autotest_lib.client.bin import test
-from autotest_lib.client.common_lib import error
-from autotest_lib.client.common_lib import factory_test
 
 import gtk
 from gtk import gdk
 import glib
 import pango
 import numpy
 
+from autotest_lib.client.bin import factory
+from autotest_lib.client.bin import factory_ui_lib as ful
+from autotest_lib.client.bin import test
+from autotest_lib.client.common_lib import error
+
 import v4l2
 
+
 DEVICE_NAME = "/dev/video0"
 PREFERRED_WIDTH = 320
 PREFERRED_HEIGHT = 240
 PREFERRED_BUFFER_COUNT = 4
 
+
 class factory_Camera(test.test):
     version = 1
     key_good = gdk.keyval_from_name('Return')
     key_bad = gdk.keyval_from_name('Tab')
 
     @staticmethod
     def get_best_frame_size(dev, pixel_format, width, height):
         """Given the preferred frame size, find a reasonable frame size the
         capture device is capable of.
 
@@ skipping 14 matching lines @@
             return min(good_sizes, key=lambda x: x[0] * x[1])
         return max(sizes, key=lambda x: x[0] * x[1])
 
     def render(self, pixels):
         numpy.maximum(pixels, 0, pixels)
         numpy.minimum(pixels, 255, pixels)
         self.pixels[:] = pixels
         self.img.queue_draw()
 
     def key_release_callback(self, widget, event):
-        factory_test.XXX_log('key_release_callback %s(%s)' %
-                             (event.keyval, gdk.keyval_name(event.keyval)))
+        factory.log('key_release_callback %s(%s)' %
+                    (event.keyval, gdk.keyval_name(event.keyval)))
         if event.keyval == self.key_good:
             self.fail = False
             gtk.main_quit()
         if event.keyval == self.key_bad:
             gtk.main_quit()
-        return factory_test.test_switch_on_trigger(event)
+        self.ft_state.exit_on_trigger(event)
+        return
 
     def register_callbacks(self, w):
         w.connect('key-release-event', self.key_release_callback)
         w.add_events(gdk.KEY_RELEASE_MASK)
 
     def run_once(self, test_widget_size=None, trigger_set=None,
                  result_file_path=None):
 
+        factory.log('%s run_once' % self.__class__)
+
         self.fail = True
 
-        factory_test.XXX_log('factory_Camera')
-
-        factory_test.init(trigger_set=trigger_set,
-                          result_file_path=result_file_path)
+        self.ft_state = ful.State(
+            trigger_set=trigger_set,
+            result_file_path=result_file_path)
 
         label = gtk.Label(
             "Press %s key if the image looks good\nPress %s otherwise"
             % (gdk.keyval_name(self.key_good),gdk.keyval_name(self.key_bad)))
 
         label.modify_font(pango.FontDescription('courier new condensed 12'))
         label.modify_fg(gtk.STATE_NORMAL, gdk.color_parse('light green'))
 
         test_widget = gtk.VBox()
         test_widget.modify_bg(gtk.STATE_NORMAL, gdk.color_parse('black'))
@@ skipping 23 matching lines @@
         self.pixbuf = gdk.Pixbuf(gdk.COLORSPACE_RGB, False, 8,
             width, height)
         self.pixels = self.pixbuf.get_pixels_array()
         self.img = gtk.image_new_from_pixbuf(self.pixbuf)
         self.test_widget.add(self.img)
         self.img.show()
 
         dev.capture_mmap_prepare(PREFERRED_BUFFER_COUNT, 2)
         dev.capture_mmap_start()
 
-        factory_test.run_test_widget(
+        self.ft_state.run_test_widget(
             test_widget=test_widget,
             test_widget_size=test_widget_size,
             window_registration_callback=self.register_callbacks)
 
         dev.capture_mmap_stop()
         dev.capture_mmap_finish()
 
         if self.fail:
             raise error.TestFail('camera test failed by user indication')
 
-        factory_test.XXX_log('exiting factory_Camera')
+        factory.log('%s run_once finished' % self.__class__)