Merge lp:~om26er/unity8/launcher_integration_test into lp:unity8

[Omer Akram]

Autopilot: launch application from the launcher

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:985
http://jenkins.qa.ubuntu.com/job/unity8-ci/3240/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/244/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2155/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3240/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:985
http://jenkins.qa.ubuntu.com/job/unity8-ci/3246/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1289
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/340
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/340/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2190
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8941

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3246/rebuild

review: Needs Fixing (continuous-integration)

[Víctor R. Ruiz (vrruiz)]

Please, use docstrings whenever possible. Specially, document a little bit what LauncherIcon class and its methods do.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:987
http://jenkins.qa.ubuntu.com/job/unity8-ci/3311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1530
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/405
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/405
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/405
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2512
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2512/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9250

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3311/rebuild

review: Needs Fixing (continuous-integration)

[Víctor R. Ruiz (vrruiz)]

Sorry, Omer. Can you describe in docstrings what the _backup_launcher_icons, _set_launcher_icons and _add_messaging_app_icon_to_launcher do? Something like "Calls to blahblah via DBus to blahblahblah".

Also, if possible, for portability would be better to use dbus python module than doing calls to the system (what if gdbus command is not available?).

review: Needs Fixing

[Omer Akram (om26er)]

> Sorry, Omer. Can you describe in docstrings what the _backup_launcher_icons,
> _set_launcher_icons and _add_messaging_app_icon_to_launcher do? Something like
> "Calls to blahblah via DBus to blahblahblah".

They all are private methods, I don't think docstrings are necessary for them.
>
> Also, if possible, for portability would be better to use dbus python module
> than doing calls to the system (what if gdbus command is not available?).

Need to investigate more on that, can you give pointers on where to look, probably an example would help.

[Víctor R. Ruiz (vrruiz)]

There is a nice tutorial here: http://dbus.freedesktop.org/doc/dbus-python/doc/tutorial.html

[Omer Akram (om26er)]

> There is a nice tutorial here: http://dbus.freedesktop.org/doc/dbus-
> python/doc/tutorial.html

Thanks for that. Now I am using python for dbus call.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:990
http://jenkins.qa.ubuntu.com/job/unity8-ci/3357/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/361/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/451/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2675/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3357/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:991
http://jenkins.qa.ubuntu.com/job/unity8-ci/3362/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1684/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/456/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/456/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/456/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2724/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3362/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

Omer, please take a look at the existing branches in review before writing a new one, or consult with ubuntu-qa.
You duplicated some of the work I did here: https://code.launchpad.net/~elopio/unity8/test_open_app_from_launcher/+merge/225112

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:993
http://jenkins.qa.ubuntu.com/job/unity8-ci/3368/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1710/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/372/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/462/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/462/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/462/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2753/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3368/rebuild

review: Needs Fixing (continuous-integration)

[lp:~om26er/unity8/launcher_integration_test]

996. By Omer Akram on 2014-07-09

merge trunk

[Michael Zanetti (mzanetti)]

see inline

review: Needs Fixing

[Michael Zanetti (mzanetti)]

one more inline comment :)

[Michael Zanetti (mzanetti)]

And more inline comments for the tests.

review: Needs Fixing

Unmerged revisions

996. By Omer Akram on 2014-07-09

merge trunk

995. By Omer Akram on 2014-07-08

merge open_app_launcher test branch

994. By Omer Akram on 2014-07-08

remove newly added test, seems some of that is already done elsewhere.

993. By Omer Akram on 2014-07-08

give the messaging-app more time to start

992. By Omer Akram on 2014-07-08

fix crazy

991. By Omer Akram on 2014-07-08

Dummy commit for CI

990. By Omer Akram on 2014-07-07

change cleanUp call

989. By Omer Akram on 2014-07-07

don't call gdbus, use the python api to talk to accountsservice.

988. By Omer Akram on 2014-07-07

merge trunk

987. By Omer Akram on 2014-07-03

