Unity 8

Merge lp:~elopio/unity8/test_open_dash into lp:unity8

test_open_dash
Merge into trunk

Proposed by Leo Arias on 2014-06-26

Status:	Superseded
Proposed branch:	lp:~elopio/unity8/test_open_dash
Merge into:	lp:unity8
Prerequisite:	lp:~elopio/unity8/flake8
Diff against target:	154 lines (+64/-20) 5 files modified tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py (+8/-0) tests/autopilot/unity8/shell/emulators/launcher.py (+34/-13) tests/autopilot/unity8/shell/emulators/main_window.py (+19/-3) tests/autopilot/unity8/shell/tests/disabled_test_hud.py (+1/-2) tests/autopilot/unity8/shell/tests/test_notifications.py (+2/-2)
To merge this branch:	bzr merge lp:~elopio/unity8/test_open_dash
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-11
Albert Astals Cid (community)		2014-06-26	Needs Fixing on 2014-07-10
Review via email: mp+224553@code.launchpad.net

This proposal has been superseded by a proposal from 2014-07-21.

Commit message

Added autopilot helpers and tests for the launcher and dash icon.

Description of the change

This branch adds the helpers we need to make a regression test for bug #1090358, so that even with the osk open we can go back to the dash with the icon.

* Are there any related MPs required for this MP to build/function as expected? Please list.

Only the prerequisite that fixes static errors: https://code.launchpad.net/~elopio/unity8/flake8

* Did you perform an exploratory manual test run of your code change and any related functionality?

More or less. I didn't change any functionality, but I did run the tests I added and did some exploratory on the related properties and components.

* Did you make sure that your branch does not contain spurious tags?

Yes I did.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

No debian changes.

* If you changed the UI, has there been a design review?

No UI changes.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-26:

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

review: Needs Fixing (continuous-integration)

lp:~elopio/unity8/test_open_dash updated on 2014-06-27

990. By Leo Arias on 2014-06-27: Merged with prerequisite.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-28:

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

review: Needs Fixing (continuous-integration)

lp:~elopio/unity8/test_open_dash updated on 2014-07-08

991. By Leo Arias on 2014-07-08: Merged with staging.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-08:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-09:

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

review: Needs Fixing (continuous-integration)

lp:~elopio/unity8/test_open_dash updated on 2014-07-09

992. By Leo Arias on 2014-07-09: Removed the tests for some code paths and preconditions for the life cycle test.
993. By Leo Arias on 2014-07-09: Remove the swipe to the left.
994. By Leo Arias on 2014-07-09: Brough back the is_launcher_open.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-09:

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

review: Approve (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-07-10:

Text conflict in tests/autopilot/unity8/shell/emulators/main_window.py
1 conflicts encountered.

review: Needs Fixing

lp:~elopio/unity8/test_open_dash updated on 2014-07-10

995. By Leo Arias on 2014-07-10: Merged with trunk.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

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

review: Approve (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Leo Arias

Mohammad Rakibul Hasan

Unity Team

 === 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-10 14:20:25 +0000
@@ -115,3 +115,11 @@
          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('')
 === 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-10 14:20:25 +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,43 @@
  # 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_to_show_launcher()
++            self.shown.wait_for(True)
++        else:
++            logger.debug('The launcher is already opened.')
++    def _swipe_to_show_launcher(self):
          view = self.get_root_instance().select_single('QQuickView')
++        start_y = stop_y = view.y + view.height // 2
++
          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)
++        stop_x = start_x + self.panelWidth - 1
++
++        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
++
++    @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.')
 === modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
 --- tests/autopilot/unity8/shell/emulators/main_window.py	2014-07-09 13:16:20 +0000
 +++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-07-10 14:20:25 +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",
@@ -134,3 +131,22 @@
      @autopilot_logging.log_action(logger.info)
      def search(self, query):
          self.get_dash().enter_search_query(query)
++
++    @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)
++
++    def is_launcher_open(self):
++        return self._get_launcher().shown
 === 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-10 14:20:25 +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_notifications.py'
 --- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-07 08:51:33 +0000
 +++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-10 14:20:25 +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()