Merge lp:~om26er/ubuntu-weather-app/port_autopilot_1.3 into lp:ubuntu-weather-app/obsolete.trunk

[Omer Akram]

Port autopilot tests to 1.3

Port autopilot tests to 1.3

[Martin Borho (martin-borho)]

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-04-22 13:20:27 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-05-31 13:26:50 +0000
@@ -10,24 +10,32 @@
 import os.path
 import glob
 
-from autopilot.introspection.qt import QtIntrospectionTestMixin
+from autopilot.input import Mouse, Touch, Pointer
+from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 
 from ubuntu_weather_app.emulators.main_window import MainWindow
 
 
-class WeatherTestCase(AutopilotTestCase, QtIntrospectionTestMixin):
+class WeatherTestCase(AutopilotTestCase):
 
     """A common test case class that provides several useful methods for
        weather 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-weather-app.qml"
+
     def setUp(self):
+        self.pointing_device = Pointer(self.input_device_class.create())
         super(WeatherTestCase, self).setUp()
-        # Lets assume we are installed system wide if this file is in /usr
-        if os.path.realpath(__file__).startswith("/usr/"):
+        if os.path.exists(self.local_location):
+            self.launch_test_local()
+        else:
             self.launch_test_installed()
-        else:
-            self.launch_test_local()
 
     """Workaround to find the qmlscene binary via shell globbing.
        This is needed since we can't rely on qt5-default being installed on
@@ -36,16 +44,17 @@
         return glob.glob("/usr/lib/*/qt5/bin/qmlscene")[0]
 
     def launch_test_local(self):
-        self.app = self.launch_test_application(self.qmlscene(),
-                                                "../../ubuntu-weather-app.qml")
+        self.app = self.launch_test_application(
+            self.qmlscene(),
+            self.local_location,
+            app_type='qt')
 
     def launch_test_installed(self):
-        main_qml = "/usr/share/ubuntu-weather-app/ubutnu-weather-app.qml"
-        self.app = self.launch_test_application(self.qmlscene(), main_qml)
-
-    @staticmethod
-    def running_on_device():
-        return os.path.isfile('/system/usr/idc/autopilot-finger.idc')
+        self.app = self.launch_test_application(
+            self.qmlscene(),
+            "/usr/share/ubuntu-weather-app/ubuntu-weather-app.qml",
+            "--desktop_file_hint=/usr/share/applications/ubuntu-weather-app.desktop",
+            app_type='qt')
 
     @property
     def main_window(self):
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-04-22 13:20:27 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-05-31 13:26:50 +0000
@@ -22,8 +22,8 @@
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestMainView, self).setUp()
-        self.assertThat(self.main_window.get_qml_view().visible,
-                        Eventually(Equals(True)))
+        self.assertThat(
+            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestMainView, self).tearDown()