add docstring for fixture class.

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2014-05-09 10:48:19 +0000
+++ qml/Launcher/LauncherDelegate.qml	2014-07-09 10:09:36 +0000
@@ -20,6 +20,7 @@
 Item {
     id: root
 
+    property string appId
     property string iconName
     property int count: -1
     property int progress: -1

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-06-23 10:21:52 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-07-09 10:09:36 +0000
@@ -148,6 +148,7 @@
                     delegate: FoldingLauncherDelegate {
                         id: launcherDelegate
                         objectName: "launcherDelegate" + index
+                        appId: model.appId
                         itemHeight: launcherListView.itemHeight
                         itemWidth: launcherListView.itemWidth
                         width: itemWidth

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-07-09 10:09:36 +0000
@@ -115,3 +115,18 @@
         self.launch_upstart_application(application_name)
         self.assertThat(greeter.created, Eventually(Equals(False)))
         self.assert_current_focused_application(application_name)
+
+    def test_click_dash_icon_must_unfocus_application(self):
+        application_name = self.launch_fake_app()
+        self.assert_current_focused_application(application_name)
+
+        self.main_window.show_dash_from_launcher()
+
+        self.assert_current_focused_application('')
+
+    def test_click_app_icon_on_dash_must_focus_it(self):
+        application_name = self.launch_fake_app()
+        self.main_window.show_dash_from_launcher()
+
+        self.main_window.launch_application(application_name)
+        self.assert_current_focused_application(application_name)

=== modified file 'tests/autopilot/unity8/shell/emulators/launcher.py'
--- tests/autopilot/unity8/shell/emulators/launcher.py	2013-11-01 13:59:50 +0000
+++ tests/autopilot/unity8/shell/emulators/launcher.py	2014-07-09 10:09:36 +0000
@@ -1,7 +1,7 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Unity Autopilot Test Suite
-# Copyright (C) 2012-2013 Canonical
+# Copyright (C) 2012, 2013, 2014 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,22 +17,65 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from unity8.shell.emulators import UnityEmulatorBase
-from autopilot.input import Touch
-
-
-class Launcher(UnityEmulatorBase):
+import logging
+
+import autopilot.logging
+
+from unity8.shell import emulators
+
+
+logger = logging.getLogger(__name__)
+
+
+class Launcher(emulators.UnityEmulatorBase):
 
     """An emulator that understands the Launcher."""
 
+    @autopilot.logging.log_action(logger.debug)
     def show(self):
-        """Swipes open the launcher."""
-        touch = Touch.create()
+        """Show the launcher swiping it to the right."""
+        if not self.shown:
+            self._swipe_launcher('right')
+            self.shown.wait_for(True)
+        else:
+            logger.debug('The launcher is already opened.')
 
+    def _swipe_launcher(self, direction):
         view = self.get_root_instance().select_single('QQuickView')
-        start_x = view.x + 1
-        start_y = view.y + view.height / 2
-        stop_x = start_x + self.panelWidth + 1
-        stop_y = start_y
-        touch.drag(start_x, start_y, stop_x, stop_y)
-        self.shown.wait_for(True)
+        start_y = stop_y = view.y + view.height // 2
+
+        left = view.x + 1
+        right = left + self.panelWidth - 1
+
+        if direction == 'right':
+            start_x = left
+            stop_x = right
+        elif direction == 'left':
+            start_x = right
+            stop_x = left
+
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+    @autopilot.logging.log_action(logger.debug)
+    def hide(self):
+        """Hide the launcher swiping it to the left."""
+        if self.shown:
+            self._swipe_launcher('left')
+            self.shown.wait_for(False)
+        else:
+            logger.debug('The launcher is already closed.')
+
+    @autopilot.logging.log_action(logger.debug)
+    def click_dash_icon(self):
+        if self.shown:
+            dash_icon = self.select_single(
+                'QQuickImage', objectName='dashItem')
+            self.pointing_device.click_object(dash_icon)
+        else:
+            raise emulators.UnityEmulatorException('The launcher is closed.')
+
+    @autopilot.logging.log_action(logger.debug)
+    def click_application_launcher_icon(self, application_name):
+        launcher_delegate = self.select_single(
+            'LauncherDelegate', appId=application_name)
+        self.pointing_device.click_object(launcher_delegate)

=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
--- tests/autopilot/unity8/shell/emulators/main_window.py	2014-05-20 18:47:15 +0000
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-07-09 10:09:36 +0000
@@ -67,9 +67,6 @@
     def get_bottombar(self):
         return self.select_single("Bottombar")
 
-    def get_launcher(self):
-        return self.select_single(Launcher)
-
     def get_pinPadLoader(self):
         return self.select_single(
             "QQuickLoader",
@@ -139,3 +136,38 @@
 
     def _get_search_indicator(self):
         return self.select_single('SearchIndicator', objectName='search')
+
+    @autopilot_logging.log_action(logger.info)
+    def show_dash_from_launcher(self):
+        """Open the dash clicking the dash icon on the launcher."""
+        launcher = self.open_launcher()
+        launcher.click_dash_icon()
+        return self.get_dash()
+
+    @autopilot_logging.log_action(logger.info)
+    def open_launcher(self):
+        launcher = self._get_launcher()
+        launcher.show()
+        return launcher
+
+    def _get_launcher(self):
+        return self.select_single(Launcher)
+
+    @autopilot_logging.log_action(logger.info)
+    def close_launcher(self):
+        launcher = self._get_launcher()
+        launcher.hide()
+
+    def is_launcher_open(self):
+        return self._get_launcher().shown
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_application(self, application_name):
+        """Launch an application.
+
+        :parameter application_name: The name of the application to launch.
+
+        """
+        launcher = self.open_launcher()
+        launcher.click_application_launcher_icon(application_name)
+        self.get_current_focused_app_id().wait_for(application_name)

=== modified file 'tests/autopilot/unity8/shell/fixture_setup.py'
--- tests/autopilot/unity8/shell/fixture_setup.py	2014-01-23 14:40:17 +0000
+++ tests/autopilot/unity8/shell/fixture_setup.py	2014-07-09 10:09:36 +0000
@@ -19,7 +19,9 @@
 
 """Set up and clean up fixtures for the Unity acceptance tests."""
 
+import dbus
 import os
+import subprocess
 import sysconfig
 
 import fixtures
@@ -51,3 +53,47 @@
                 'Expected library path does not exists: %s.' % (
                     ld_library_path))
         return ld_library_path
+
+
+class LauncherIcon(fixtures.Fixture):
+    """Fixture to setup launcher icons."""
+
+    def setUp(self):
+        super(LauncherIcon, self).setUp()
+        self._add_messaging_app_icon_to_launcher()
+
+    def _get_accounts_service_dbus_iface(self):
+        bus = dbus.SystemBus()
+        proxy = bus.get_object(
+            'org.freedesktop.Accounts',
+            '/org/freedesktop/Accounts/User32011')
+        return dbus.Interface(proxy, 'org.freedesktop.DBus.Properties')
+
+    def _backup_launcher_icons(self):
+        manager = self._get_accounts_service_dbus_iface()
+        self.backup = manager.Get(
+            'com.canonical.unity.AccountsService',
+            'launcher-items')
+        self.addCleanup(self._set_launcher_icons, self.backup)
+
+    def _set_launcher_icons(self, icons_config):
+        manager = self._get_accounts_service_dbus_iface()
+        manager.Set(
+            'com.canonical.unity.AccountsService',
+            'launcher-items', icons_config)
+
+    def _add_messaging_app_icon_to_launcher(self):
+        self._backup_launcher_icons()
+
+        messaging_icon = dbus.Array([dbus.Dictionary({
+        dbus.String('count'): dbus.Int32(0, variant_level=1),
+        dbus.String('countVisible'): dbus.Boolean(False, variant_level=1),
+        dbus.String('name'): dbus.String('Messaging', variant_level=1),
+        dbus.String('id'): dbus.String('messaging-app', variant_level=1),
+        dbus.String('icon'): dbus.String('image://theme/messaging-app',
+            variant_level=1)},
+        signature=dbus.Signature('sv'))],
+        signature=dbus.Signature('a{sv}'),
+        variant_level=1)
+        
+        self._set_launcher_icons(messaging_icon)

=== modified file 'tests/autopilot/unity8/shell/tests/disabled_test_hud.py'
--- tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-06-18 01:52:15 +0000
+++ tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-07-09 10:09:36 +0000
@@ -184,12 +184,11 @@
         unity_proxy = self.launch_unity()
         unlock_unity(unity_proxy)
         hud = self.main_window.get_hud()
-        launcher = self.main_window.get_launcher()
 
         self._launch_test_app_from_app_screen()
 
         hud.show()
-        launcher.show()
+        self.main_window.open_launcher()
 
         self.assertThat(hud.shown, Eventually(Equals(False)))
 

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-06-18 01:52:15 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-07-09 10:09:36 +0000
@@ -34,7 +34,10 @@
 
 from unity8 import process_helpers
 from unity8.shell import emulators, fixture_setup, tests
-from unity8.shell.emulators import dash as dash_emulators
+from unity8.shell.emulators import (
+    dash as dash_emulators,
+    launcher as launcher_emulator
+)
 
 
 class MainWindowTestCase(tests.UnityTestCase):
@@ -52,6 +55,24 @@
         self.assertEqual(text_field.text, 'Test')
         self.assertEqual(text_field.state, 'idle')
 
+    def test_open_launcher_must_return_launcher_custom_proxy_object(self):
+        launcher = self.main_window.open_launcher()
+        self.assertIsInstance(launcher, launcher_emulator.Launcher)
+
+    def test_open_launcher_must_open_it(self):
+        # Make sure that the launcher is closed.
+        self.main_window.close_launcher()
+        self.main_window.open_launcher()
+
+        self.assertTrue(self.main_window.is_launcher_open())
+
+    def test_close_launcher_must_close_it(self):
+        # Make sure that the launcher is open.
+        self.main_window.open_launcher()
+        self.main_window.close_launcher()
+
+        self.assertFalse(self.main_window.is_launcher_open())
+
 
 class DashBaseTestCase(tests.UnityTestCase):
 
@@ -198,3 +219,39 @@
             return filtergrid.collapsedRowCount * filtergrid.columns
         else:
             return filtergrid.uncollapsedRowCount * filtergrid.columns
+
+
+class LauncherTestCase(tests.UnityTestCase):
+
+    scenarios = tests._get_device_emulation_scenarios()
+
+    def setUp(self):
+        super(LauncherTestCase, self).setUp()
+        unity_proxy = self.launch_unity()
+        process_helpers.unlock_unity(unity_proxy)
+
+    def test_show_launcher_with_launcher_open_must_do_nothing(self):
+        launcher = self.main_window.open_launcher()
+        with mock.patch.object(launcher.pointing_device, 'drag') as mock_drag:
+            launcher.show()
+
+        self.assertFalse(mock_drag.called)
+
+    def test_hide_launcher_with_launcher_closed_must_do_nothing(self):
+        launcher = self.main_window.open_launcher()
+        launcher.hide()
+        with mock.patch.object(launcher.pointing_device, 'drag') as mock_drag:
+            launcher.hide()
+
+        self.assertFalse(mock_drag.called)
+
+    def test_click_dash_icon_with_launcher_closed_must_raise_exception(self):
+        launcher = self.main_window.open_launcher()
+        launcher.hide()
+
+        exception = self.assertRaises(
+            emulators.UnityEmulatorException,
+            launcher.click_dash_icon)
+
+        self.assertEqual(
+            'The launcher is closed.', str(exception))

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-06-18 01:52:15 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-09 10:09:36 +0000
@@ -242,8 +242,8 @@
         # the shell)
         time.sleep(1)
         self.main_window.show_dash_swiping()
-        launcher = self.main_window.get_launcher()
-        self.assertThat(launcher.shown, Eventually(Equals(False)))
+        self.assertThat(
+            self.main_window.is_launcher_open, Eventually(Equals(False)))
 
         # verify and interact with the triggered snap-decision notification
         notify_list = self._get_notifications_list()