Merge lp:~canonical-platform-qa/qtcreator-plugin-ubuntu/update_simpleui_autopilot_launch into lp:qtcreator-plugin-ubuntu

[Leo Arias]

Updated the autopilot test template.

[lp:~canonical-platform-qa/qtcreator-plugin-ubuntu/update_simpleui_autopilot_launch]

360. By Leo Arias on 2015-01-22

Reverted the changelog change.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:360
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/502/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/36/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/502/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/qtcreator-plugin-ubuntu/update_simpleui_autopilot_launch]

361. By Leo Arias on 2015-02-04

Merged with prerequisite.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:361
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/508/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/508/rebuild

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/__init__.py	2015-02-04 17:44:44 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/__init__.py	2015-02-04 17:44:44 +0000
@@ -1,18 +1,18 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 
-"""Ubuntu Touch App autopilot tests."""
+"""Ubuntu Touch App Autopilot tests."""
 
 import os
-import subprocess
-
-from autopilot import input, platform
+
+import ubuntuuitoolkit
+
+from autopilot import introspection
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
-from ubuntuuitoolkit import base, emulators
-
-
-def _get_module_include_path():
-    return os.path.join(get_path_to_source_root(), 'modules')
+from ubuntuuitoolkit import base
+
+
+PACKAGE_ID = '%ProjectName:l%.%ClickDomain:l%'
 
 
 def get_path_to_source_root():
@@ -21,51 +21,56 @@
             os.path.dirname(__file__), '..', '..', '..', '..'))
 
 
+class ApplicationCustomProxyObject(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot custom proxy object for the app."""
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        application_name = PACKAGE_ID
+        name = introspection.get_classname_from_path(path)
+        if str(name) == application_name:
+            if state['applicationName'][1] == application_name:
+                return True
+        return False
+
+    @property
+    def main_view(self):
+        return self.select_single(ubuntuuitoolkit.MainView)
+
+
 class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
+
     """Common test case that provides several useful methods for the tests."""
 
-    package_id = ''  # TODO
-    app_name = '%ProjectName%'
-
-    def setUp(self):
-        super(ClickAppTestCase, self).setUp()
-        self.pointing_device = input.Pointer(self.input_device_class.create())
-        self.launch_application()
-
-        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+    project_name = '%ProjectName%'
 
     def launch_application(self):
-        if platform.model() == 'Desktop':
-            self._launch_application_from_desktop()
-        else:
-            self._launch_application_from_phablet()
-
-    def _launch_application_from_desktop(self):
         app_qml_source_location = self._get_app_qml_source_path()
         if os.path.exists(app_qml_source_location):
-            self.app = self.launch_test_application(
-                base.get_qmlscene_launch_command(),
-                '-I' + _get_module_include_path(),
-                app_qml_source_location,
-                app_type='qt',
-                emulator_base=emulators.UbuntuUIToolkitEmulatorBase)
+            app = self._launch_application_from_source(
+                app_qml_source_location)
         else:
-            raise NotImplementedError(
-                "On desktop we can't install click packages yet, so we can "
-                "only run from source.")
+            app = self._launch_installed_application()
+
+        self.assertThat(app.main_view.visible, Eventually(Equals(True)))
+        return app
 
     def _get_app_qml_source_path(self):
         qml_file_name = 'Main.qml'
-        return os.path.join(self._get_path_to_app_source(), qml_file_name)
-
-    def _get_path_to_app_source(self):
-        return os.path.join(get_path_to_source_root(), self.app_name)
-
-    def _launch_application_from_phablet(self):
-        # On phablet, we only run the tests against the installed click
-        # package.
-        self.app = self.launch_click_package(self.pacakge_id, self.app_name)
-
-    @property
-    def main_view(self):
-        return self.app.select_single(emulators.MainView)
+        return os.path.join(self._get_path_to_project_source(), qml_file_name)
+
+    def _get_path_to_project_source(self):
+        return os.path.join(get_path_to_source_root(), self.project_name)
+
+    def _launch_application_from_source(self, app_qml_source_location):
+        return self.launch_test_application(
+            base.get_qmlscene_launch_command(),
+            app_qml_source_location,
+            app_type='qt',
+            emulator_base=ApplicationCustomProxyObject)
+
+    def _launch_installed_application(self):
+        return self.launch_click_package(
+            PACKAGE_ID, emulator_base=ApplicationCustomProxyObject)

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/test_main.py	2015-01-28 09:59:55 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/test_main.py	2015-02-04 17:44:44 +0000
@@ -2,8 +2,6 @@
 
 """Tests for the Hello World"""
 
-import os
-
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
@@ -14,11 +12,13 @@
     """Generic tests for the Hello World"""
 
     def test_initial_label(self):
-        label = self.main_view.select_single(objectName='label')
+        app = self.launch_application()
+        label = app.main_view.select_single(objectName='label')
         self.assertThat(label.text, Equals('Hello..'))
 
     def test_click_button_should_update_label(self):
-        button = self.main_view.select_single(objectName='button')
-        self.pointing_device.click_object(button)
-        label = self.main_view.select_single(objectName='label')
+        app = self.launch_application()
+        button = app.main_view.select_single(objectName='button')
+        app.pointing_device.click_object(button)
+        label = app.main_view.select_single(objectName='label')
         self.assertThat(label.text, Eventually(Equals('..world!')))

=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/run	2015-01-28 09:59:55 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/run	2015-02-04 17:44:44 +0000
@@ -7,5 +7,5 @@
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run %ProjectName%
+autopilot3 run %ProjectName%
 popd