Merge lp:~om26er/phone-app/port_autopilot_1.3 into lp:phone-app

[Omer Akram]

port the phone-app autopilot tests to 1.3

port the phone-app autopilot tests to 1.3

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:647
http://jenkins.qa.ubuntu.com/job/phone-app-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/69

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/96/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good.

review: Approve

=== modified file 'tests/autopilot/phone_app/tests/__init__.py'
--- tests/autopilot/phone_app/tests/__init__.py	2013-04-05 20:01:45 +0000
+++ tests/autopilot/phone_app/tests/__init__.py	2013-05-03 18:28:28 +0000
@@ -9,16 +9,16 @@
 
 """Phone App autopilot tests."""
 
-from autopilot.introspection.qt import QtIntrospectionTestMixin
+from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
+from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
+from testtools.matchers import Equals
 
 from phone_app.emulators.call_panel import CallPanel
 from phone_app.emulators.communication_panel import CommunicationPanel
 from phone_app.emulators.contacts_panel import ContactsPanel
 
-from testtools.matchers import Equals
-from autopilot.matchers import Eventually
-
 import os
 
 import logging
@@ -26,30 +26,50 @@
 logger = logging.getLogger(__name__)
 
 
-class PhoneAppTestCase(AutopilotTestCase, QtIntrospectionTestMixin):
+class PhoneAppTestCase(AutopilotTestCase):
     """A common test case class that provides several useful methods for
     Phone App tests.
 
     """
+
+    if model() == 'Desktop':
+        scenarios = [
+        ('with mouse', dict(input_device_class=Mouse)),
+        ]
+    else:
+        scenarios = [
+        ('with touch', dict(input_device_class=Touch)),
+        ]
+
+    local_location = "../../src/phone-app"
+
     def setUp(self):
+        self.pointing_device = Pointer(self.input_device_class.create())
         super(PhoneAppTestCase, self).setUp()
 
-        # Lets assume we are installed system wide if this file is somewhere 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()
 
         main_view = self.get_main_view()
         self.assertThat(main_view.visible, Eventually(Equals(True)))
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
-            "../../src/phone-app", "--test-contacts")
+            self.local_location, "--test-contacts", app_type='qt')
 
     def launch_test_installed(self):
-        self.app = self.launch_test_application(
-               "phone-app", "--test-contacts")
+        if model() == 'Desktop':
+            self.app = self.launch_test_application(
+                "phone-app",
+                "--test-contacts")
+        else:
+            self.app = self.launch_test_application(
+               "phone-app", 
+               "--test-contacts",
+               "--desktop_file_hint=/usr/share/applications/phone-app.desktop",
+               app_type='qt')
 
     def get_main_view(self):
         return self.app.select_single("QQuickView")

=== modified file 'tests/autopilot/phone_app/tests/test_call_panel.py'
--- tests/autopilot/phone_app/tests/test_call_panel.py	2013-03-12 20:48:18 +0000
+++ tests/autopilot/phone_app/tests/test_call_panel.py	2013-05-03 18:28:28 +0000
@@ -11,8 +11,8 @@
 
 from __future__ import absolute_import
 
+from autopilot.matchers import Eventually
 from testtools.matchers import Equals
-from autopilot.matchers import Eventually
 
 from phone_app.tests import PhoneAppTestCase
 

=== modified file 'tests/autopilot/phone_app/tests/test_communication_panel.py'
--- tests/autopilot/phone_app/tests/test_communication_panel.py	2013-03-22 18:57:54 +0000
+++ tests/autopilot/phone_app/tests/test_communication_panel.py	2013-05-03 18:28:28 +0000
@@ -11,8 +11,8 @@
 
 from __future__ import absolute_import
 
+from autopilot.matchers import Eventually
 from testtools.matchers import Equals
-from autopilot.matchers import Eventually
 
 from phone_app.tests import PhoneAppTestCase
 

=== modified file 'tests/autopilot/phone_app/tests/test_contacts_panel.py'
--- tests/autopilot/phone_app/tests/test_contacts_panel.py	2013-03-12 20:48:18 +0000
+++ tests/autopilot/phone_app/tests/test_contacts_panel.py	2013-05-03 18:28:28 +0000
@@ -11,8 +11,8 @@
 
 from __future__ import absolute_import
 
+from autopilot.matchers import Eventually
 from testtools.matchers import Equals, GreaterThan
-from autopilot.matchers import Eventually
 
 from phone_app.tests import PhoneAppTestCase