Merge lp:~elopio/click-update-manager/fix1234379-autopilot_tests into lp:click-update-manager

[Leo Arias]

Cleaned the autopilot test cases.

[lp:~elopio/click-update-manager/fix1234379-autopilot_tests]

32. By Leo Arias on 2013-10-04

Fixed pyflakes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:32
http://jenkins.qa.ubuntu.com/job/click-update-manager-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-update-manager-saucy-armhf-ci/28

Click here to trigger a rebuild:
http://s-jenkins:8080/job/click-update-manager-ci/28/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~elopio/click-update-manager/fix1234379-autopilot_tests]

33. By Leo Arias on 2013-10-07

Fixed the install desktop path.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://10.97.0.26:8080/job/click-update-manager-ci/32/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/click-update-manager-saucy-amd64-ci/32
    SUCCESS: http://10.97.0.26:8080/job/click-update-manager-saucy-armhf-ci/32

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/click-update-manager-ci/32/rebuild

review: Approve (continuous-integration)

[Corey Goldberg (coreygoldberg)]

looks very good.
one small nitpick:

197 + self.app = self.launch_test_application(
198 + '/usr/lib/' + arch + '/qt5/bin/qmlscene',
199 + "-I" + _get_module_include_path(),

... should probably use os.path.join() instead of appending strings so it matches the rest of code style.

[lp:~elopio/click-update-manager/fix1234379-autopilot_tests]

34. By Leo Arias on 2013-10-07

Used os.path.join for the qmlscene path, as suggested by cgoldberg.

[Corey Goldberg (coreygoldberg)]

LGTM.

review: Approve

=== modified file 'tests/autopilot/click_update_manager/__init__.py'
--- tests/autopilot/click_update_manager/__init__.py	2013-10-01 21:01:04 +0000
+++ tests/autopilot/click_update_manager/__init__.py	2013-10-07 15:10:34 +0000
@@ -2,128 +2,96 @@
 
 """Ubuntu Touch App autopilot tests."""
 
-from os import remove
-import os.path
+import os
+import shutil
 import subprocess
-from tempfile import mktemp
 
-from autopilot.input import Mouse, Touch, Pointer
+from autopilot.input import Pointer
 from autopilot.matchers import Eventually
-from autopilot.platform import model
-from autopilot.testcase import AutopilotTestCase
-from testtools.matchers import Is, Not, Equals
-
-
-def get_module_include_path():
+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')
+
+
+def _get_path_to_source_root():
     return os.path.abspath(
         os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            'modules')
-        )
-
-
-class UbuntuTouchAppTestCase(AutopilotTestCase):
-    """A common test case class that provides several
-       useful methods for the tests.
-    """
-
-    if model() == 'Desktop':
-        scenarios = [
-            ('with mouse', dict(input_device_class=Mouse))
-        ]
-    else:
-        scenarios = [
-            ('with touch', dict(input_device_class=Touch))
-        ]
-
-    @property
-    def main_window(self):
-        return MainWindow(self.app)
+            os.path.dirname(__file__), '..', '..', '..'))
+
+
+def _get_local_desktop_file_directory():
+    return os.path.join(os.environ['HOME'], '.local', 'share', 'applications')
+
+
+class ClickUpdateManagerTestCase(base.UbuntuUIToolkitAppTestCase):
+
+    qml_file_name = 'updatemanager.qml'
+    path_to_installed_app = '/usr/share/click-update-manager/'
+    desktop_file_name = 'click-update-manager.desktop'
+    path_to_installed_desktop_file = '/usr/share/applications/'
+    local_desktop_file_path = None
 
     def setUp(self):
-        super(UbuntuTouchAppTestCase, self).setUp()
+        super(ClickUpdateManagerTestCase, self).setUp()
         self.pointing_device = Pointer(self.input_device_class.create())
