Unity 8

Merge lp:~elopio/unity8/url-dispatcher_test into lp:unity8

url-dispatcher_test
Merge into trunk

Proposed by Leo Arias on 2014-02-05

Status:	Merged
Approved by:	Albert Astals Cid on 2014-02-12
Approved revision:	700
Merged at revision:	707
Proposed branch:	lp:~elopio/unity8/url-dispatcher_test
Merge into:	lp:unity8
Diff against target:	633 lines (+213/-77) 9 files modified debian/control (+2/-0) tests/autopilot/unity8/__init__.py (+16/-12) tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py (+9/-13) tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py (+116/-0) tests/autopilot/unity8/process_helpers.py (+9/-7) tests/autopilot/unity8/shell/emulators/main_window.py (+47/-29) tests/autopilot/unity8/shell/tests/__init__.py (+8/-6) tests/autopilot/unity8/shell/tests/test_hud.py (+4/-7) tests/autopilot/unity8/shell/tests/test_notifications.py (+2/-3)
To merge this branch:	bzr merge lp:~elopio/unity8/url-dispatcher_test
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Approve on 2014-02-12
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-02-12
Michael Terry		2014-02-05	Approve on 2014-02-07
Richard Huddie		2014-02-05	Pending
Víctor R. Ruiz		2014-02-05	Pending
Javier Collado		2014-02-05	Pending
Ubuntu Unity PS integration team		2014-02-05	Pending
Review via email: mp+205037@code.launchpad.net

Commit message

Added a test to swipe out an application started by url-dispatcher.

Description of the change

The branch is a little big because I refactored the MainWindow, so we could use it as the rest of emulators. That makes it clearer, and we don't have to instantiate the pointing device again.

Please note that this test uses the real applications manager.

* Are there any related MPs required for this MP to build/function as expected? No, there are not.
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP? Yes.
* If you changed the UI, has there been a design review? I didn't change the UI.

Revision history for this message

Michael Terry (mterry) wrote on 2014-02-05:

Some quick nits before I get into testing this:

"it while the url-dispatcher implements" -> Do you mean "it until the url-dispatcher implements"?

The whitespace change in tests/autopilot/unity8/shell/emulators/__init__.py isn't needed, eh? pep8 has two empty lines before a class definition I thought.

Revision history for this message

Leo Arias (elopio) wrote on 2014-02-05:

Right, thanks for catching those things. Fixed and pushed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-02-05:

Taking a look at the error...

Revision history for this message

Leo Arias (elopio) wrote on 2014-02-06:

Setting again for review, to see how jenkins goes this time.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-02-06:

As discussed on IRC, to actually hit the code path that we want, we'll need to launch settings:///system/online-accounts, which means depending on system settings and online accounts... :-/ Probably an acceptable cost, until we get a more general place to dump cross-component tests like this.

Revision history for this message

Leo Arias (elopio) wrote on 2014-02-06:

Yes, the thing is that I can't launch online accounts, even without the mocks.
Sometimes I can launch the camera app, so I was checking if jenkins could do it too. It seems it can't :(
I'm going to have lunch, and then back to try some more things. This new deb makes things easier to debug.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-02-07:

Refactoring seems fine. Test works for me.

* Did you perform an exploratory manual test run of the code change and any related functionality?
- Yes. Ran test manually.
* Did CI run pass? If not, please explain why.
- Yup!

review: Approve

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-11:

Doesn't cleanly merge into trunk anymore.

Please remerge.

review: Needs Fixing

lp:~elopio/unity8/url-dispatcher_test updated on 2014-02-12

700. By Leo Arias on 2014-02-12: Merged with trunk.

Revision history for this message

Leo Arias (elopio) wrote on 2014-02-12:

Merged and solved the conflict.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-12:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-12:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-12:

Ok, back on

review: Approve

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 'debian/control'
 --- debian/control	2014-02-04 14:08:24 +0000
 +++ debian/control	2014-02-12 06:11:39 +0000
@@ -111,8 +111,10 @@
           python-fixtures,
           python-gi,
           python-mock,
++         ubuntu-ui-toolkit-autopilot,
           unity8 (>= ${source:Version}),
           unity8-fake-env (>= ${source:Version}),
++         url-dispatcher-tools,
           ${misc:Depends},
           ${python:Depends},
           ${shlibs:Depends},
 === modified file 'tests/autopilot/unity8/__init__.py'
 --- tests/autopilot/unity8/__init__.py	2013-10-17 09:01:20 +0000
 +++ tests/autopilot/unity8/__init__.py	2014-02-12 06:11:39 +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
