Merge lp:~elopio/ubuntu-clock-app/qmlscene_launch into lp:ubuntu-clock-app/saucy

[Leo Arias]

Use the test case class and methods from ubuntuuitoolkit autopilot base module.

[lp:~elopio/ubuntu-clock-app/qmlscene_launch]

259. By Leo Arias on 2013-11-04

Fixed the import order.

[Christopher Lee (veebers)]

LGTM

review: Approve

[Nicholas Skaggs (nskaggs)]

veebers beat me :-)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-10-09 08:20:41 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2013-11-04 20:40:36 +0000
@@ -24,26 +24,24 @@
 import shutil
 import logging
 
-from autopilot.input import Mouse, Touch, Pointer
+from autopilot import input
 from autopilot.platform import model
-from autopilot.testcase import AutopilotTestCase
-from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntuuitoolkit import (
+    base,
+    emulators as toolkit_emulators
+)
+
 from ubuntu_clock_app import emulators
 
 logger = logging.getLogger(__name__)
 
 
-class ClockAppTestCase(AutopilotTestCase):
+class ClockAppTestCase(base.UbuntuUIToolkitAppTestCase):
 
     """A common test case class that provides several useful methods for
     calendar-app tests.
 
     """
-    if model() == 'Desktop':
-        scenarios = [('with mouse', dict(input_device_class=Mouse))]
-    else:
-        scenarios = [('with touch', dict(input_device_class=Touch))]
-
     local_location = "../../ubuntu-clock-app.qml"
     installed_location = "/usr/share/ubuntu-clock-app/ubuntu-clock-app.qml"
     sqlite_dir = os.path.expanduser(
@@ -51,8 +49,8 @@
     backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
         super(ClockAppTestCase, self).setUp()
+        self.pointing_device = input.Pointer(self.input_device_class.create())
 
         #backup and wipe db's before testing
         self.temp_move_sqlite_db()
@@ -74,14 +72,14 @@
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.local_location,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
-            "qmlscene",
+            base.get_qmlscene_launch_command(),
             self.installed_location,
             "--desktop_file_hint=/usr/share/applications/"
             "ubuntu-clock-app.desktop",