-        self.launch_test_qml()
-
-    def launch_test_qml(self):
-        # If the test class has defined a 'test_qml' class attribute then we
-        # write it to disk and launch it inside the QML Scene. If not, then we
-        # silently do nothing (presumably the test has something else planned).
-        arch = subprocess.check_output(["dpkg-architecture",
-                                        "-qDEB_HOST_MULTIARCH"]).strip()
-        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
-            qml_path = mktemp(suffix='.qml')
-            with open(qml_path, 'w') as f:
-                f.write(self.test_qml)
-            self.addCleanup(remove, qml_path)
-
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        if hasattr(self, 'test_qml_file') and \
-                isinstance(self.test_qml_file, basestring):
-            qml_path = self.test_qml_file
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-
-        return self.app.select_single("QQuickView")
-
-    def get_mainview(self):
-        """Get the QML MainView"""
-
-        mainView = self.app.select_single("MainView")
-        self.assertThat(mainView, Not(Is(None)))
-        return mainView
-
-    def get_object(self, objectName):
-        """Get a object based on the objectName"""
-
-        obj = self.app.select_single(objectName=objectName)
-        self.assertThat(obj, Not(Is(None)))
-        return obj
-
-    def mouse_click(self, objectName):
-        """Move mouse on top of the object and click on it"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.click()
-
-    def mouse_press(self, objectName):
-        """Move mouse on top of the object and press
-           mouse button (without releasing it)
-        """
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-    def mouse_release(self):
-        """Release mouse button"""
-
-        self.pointing_device.release()
-
-    def type_string(self, string):
-        """Type a string with keyboard"""
-
-        self.keyboard.type(string)
-
-    def type_key(self, key):
-        """Type a single key with keyboard"""
-
-        self.keyboard.key(key)
+        self.app_qml_source_path = os.path.join(
+            _get_path_to_source_root(), self.qml_file_name)
+        self.test_qml_file_path = self._get_test_qml_file_path()
+        self.desktop_file_path = self._get_desktop_file_path()
+        self.launch_application()
+
+    def _get_test_qml_file_path(self):
+        if self._application_source_exists():
+            return self.app_qml_source_path
+        else:
+            return os.path.join(
+                self.path_to_installed_app, self.qml_file_name)
+
+    def _application_source_exists(self):
+        return os.path.exists(self.app_qml_source_path)
+
+    def _get_desktop_file_path(self):
+        if self._application_source_exists():
+            local_desktop_file_dir = _get_local_desktop_file_directory()
+            if not os.path.exists(local_desktop_file_dir):
+                os.makedirs(local_desktop_file_dir)
+            source_desktop_file_path = os.path.join(
+                _get_path_to_source_root(), self.desktop_file_name)
+            local_desktop_file_path = os.path.join(
+                local_desktop_file_dir, self.desktop_file_name)
+            shutil.copy(source_desktop_file_path, local_desktop_file_path)
+            # We can't delete the desktop file before we close the application,
+            # so we save it on an attribute to be deleted on tear down.
+            self.local_desktop_file_path = local_desktop_file_path
+            return local_desktop_file_path
+        else:
+            return os.path.join(
+                self.path_to_installed_desktop_file, self.desktop_file_name)
+
+    def launch_application(self):
+        arch = subprocess.check_output(
+            ["dpkg-architecture", "-qDEB_HOST_MULTIARCH"]).strip()
+        self.app = self.launch_test_application(
+            os.path.join('/usr/lib', arch, 'qt5/bin/qmlscene'),
+            '-I' + _get_module_include_path(),
+            self.test_qml_file_path,
+            '--desktop_file_hint={0}'.format(self.desktop_file_path),
+            emulator_base=emulators.UbuntuUIToolkitEmulatorBase,
+            app_type='qt')
+
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
+
+    def tearDown(self):
+        super(ClickUpdateManagerTestCase, self).tearDown()
+        # We can't delete the desktop file before we close the application,
+        # so we save it on an attribute to be deleted on tear down.
+        if self.local_desktop_file_path is not None:
+            os.remove(self.local_desktop_file_path)
+
+    @property
+    def main_view(self):
+        return self.app.select_single(emulators.MainView)

=== removed directory 'tests/autopilot/click_update_manager/main'
=== removed file 'tests/autopilot/click_update_manager/main/__init__.py'
--- tests/autopilot/click_update_manager/main/__init__.py	2013-09-20 20:11:40 +0000
+++ tests/autopilot/click_update_manager/main/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-""" Update Manager test suite """

=== renamed file 'tests/autopilot/click_update_manager/main/test_main.py' => 'tests/autopilot/click_update_manager/test_main.py'
--- tests/autopilot/click_update_manager/main/test_main.py	2013-10-02 20:30:41 +0000
+++ tests/autopilot/click_update_manager/test_main.py	2013-10-07 15:10:34 +0000
@@ -2,36 +2,27 @@
 
 """Tests for PageUpdate"""
 
-import os
-
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
-from click_update_manager import UbuntuTouchAppTestCase
-
-
-class PageUpdateTests(UbuntuTouchAppTestCase):
+import click_update_manager
+
+
+class PageUpdateTestCase(click_update_manager.ClickUpdateManagerTestCase):
     """Page Update Tests."""
 
-    test_qml_file = "/usr/share/click-update-manager/updatemanager.qml"
-
-    def test_UI_is_loaded(self):
-        """Must be able to see the mainview."""
-
-        mainView = self.get_mainview()
-        self.assertThat(mainView.visible, Eventually(Equals(True)))
-
     def test_loading_disappear(self):
         """Check the loading indicator disappears"""
 
-        loading = self.get_object(objectName="loadingIndicator")
+        loading = self.main_view.select_single(objectName="loadingIndicator")
         self.assertThat(loading.visible, Eventually(Equals(False)))
 
     def test_check_again(self):
         """Check the loading indicator disappears"""
 
-        loading = self.get_object(objectName="loadingIndicator")
+        loading = self.main_view.select_single(objectName="loadingIndicator")
         self.assertThat(loading.visible, Eventually(Equals(False)))
-        self.mouse_click(objectName="retryButton")
+        retry_button = self.main_view.select_single(objectName="retryButton")
+        self.pointing_device.click_object(retry_button)
         self.assertThat(loading.visible, Eventually(Equals(True)))
         self.assertThat(loading.visible, Eventually(Equals(False)))