@@ -88,28 +88,31 @@
      return binary_path
--def get_data_dirs():
++def get_data_dirs(data_dirs_mock_enabled=True):
      """Prepend a mock data path to XDG_DATA_DIRS."""
++    data_dirs = _get_xdg_env_path()
++    if data_dirs_mock_enabled:
++        mock_data_path = _get_full_mock_data_path()
++        if os.path.exists(mock_data_path):
++            if data_dirs is not None:
++                data_dirs = '{0}:{1}'.format(mock_data_path, data_dirs)
++            else:
++                data_dirs = mock_data_path
++    return data_dirs
++
++
++def _get_full_mock_data_path():
      if running_installed_tests():
          data_path = "/usr/share/unity8/mocks/data"
      else:
          data_path = "../../mocks/data"
--    full_data_path = os.path.abspath(
++    return os.path.abspath(
          os.path.join(
              os.path.dirname(__file__),
              data_path
+         )
+     )
--    if os.path.exists(full_data_path):
--        xdg_path = _get_xdg_env_path()
--        if xdg_path is not None:
--            return "{0}:{1}".format(full_data_path, xdg_path)
--        else:
--            return full_data_path
--    else:
--        return None
--
  def _get_xdg_env_path():
      path = os.getenv("XDG_DATA_DIRS")
@@ -129,6 +132,7 @@
      except subprocess.CalledProcessError:
          return None
++
  def get_grid_size():
      grid_size = os.getenv('GRID_UNIT_PX')
      if grid_size is None:
 === modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
 --- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2013-12-16 22:51:30 +0000
 +++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-02-12 06:11:39 +0000
@@ -1,7 +1,7 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+ #
  # Unity Autopilot Test Suite
--# Copyright (C) 2013 Canonical
++# Copyright (C) 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
@@ -44,9 +44,8 @@
              self.skipTest("Test cannot be run on the desktop.")
      def swipe_screen_from_right(self):
--        qml_view = self.main_window.get_qml_view()
--        width = qml_view.width
--        height = qml_view.height
++        width = self.main_window.width
++        height = self.main_window.height
          start_x = width
          start_y = int(height/2)
          end_x = int(width/2)
@@ -55,9 +54,6 @@
          logger.info("Swiping screen from the right edge")
          self.touch.drag(start_x, start_y, end_x, end_y)
--    def _get_current_focused_app_id(self):
--        return self._proxy.select_single("Shell").currentFocusedAppId
--
      def _launch_app(self, app_name):
          """Launches the application *app_name*
@@ -86,7 +82,7 @@
          self.assertThat(app, NotEquals(None))
          self.assertThat(
--            self._get_current_focused_app_id(),
++            self.main_window.get_current_focused_app_id(),
              Eventually(Equals("messaging-app"))
+         )
@@ -98,13 +94,13 @@
          self._launch_app("messaging-app")
          self.assertThat(
--            self._get_current_focused_app_id(),
++            self.main_window.get_current_focused_app_id(),
              Eventually(Equals("messaging-app"))
+         )
          self._launch_app("address-book-app")
          self.assertThat(
--            self._get_current_focused_app_id(),
++            self.main_window.get_current_focused_app_id(),
              Eventually(Equals("address-book-app"))
+         )
@@ -119,19 +115,19 @@
          self._launch_app("messaging-app")
          self.assertThat(
--            self._get_current_focused_app_id(),
++            self.main_window.get_current_focused_app_id(),
              Eventually(Equals("messaging-app"))
+         )
          self._launch_app("address-book-app")
          self.assertThat(
--            self._get_current_focused_app_id(),
++            self.main_window.get_current_focused_app_id(),
              Eventually(Equals("address-book-app"))
+         )
          self.swipe_screen_from_right()
          self.assertThat(
--            self._get_current_focused_app_id(),
++            self.main_window.get_current_focused_app_id(),
              Eventually(Equals("messaging-app"))
+         )
 === added file 'tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py'
 --- tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-02-12 06:11:39 +0000
@@ -0,0 +1,116 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Unity Autopilot Test Suite
++# Copyright (C) 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
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++#
++
++"""Test the integration with the URL dispatcher service."""
++
++import os
++import tempfile
++
++from autopilot import platform
++from autopilot.matchers import Eventually
++from testtools.matchers import Equals
++from ubuntuuitoolkit import base as toolkit_base
++
++from unity8 import process_helpers
++from unity8.shell import tests
++
++
++class URLDispatcherTestCase(tests.UnityTestCase):
++
++    scenarios = tests._get_device_emulation_scenarios()
++
++    test_qml = ("""
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++
++MainView {
++    width: units.gu(48)
++    height: units.gu(60)
++
++    Label {
++        text: 'Test application.'
++    }
++}
++""")
++
++    desktop_file_contents = ("""[Desktop Entry]
++Type=Application
++Name=test
++Exec={qmlscene} {qml_file_path}
++Icon=Not important
++""")
++
++    def setUp(self):
++        if platform.model() == 'Desktop':
++            self.skipTest("URL dispatcher doesn't work on the desktop.")
++        super(URLDispatcherTestCase, self).setUp()
++        self._qml_mock_enabled = False
++        self._data_dirs_mock_enabled = False
++        unity_proxy = self.launch_unity()
++        process_helpers.unlock_unity(unity_proxy)
++
++    def create_test_application(self):
++        # FIXME most of this code is duplicated in the toolkit. We should
++        # create a fixture on the toolkit for other projects to use.
++        # http://pad.lv/1277334 --elopio - 2014-02-06
++        qml_file_path = self._write_test_qml_file()
++        self.addCleanup(os.remove, qml_file_path)
++        desktop_file_path = self._write_test_desktop_file(qml_file_path)
++        self.addCleanup(os.remove, desktop_file_path)
++        return qml_file_path, desktop_file_path
++
++    def _write_test_qml_file(self):
++        qml_file = tempfile.NamedTemporaryFile(suffix='.qml', delete=False)
++        qml_file.write(self.test_qml.encode('utf-8'))
++        qml_file.close()
++        return qml_file.name
++
++    def _write_test_desktop_file(self, qml_file_path):
++        desktop_file_dir = self._get_local_desktop_file_directory()
++        if not os.path.exists(desktop_file_dir):
++            os.makedirs(desktop_file_dir)
++        desktop_file = tempfile.NamedTemporaryFile(
++            suffix='.desktop', dir=desktop_file_dir, delete=False)
++        contents = self.desktop_file_contents.format(
++            qmlscene=toolkit_base.get_qmlscene_launch_command(),
++            qml_file_path=qml_file_path)
++        desktop_file.write(contents.encode('utf-8'))
++        desktop_file.close()
++        return desktop_file.name
++
++    def _get_local_desktop_file_directory(self):
++        return os.path.join(
++            os.environ.get('HOME'), '.local', 'share', 'applications')
++
++    def test_swipe_out_application_started_by_url_dispatcher(self):
++        _, desktop_file_path = self.create_test_application()
++        desktop_file_name = os.path.basename(desktop_file_path)
++        application_name, _ = os.path.splitext(desktop_file_name)
++
++        self.assertEqual('', self.main_window.get_current_focused_app_id())
++        self.addCleanup(os.system, 'pkill qmlscene')
++        os.system('url-dispatcher application:///{}'.format(desktop_file_name))
++        self.assertThat(
++            self.main_window.get_current_focused_app_id,
++            Eventually(Equals(application_name)))
++
++        self.main_window.show_dash_swiping()
++        self.assertThat(
++            self.main_window.get_current_focused_app_id,
++            Eventually(Equals('')))
 === modified file 'tests/autopilot/unity8/process_helpers.py'
 --- tests/autopilot/unity8/process_helpers.py	2014-01-24 09:30:49 +0000
 +++ tests/autopilot/unity8/process_helpers.py	2014-02-12 06:11:39 +0000
@@ -1,7 +1,7 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+ #
  # Unity Autopilot Utilities
--# Copyright (C) 2013 Canonical
++# Copyright (C) 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
@@ -23,8 +23,8 @@
+ )
  import logging
  import subprocess
--from unity8.shell.emulators import UnityEmulatorBase
--from unity8.shell.emulators.main_window import MainWindow
++from unity8.shell import emulators
++from unity8.shell.emulators import main_window as main_window_emulator
  logger = logging.getLogger(__name__)
@@ -54,7 +54,7 @@
          try:
              pid = _get_unity_pid()
              unity = _get_unity_proxy_object(pid)
--            main_window = MainWindow(unity)
++            main_window = unity.select_single(main_window_emulator.QQuickView)
          except ProcessSearchError as e:
              raise CannotAccessUnity(
                  "Cannot introspect unity, make sure that it has been started "
@@ -64,7 +64,8 @@
                  % str(e)
+             )
      else:
--        main_window = MainWindow(unity_proxy_obj)
++        main_window = unity_proxy_obj.select_single(
++            main_window_emulator.QQuickView)
      greeter = main_window.get_greeter()
      if greeter.created == False:
@@ -110,7 +111,8 @@
      status = _get_unity_status()
      if "start/" in status:
          try:
--            output = subprocess.check_output(['/sbin/initctl', 'stop', 'unity8'])
++            output = subprocess.check_output(
++                ['/sbin/initctl', 'stop', 'unity8'])
              logger.info(output)
          except subprocess.CalledProcessError as e:
              e.args += (
@@ -155,5 +157,5 @@
  def _get_unity_proxy_object(pid):
      return get_proxy_object_for_existing_process(
          pid=pid,
--        emulator_base=UnityEmulatorBase,
++        emulator_base=emulators.UnityEmulatorBase,
+     )
 === modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
 --- tests/autopilot/unity8/shell/emulators/main_window.py	2014-02-05 11:46:38 +0000
 +++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-02-12 06:11:39 +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,85 +17,103 @@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
--
++import logging
++
++from autopilot import logging as autopilot_logging
++
++from unity8.shell import emulators
  from unity8.shell.emulators.greeter import Greeter
  from unity8.shell.emulators.hud import Hud
  from unity8.shell.emulators.dash import Dash
  from unity8.shell.emulators.launcher import Launcher
--
--class MainWindow(object):
++logger = logging.getLogger(__name__)
++
++
++class QQuickView(emulators.UnityEmulatorBase):
      """An emulator class that makes it easy to interact with the shell"""
--    def __init__(self, app):
--        self.app = app
--
--    def get_qml_view(self):
--        """Get the main QML view"""
--        return self.app.select_single("QQuickView")
--
      def get_greeter(self):
--        return self.app.select_single(Greeter)
++        return self.select_single(Greeter)
      def get_greeter_content_loader(self):
--        return self.app.wait_select_single(
++        return self.wait_select_single(
              "QQuickLoader",
              objectName="greeterContentLoader"
+         )
      def get_greeter_background(self):
--        return self.app.select_single("CrossFadeImage", objectName="greeterBackground")
++        return self.select_single(
++            "CrossFadeImage", objectName="greeterBackground")
      def get_login_loader(self):
--        return self.app.select_single("QQuickLoader", objectName="loginLoader")
++        return self.select_single("QQuickLoader", objectName="loginLoader")
      def get_login_list(self):
--        return self.app.select_single("LoginList")
++        return self.select_single("LoginList")
      def get_hud(self):
--        return self.app.select_single(Hud)
++        return self.select_single(Hud)
      def get_hud_showable(self):
--        return self.app.select_single("Showable", objectName="hudShowable")
++        return self.select_single("Showable", objectName="hudShowable")
      def get_hud_show_button(self):
--        return self.app.select_single("HudButton")
++        return self.select_single("HudButton")
      def get_hud_edge_drag_area(self):
--        return self.app.select_single(objectName="hudDragArea")
++        return self.select_single(objectName="hudDragArea")
      def get_dash(self):
--        return self.app.select_single(Dash)
++        return self.select_single(Dash)
      def get_bottombar(self):
--        return self.app.select_single("Bottombar")
++        return self.select_single("Bottombar")
      def get_launcher(self):
--        return self.app.select_single(Launcher)
++        return self.select_single(Launcher)
      def get_pinPadLoader(self):
--        return self.app.select_single(
++        return self.select_single(
              "QQuickLoader",
              objectName="pinPadLoader"
+         )
      def get_pinPadButton(self, buttonId):
--        return self.app.select_single(
++        return self.select_single(
              "PinPadButton",
              objectName="pinPadButton%i" % buttonId
+         )
      def get_lockscreen(self):
--        return self.app.select_single("Lockscreen")
++        return self.select_single("Lockscreen")
      def get_pinentryField(self):
--        return self.app.select_single(objectName="pinentryField")
++        return self.select_single(objectName="pinentryField")
      def get_indicator(self, indicator_name):
--        return self.app.wait_select_single(
++        return self.wait_select_single(
              'DefaultIndicatorWidget',
              objectName=indicator_name+'-widget'
+         )
      def get_shell_background(self):
--        return self.app.select_single("CrossFadeImage", objectName="backgroundImage")
++        return self.select_single(
++            "CrossFadeImage", objectName="backgroundImage")
++
++    @autopilot_logging.log_action(logger.info)
++    def show_dash_swiping(self):
++        """Show the dash swiping from the left."""
++        width = self.width
++        height = self.height
++        start_x = 0
++        start_y = height // 2
++        end_x = width
++        end_y = start_y
++
++        self.pointing_device.drag(start_x, start_y, end_x, end_y)
++        return self.get_dash()
++
++    def get_current_focused_app_id(self):
++        """Return the id of the focused application."""
++        return self.select_single('Shell').currentFocusedAppId
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2014-01-09 21:23:23 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2014-02-12 06:11:39 +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
@@ -43,8 +43,8 @@
      get_data_dirs
+ )
  from unity8.process_helpers import restart_unity_with_testability
++from unity8.shell.emulators import main_window as main_window_emulator
  from unity8.shell.emulators.dash import Dash
--from unity8.shell.emulators.main_window import MainWindow
  logger = logging.getLogger(__name__)
@@ -139,10 +139,9 @@
          self._proxy = None
          self._lightdm_mock_type = None
          self._qml_mock_enabled = True
++        self._data_dirs_mock_enabled = True
          self._environment = {}
--        self._patch_data_dirs()
--
          #### FIXME: This is a work around re: lp:1238417 ####
          if model() != "Desktop":
              from autopilot.input import _uinput
@@ -268,6 +267,9 @@
          if self._qml_mock_enabled:
              self._setup_extra_mock_environment_patch()
++        if self._data_dirs_mock_enabled:
++            self._patch_data_dirs()
++
          # FIXME: we shouldn't be doing this
          # $MIR_SOCKET, fallback to $XDG_RUNTIME_DIR/mir_socket and
          # /tmp/mir_socket as last resort
@@ -321,7 +323,7 @@
              logger.warning("Appears unity was already stopped!")
      def _patch_data_dirs(self):
--        data_dirs = get_data_dirs()
++        data_dirs = get_data_dirs(self._data_dirs_mock_enabled)
          if data_dirs is not None:
              self._environment['XDG_DATA_DIRS'] = data_dirs
@@ -391,4 +393,4 @@
      @property
      def main_window(self):
--        return MainWindow(self._proxy)
++        return self._proxy.select_single(main_window_emulator.QQuickView)
 === modified file 'tests/autopilot/unity8/shell/tests/test_hud.py'
 --- tests/autopilot/unity8/shell/tests/test_hud.py	2013-10-17 08:18:45 +0000
 +++ tests/autopilot/unity8/shell/tests/test_hud.py	2014-02-12 06:11:39 +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
@@ -41,7 +41,6 @@
          """
          unity_proxy = self.launch_unity()
          unlock_unity(unity_proxy)
--        window = self.main_window.get_qml_view()
          hud_show_button = self.main_window.get_hud_show_button()
          edge_drag_area = self.main_window.get_hud_edge_drag_area()
          hud = self.main_window.get_hud()
@@ -49,7 +48,7 @@
          self._launch_test_app_from_app_screen()
          swipe_coords = hud.get_button_swipe_coords(
--            window,
++            self.main_window,
              hud_show_button
+         )
          initialBottomMargin = int(hud_show_button.bottomMargin)
@@ -83,14 +82,13 @@
          """
          unity_proxy = self.launch_unity()
          unlock_unity(unity_proxy)
--        window = self.main_window.get_qml_view()
          hud_show_button = self.main_window.get_hud_show_button()
          hud = self.main_window.get_hud()
          self._launch_test_app_from_app_screen()
          swipe_coords = hud.get_button_swipe_coords(
--            window,
++            self.main_window,
              hud_show_button
+         )
@@ -137,7 +135,6 @@
          """
          unity_proxy = self.launch_unity()
          unlock_unity(unity_proxy)
--        window = self.main_window.get_qml_view()
          hud = self.main_window.get_hud()
          self._launch_test_app_from_app_screen()
@@ -146,7 +143,7 @@
          start_x, start_y = hud.get_close_button_coords()
          end_x = start_x
--        end_y = int(window.height / 2)
++        end_y = int(self.main_window.height / 2)
          self.touch.drag(start_x, start_y, end_x, end_y)
          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-01-28 16:20:24 +0000
 +++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-02-12 06:11:39 +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
@@ -61,8 +61,7 @@
              return os.path.dirname(__file__) + "/../../../../../qml/graphics/" + icon_name
      def _get_notifications_list(self):
--        main_view = self.main_window.get_qml_view()
--        return main_view.select_single(
++        return self.main_window.select_single(
              "Notifications",
              objectName='notificationList'
+         )