Merge lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators into lp:unity8

[Leo Arias]

Deprecate unity8 emulators.

This branch needs:
https://code.launchpad.net/~canonical-platform-qa/unity8/click_item_with_swipe
https://code.launchpad.net/~josharenson/unity8/qa_helpers/+merge/258435

[lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators]

1533. By Leo Arias on 2015-04-29

Readded the file deleted by mistake.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1532
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5641/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/806
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2536
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2536/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20045

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1533
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5642/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/807
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2539/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20049

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1533
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/unity8/fix1306340-deprecate_emulators/+merge/257812/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5646/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/811
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20067

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1533
http://jenkins.qa.ubuntu.com/job/unity8-ci/5652/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/816
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/817
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2566
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2566/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20084

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

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/unity8/fix1306340-deprecate_emulators]

1534. By Leo Arias on 2015-05-15

Merged with the greeter branch from josh.

1535. By Leo Arias on 2015-05-15

Merged with trunk.

1536. By Leo Arias on 2015-05-22

Merged with trunk.

1537. By Leo Arias on 2015-05-27

Removed the file resulting from a wrong merge.

1538. By Leo Arias on 2015-05-27

Merged with trunk.

1539. By Richard Huddie on 2015-06-22

Merged with trunk.

1540. By Richard Huddie on 2015-06-23

Merged with trunk.

1541. By Richard Huddie on 2015-06-23

Update rotation tests to use new helpers.

1542. By Richard Huddie on 2015-06-24

Fix unlock unity in fake sensors test and remove duplicated test.

1543. By Richard Huddie on 2015-06-24

Fix flake8 errors, remove imports using emulator and rename emulator tests to helper tests.

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2015-04-22 14:43:17 +0000
+++ debian/control	2015-05-15 07:16:40 +0000
@@ -150,7 +150,7 @@
          python3-fixtures,
          python3-gi,
          qttestability-autopilot (>= 1.4),
-         ubuntu-ui-toolkit-autopilot,
+         ubuntu-ui-toolkit-autopilot (>= 1.2.1485+15.04.20150417.1-0ubuntu1),
          unity-scope-click,
          unity8 (= ${source:Version}),
          unity8-fake-env (= ${source:Version}),

=== modified file 'tests/autopilot/unity8/__init__.py'
--- tests/autopilot/unity8/__init__.py	2014-02-23 01:46:02 +0000
+++ tests/autopilot/unity8/__init__.py	2015-05-15 07:16:40 +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, 2014 Canonical
+# Copyright (C) 2012, 2013, 2014, 2015 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,13 +17,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""unity autopilot tests and emulators - top level package."""
+"""unity autopilot tests and helpers - top level package."""
 import os
 import os.path
 import subprocess
 import sysconfig
 
 
+class UnityException(Exception):
+    """Exception raised when there is an error with the Unity test helpers."""
+
+
 def running_installed_tests():
     binary_path = get_binary_path()
     return binary_path.startswith('/usr')

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/__init__.py'
--- tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2015-02-23 17:29:04 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2015-05-15 07:16:40 +0000
@@ -31,8 +31,8 @@
         super().setUp()
         self._qml_mock_enabled = False
         self._data_dirs_mock_enabled = False
-        unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(unity_proxy)
+        self.launch_unity()
+        process_helpers.unlock_unity()
 
     def create_test_application(self):
         desktop_file_dict = fixture_setup.DEFAULT_DESKTOP_FILE_DICT

=== renamed file 'tests/autopilot/unity8/shell/emulators/dash.py' => 'tests/autopilot/unity8/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/dash.py	2015-05-15 07:16:40 +0000
@@ -23,7 +23,7 @@
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
 
-from unity8.shell import emulators
+import unity8
 
 
 logger = logging.getLogger(__name__)
@@ -41,7 +41,7 @@
 
 
 class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """An emulator that understands the Dash."""
+    """A helper that understands the Dash."""
 
     def __init__(self, *args):
         super().__init__(*args)
@@ -93,10 +93,10 @@
             for l in aux.get_children_by_type('QQuickLoader'):
                 if (l.scopeId == scope_id):
                     return l
-            raise emulators.UnityEmulatorException(
+            raise unity8.UnityException(
                 'No scope found with id {0}'.format(scope_id))
         except dbus.StateNotFoundError:
-            raise emulators.UnityEmulatorException(
+            raise unity8.UnityException(
                 'No scope found with id {0}'.format(scope_id))
 
     def _get_scope_from_loader(self, loader):
@@ -121,7 +121,7 @@
         elif scope_loader.globalRect.x > current_scope_loader.globalRect.x:
             return self._scroll_to_right_scope
         else:
-            raise emulators.UnityEmulatorException('The scope is already open')
+            raise unity8.UnityException('The scope is already open')
 
     @autopilot_logging.log_action(logger.info)
     def _scroll_to_left_scope(self):
@@ -185,14 +185,15 @@
 
 
 class ListViewWithPageHeader(ubuntuuitoolkit.QQuickFlickable):
-    pass
+
+    margin_to_swipe_from_bottom = ubuntuuitoolkit.units.gu(4)
 
 
 class GenericScopeView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """Autopilot emulator for generic scopes."""
+    """Autopilot helper for generic scopes."""
 
     @autopilot_logging.log_action(logger.info)
-    def open_preview(self, category, app_name):
+    def open_preview(self, category, app_name, press_duration=0.10):
         """Open the preview of an application.
 
         :parameter category: The name of the category where the application is.
@@ -203,16 +204,19 @@
         # FIXME some categories need a long press in order to see the preview.
         # Some categories do not show previews, like recent apps.
         # --elopio - 2014-1-14
-        self.click_scope_item(category, app_name)
+        self.click_scope_item(category, app_name, press_duration)
         preview_list = self.wait_select_single(
             'QQuickLoader', objectName='subPageLoader')
         preview_list.subPageShown.wait_for(True)
         preview_list.x.wait_for(0)
+        self.get_root_instance().select_single(
+            objectName='processingIndicator').visible.wait_for(False)
         return preview_list.select_single(
-            Preview, objectName='preview{}'.format(preview_list.currentIndex))
+            Preview, objectName='preview{}'.format(
+                preview_list.initialIndex))
 
     @autopilot_logging.log_action(logger.debug)
-    def click_scope_item(self, category, title):
+    def click_scope_item(self, category, title, press_duration=0.10):
         """Click an item from the scope.
 
         :parameter category: The name of the category where the item is.
@@ -220,9 +224,12 @@
 
         """
         category_element = self._get_category_element(category)
-        icon = category_element.wait_select_single('AbstractButton',
-                                                   title=title)
-        self.pointing_device.click_object(icon)
+        icon = category_element.wait_select_single(
+            'AbstractButton', title=title)
+        list_view = self.select_single(
+            ListViewWithPageHeader, objectName='categoryListView')
+        list_view.swipe_child_into_view(icon)
+        self.pointing_device.click_object(icon, press_duration=press_duration)
 
     def _get_category_element(self, category):
         try:
@@ -230,7 +237,7 @@
                 'DashCategoryBase',
                 objectName='dashCategory{}'.format(category))
         except dbus.StateNotFoundError:
-            raise emulators.UnityEmulatorException(
+            raise unity8.UnityException(
                 'No category found with name {}'.format(category))
 
     def get_applications(self, category):

=== modified file 'tests/autopilot/unity8/greeter/__init__.py'
--- tests/autopilot/unity8/greeter/__init__.py	2015-03-23 23:40:27 +0000
+++ tests/autopilot/unity8/greeter/__init__.py	2015-05-15 07:16:40 +0000
@@ -0,0 +1,93 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Unity Autopilot Test Suite
+# Copyright (C) 2012, 2013, 2014, 2015 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/>.
+#
+
+import dbus
+
+import ubuntuuitoolkit
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from autopilot.utilities import sleep
+
+
+def hide_greeter_with_dbus():
+    dbus_proxy = _get_greeter_dbus_proxy()
+    if _is_greeter_active():
+        dbus_proxy.HideGreeter()
+
+
+def show_greeter_with_dbus():
+    dbus_proxy = _get_greeter_dbus_proxy()
+    if not _is_greeter_active():
+        dbus_proxy.ShowGreeter()
+
+
+def wait_for_greeter():
+    Eventually(Equals(True), timeout=300).match(_is_greeter_active)
+
+
+def _get_greeter_dbus_proxy():
+    bus = dbus.SessionBus()
+    return bus.get_object('com.canonical.UnityGreeter', '/')
+
+
+def _is_greeter_active():
+    try:
+        dbus_proxy = _get_greeter_dbus_proxy()
+        return dbus_proxy.Get('com.canonical.UnityGreeter', 'IsActive')
+    except:
+        return False
+
+
+class Greeter(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """A helper that understands the greeter screen."""
+
+    def wait_swiped_away(self):
+        # We have to be careful here, because coverPage can go away at any time
+        # if there isn't a lockscreen behind it (it hides completely, then
+        # the greeter disposes it).  But if there *is* a lockscreen, then we
+        # need a different check, by looking at its showProgress.  So make our
+        # own wait_for loop and check both possibilities.
+        for i in range(10):
+            if not self.required:
+                return
+            coverPage = self.select_single(objectName='coverPage')
+            if coverPage.showProgress == 0:
+                return
+            sleep(1)
+
+        raise AssertionError("Greeter cover page still up after 10s")
+
+    def swipe(self):
+        """Swipe the greeter screen away."""
+        self.waiting.wait_for(False)
+        coverPage = self.select_single(objectName='coverPage')
+        coverPage.showProgress.wait_for(1)
+
+        rect = self.globalRect
+        start_x = rect[0] + rect[2] - 3
+        start_y = int(rect[1] + rect[3] / 2)
+        stop_x = int(rect[0] + rect[2] * 0.2)
+        stop_y = start_y
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+        self.wait_swiped_away()
+
+    def get_prompt(self):
+        return self.select_single(
+            ubuntuuitoolkit.TextField, objectName='passwordInput')

=== renamed file 'tests/autopilot/unity8/shell/emulators/greeter.py' => 'tests/autopilot/unity8/greeter/__init__.py.moved'
--- tests/autopilot/unity8/shell/emulators/greeter.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/greeter/__init__.py.moved	2015-05-15 07:16:40 +0000
@@ -19,42 +19,3 @@
 
 import ubuntuuitoolkit
 from autopilot.utilities import sleep
-
-
-class Greeter(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """An emulator that understands the greeter screen."""
-
-    def wait_swiped_away(self):
-        # We have to be careful here, because coverPage can go away at any time
-        # if there isn't a lockscreen behind it (it hides completely, then
-        # the greeter disposes it).  But if there *is* a lockscreen, then we
-        # need a different check, by looking at its showProgress.  So make our
-        # own wait_for loop and check both possibilities.
-        for i in range(10):
-            if not self.required:
-                return
-            coverPage = self.select_single(objectName='coverPage')
-            if coverPage.showProgress == 0:
-                return
-            sleep(1)
-
-        raise AssertionError("Greeter cover page still up after 10s")
-
-    def swipe(self):
-        """Swipe the greeter screen away."""
-        self.waiting.wait_for(False)
-        coverPage = self.select_single(objectName='coverPage')
-        coverPage.showProgress.wait_for(1)
-
-        rect = self.globalRect
-        start_x = rect[0] + rect[2] - 3
-        start_y = int(rect[1] + rect[3] / 2)
-        stop_x = int(rect[0] + rect[2] * 0.2)
-        stop_y = start_y
-        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
-
-        self.wait_swiped_away()
-
-    def get_prompt(self):
-        return self.select_single(
-            ubuntuuitoolkit.TextField, objectName='passwordInput')

=== modified file 'tests/autopilot/unity8/greeter/tests/__init__.py'
--- tests/autopilot/unity8/greeter/tests/__init__.py	2015-04-20 16:05:51 +0000
+++ tests/autopilot/unity8/greeter/tests/__init__.py	2015-05-15 07:16:40 +0000
@@ -17,12 +17,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from unity8.shell.emulators import main_window as main_window_emulator
+from unity8 import shell
 from unity8.shell.tests import UnityTestCase
 
 
 class GreeterTestCase(UnityTestCase):
     def get_shell(self, unity_proxy):
         main_window = (
-            unity_proxy.select_single(main_window_emulator.QQuickView))
+            unity_proxy.select_single(shell.QQuickView))
         return main_window.select_single('Shell')

=== modified file 'tests/autopilot/unity8/indicators/tests/__init__.py'
--- tests/autopilot/unity8/indicators/tests/__init__.py	2015-04-24 19:51:20 +0000
+++ tests/autopilot/unity8/indicators/tests/__init__.py	2015-05-15 07:16:40 +0000
@@ -31,7 +31,7 @@
     def setUp(self):
         super().setUp()
         self.unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(self.unity_proxy)
+        process_helpers.unlock_unity()
 
 
 class DeviceIndicatorTestCase(IndicatorTestCase):

=== renamed file 'tests/autopilot/unity8/shell/emulators/launcher.py' => 'tests/autopilot/unity8/launcher.py'
--- tests/autopilot/unity8/shell/emulators/launcher.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/launcher.py	2015-05-15 07:16:40 +0000
@@ -22,7 +22,7 @@
 import autopilot.logging
 import ubuntuuitoolkit
 
-from unity8.shell import emulators
+import unity8
 
 
 logger = logging.getLogger(__name__)
@@ -30,7 +30,7 @@
 
 class Launcher(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
-    """An emulator that understands the Launcher."""
+    """A helper that understands the Launcher."""
 
     @autopilot.logging.log_action(logger.debug)
     def show(self):
@@ -57,7 +57,7 @@
                 'QQuickImage', objectName='dashItem')
             self.pointing_device.click_object(dash_icon)
         else:
-            raise emulators.UnityEmulatorException('The launcher is closed.')
+            raise unity8.UnityException('The launcher is closed.')
 
     @autopilot.logging.log_action(logger.debug)
     def click_application_launcher_icon(self, application_name):

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/process_helpers.py	2015-05-15 07:16:40 +0000
@@ -19,14 +19,12 @@
 
 import logging
 import subprocess
-import dbus
 
 import ubuntuuitoolkit
-from autopilot.exceptions import ProcessSearchError
 from autopilot.introspection import get_proxy_object_for_existing_process
 
-from unity8.shell import emulators
-from unity8.shell.emulators import main_window as main_window_emulator
+from unity8 import greeter
+
 
 logger = logging.getLogger(__name__)
 
@@ -39,104 +37,22 @@
     pass
 
 
-def unlock_unity(unity_proxy_obj=None):
+def unlock_unity():
     """Helper function that attempts to unlock the unity greeter.
 
-    If unity_proxy_object is None create a proxy object by querying for the
-    running unity process.
-    Otherwise re-use the passed proxy object.
-
-    :raises RuntimeError: if the greeter attempts and fails to be unlocked.
-
-    :raises RuntimeWarning: when the greeter cannot be found because it is
-      already unlocked.
-    :raises CannotAccessUnity: if unity is not introspectable or cannot be
-      found on dbus.
-    :raises CannotAccessUnity: if unity's upstart status is not "start" or the
-      upstart job cannot be found at all.
-
     """
-    if unity_proxy_obj is None:
-        try:
-            pid = _get_unity_pid()
-            unity = _get_unity_proxy_object(pid)
-            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 "
-                "with testability. Perhaps use the function "
-                "'restart_unity_with_testability' this module provides."
-                "(%s)"
-                % str(e)
-            )
-    else:
-        main_window = unity_proxy_obj.select_single(
-            main_window_emulator.QQuickView)
-
-    greeter = main_window.get_greeter()
-    if greeter.created is False:
-        raise RuntimeWarning("Greeter appears to be already unlocked.")
-
-    bus = dbus.SessionBus()
-    dbus_proxy = bus.get_object("com.canonical.UnityGreeter", "/")
-    try:
-        dbus_proxy.HideGreeter()
-    except dbus.DBusException:
-        logger.info("Failed to unlock greeter")
-        raise
-    else:
-        greeter.created.wait_for(False)
-        logger.info("Greeter unlocked, continuing.")
-
-
-def lock_unity(unity_proxy_obj=None):
+
+    greeter.wait_for_greeter()
+    greeter.hide_greeter_with_dbus()
+
+
+def lock_unity():
     """Helper function that attempts to lock unity greeter.
 
-    If unity_proxy_object is None create a proxy object by querying for the
-    running unity process.
-    Otherwise re-use the passed proxy object.
-
-    :raises RuntimeError: if the greeter attempts and fails to be locked.
-
-    :raises RuntimeWarning: when the greeter is found because it is
-      already locked.
-    :raises CannotAccessUnity: if unity is not introspectable or cannot be
-      found on dbus.
-    :raises CannotAccessUnity: if unity's upstart status is not "start" or the
-      upstart job cannot be found at all.
-
     """
-    if unity_proxy_obj is None:
-        try:
-            pid = _get_unity_pid()
-            unity = _get_unity_proxy_object(pid)
-            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 "
-                "with testability. Perhaps use the function "
-                "'restart_unity_with_testability' this module provides."
-                "(%s)"
-                % str(e)
-            )
-    else:
-        main_window = unity_proxy_obj.select_single(
-            main_window_emulator.QQuickView)
-
-    greeter = main_window.get_greeter()
-    if greeter.created is True:
-        raise RuntimeWarning("Greeter appears to be already locked.")
-
-    bus = dbus.SessionBus()
-    dbus_proxy = bus.get_object("com.canonical.UnityGreeter", "/")
-    try:
-        dbus_proxy.ShowGreeter()
-    except dbus.DBusException:
-        logger.info("Failed to lock greeter")
-        raise
-    else:
-        greeter.created.wait_for(True)
-        logger.info("Greeter locked, continuing.")
+
+    greeter.show_greeter_with_dbus()
+    greeter.wait_for_greeter()
 
 
 def restart_unity_with_testability(*args):

=== modified file 'tests/autopilot/unity8/shell/__init__.py'
--- tests/autopilot/unity8/shell/__init__.py	2015-04-24 16:10:02 +0000
+++ tests/autopilot/unity8/shell/__init__.py	2015-05-15 07:16:40 +0000
@@ -17,12 +17,21 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""unity shell autopilot tests and emulators - sub level package."""
+"""unity shell autopilot tests and helpers - sub level package."""
 
+import logging
 from functools import wraps
+
+import ubuntuuitoolkit
+from autopilot import logging as autopilot_logging
+from autopilot import input
 from gi.repository import Notify
 
-import logging
+from unity8 import (
+    greeter,
+    launcher as launcher_helpers
+)
+
 
 logger = logging.getLogger(__name__)
 
@@ -82,3 +91,161 @@
                       'NORMAL': Notify.Urgency.NORMAL,
                       'CRITICAL': Notify.Urgency.CRITICAL}
     return _urgency_enums.get(urgency.upper())
+
+
+class QQuickView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """An helper class that makes it easy to interact with the shell"""
+
+    def get_greeter(self):
+        return self.select_single(greeter.Greeter)
+
+    def get_login_loader(self):
+        return self.select_single("QQuickLoader", objectName="loginLoader")
+
+    def get_login_list(self):
+        return self.select_single("LoginList")
+
+    def get_bottombar(self):
+        return self.select_single("Bottombar")
+
+    def get_pinPadLoader(self):
+        return self.select_single(
+            "QQuickLoader",
+            objectName="pinPadLoader"
+        )
+
+    def get_lockscreen(self):
+        return self.select_single("Lockscreen")
+
+    def get_pinentryField(self):
+        return self.select_single(objectName="pinentryField")
+
+    def _get_indicator_panel_item(self, indicator_name):
+        return self.select_single(
+            'IndicatorItem',
+            objectName=indicator_name+'-panelItem'
+        )
+
+    def _get_indicator_page(self, indicator_name):
+        return self.select_single(
+            'IndicatorPage',
+            objectName=indicator_name+'-page'
+        )
+
+    @autopilot_logging.log_action(logger.info)
+    def open_indicator_page(self, indicator_name):
+        """Swipe to open the indicator, wait until it's open.
+
+        :returns: The indicator page.
+        """
+        widget = self._get_indicator_panel_item(indicator_name)
+        start_x, start_y = input.get_center_point(widget)
+        end_x = start_x
+        end_y = self.height
+        self.pointing_device.drag(start_x, start_y, end_x, end_y)
+        self.wait_select_single('IndicatorsMenu', fullyOpened=True)
+        return self._get_indicator_page(indicator_name)
+
+    @autopilot_logging.log_action(logger.info)
+    def close_indicator_page(self):
+        """Swipe to close the opened indicator, wait until it's closed."""
+        indicators_menu = self.wait_select_single('IndicatorsMenu')
+        end_x, end_y = input.get_center_point(indicators_menu)
+        start_x = end_x
+        start_y = self.height
+        self.pointing_device.drag(start_x, start_y, end_x, end_y)
+        indicators_menu.fullyClosed.wait_for(True)
+
+    @autopilot_logging.log_action(logger.info)
+    def show_dash_swiping(self):
+        """Show the dash swiping from the left."""
+        x, y, width, height = self._get_shell().globalRect
+        start_x = x
+        end_x = x + width
+        start_y = end_y = y + height // 2
+
+        self.pointing_device.drag(start_x, start_y, end_x, end_y)
+        self.get_current_focused_app_id().wait_for('unity8-dash')
+
+    def _get_shell(self):
+        return self.select_single('Shell')
+
+    def get_current_focused_app_id(self):
+        """Return the id of the focused application."""
+        return self._get_shell().focusedApplicationId
+
+    @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()
+        self.get_current_focused_app_id().wait_for('unity8-dash')
+        launcher.shown.wait_for(False)
+
+    @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_helpers.Launcher)
+
+    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)
+        launcher.shown.wait_for(False)
+
+    def enter_pin_code(self, code):
+        """Enter code 'code' into the single-pin lightdm pincode entry screen.
+
+        :param code: must be a string of numeric characters.
+        :raises: TypeError if code is not a string.
+        :raises: ValueError if code contains non-numeric characters.
+
+        """
+        if not isinstance(code, str):
+            raise TypeError(
+                "'code' parameter must be a string, not %r."
+                % type(code)
+            )
+        for num in code:
+            if not num.isdigit():
+                raise ValueError(
+                    "'code' parameter contains non-numeric characters."
+                )
+            self.pointing_device.click_object(
+                self._get_pinpad_button(int(num)))
+
+    def _get_pinpad_button(self, button_id):
+        return self.select_single(
+            'PinPadButton',
+            objectName='pinPadButton{}'.format(button_id)
+        )
+
+    @autopilot_logging.log_action(logger.info)
+    def wait_for_notification(self):
+        """Wait for a notification dialog to appear.
+
+        :return: An object for the notification dialog data.
+        :raise StateNotFoundError: if the timeout expires when the
+        notification has not appeared.
+
+        """
+        notify_list = self.select_single('Notifications',
+                                         objectName='notificationList')
+        visible_notification = notify_list.wait_select_single('Notification',
+                                                              visible=True)
+        return {'summary': visible_notification.summary,
+                'body': visible_notification.body,
+                'iconSource': visible_notification.iconSource}

=== added file 'tests/autopilot/unity8/shell/create_interactive_notification.py'
--- tests/autopilot/unity8/shell/create_interactive_notification.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity8/shell/create_interactive_notification.py	2015-05-15 07:16:40 +0000
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Unity Autopilot Test Suite
+# Copyright (C) 2012, 2013, 2014, 2015 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/>.
+#
+
+import argparse
+from gi.repository import GLib, Notify
+import signal
+
+
+def action_callback(notification, action_id, data):
+    print(action_id)
+
+
+def quit_callback(notification):
+    loop.quit()
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='Create an interactive notification'
+    )
+
+    parser.add_argument(
+        '--summary',
+        help='summary text of the notification',
+        default='Summary'
+    )
+    parser.add_argument(
+        '--body',
+        help='body text of the notification',
+        default='Body'
+    )
+    parser.add_argument(
+        '--icon',
+        help='path to the icon to display',
+        default=None
+    )
+    parser.add_argument(
+        '--action',
+        help='id and label for the callback in the format: id,label',
+        action='append',
+        default=[]
+    )
+    parser.add_argument(
+        '--urgency',
+        help='LOW, NORMAL, CRITICAL',
+        choices=['LOW', 'NORMAL', 'CRITICAL'],
+        default='NORMAL'
+    )
+    parser.add_argument(
+        '--hints',
+        help='list of comma sep options',
+        action='append',
+        default=[]
+    )
+
+    args = parser.parse_args()
+
+    Notify.init('Interactive Notifications')
+
+    notification = Notify.Notification.new(args.summary, args.body, args.icon)
+
+    for hint in args.hints:
+        key, value = hint.split(',', 1)
+        notification.set_hint_string(key, value)
+
+    for action in args.action:
+        action_id, action_label = action.split(',', 1)
+        notification.add_action(
+            action_id,
+            action_label,
+            action_callback,
+            None
+        )
+
+    def signal_handler(signam, frame):
+        loop.quit()
+
+    signal.signal(signal.SIGINT, signal_handler)
+
+    loop = GLib.MainLoop.new(None, False)
+    notification.connect('closed', quit_callback)
+    notification.show()
+    loop.run()

=== removed directory 'tests/autopilot/unity8/shell/emulators'
=== added file 'tests/autopilot/unity8/shell/emulators.py'
--- tests/autopilot/unity8/shell/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity8/shell/emulators.py	2015-05-15 07:16:40 +0000
@@ -0,0 +1,52 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Unity Autopilot Test Suite
+# Copyright (C) 2015 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/>.
+#
+
+"""Emulators was the old name for the custom proxy objects."""
+
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+logger.warning(
+    'The unity8.shell.emulators module is deprecated. Import the autopilot '
+    'helpers from the top-level unity8 module.')
+
+
+__all__ = [
+    'create_interactive_notification',
+    'dash',
+    'greeter',
+    'launcher',
+    'main_window',
+    'tutorial',
+    'UnityEmulatorException',
+]
+
+
+from unity8 import (
+    greeter,
+    dash,
+    launcher,
+    shell as main_window,
+    tutorial,
+    UnityException as UnityEmulatorException
+)
+from unity8.shell import create_interactive_notification

=== removed file 'tests/autopilot/unity8/shell/emulators/__init__.py'
--- tests/autopilot/unity8/shell/emulators/__init__.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/shell/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014, 2015 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/>.
-#
-
-
-class UnityEmulatorException(Exception):
-    """Exception raised when there is an error with the Unity emulators."""

=== removed file 'tests/autopilot/unity8/shell/emulators/create_interactive_notification.py'
--- tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	2015-02-23 17:29:04 +0000
+++ tests/autopilot/unity8/shell/emulators/create_interactive_notification.py	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-#!/usr/bin/env python3
-
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014, 2015 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/>.
-#
-
-import argparse
-from gi.repository import GLib, Notify
-import signal
-
-
-def action_callback(notification, action_id, data):
-    print(action_id)
-
-
-def quit_callback(notification):
-    loop.quit()
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(
-        description='Create an interactive notification'
-    )
-
-    parser.add_argument(
-        '--summary',
-        help='summary text of the notification',
-        default='Summary'
-    )
-    parser.add_argument(
-        '--body',
-        help='body text of the notification',
-        default='Body'
-    )
-    parser.add_argument(
-        '--icon',
-        help='path to the icon to display',
-        default=None
-    )
-    parser.add_argument(
-        '--action',
-        help='id and label for the callback in the format: id,label',
-        action='append',
-        default=[]
-    )
-    parser.add_argument(
-        '--urgency',
-        help='LOW, NORMAL, CRITICAL',
-        choices=['LOW', 'NORMAL', 'CRITICAL'],
-        default='NORMAL'
-    )
-    parser.add_argument(
-        '--hints',
-        help='list of comma sep options',
-        action='append',
-        default=[]
-    )
-
-    args = parser.parse_args()
-
-    Notify.init('Interactive Notifications')
-
-    notification = Notify.Notification.new(args.summary, args.body, args.icon)
-
-    for hint in args.hints:
-        key, value = hint.split(',', 1)
-        notification.set_hint_string(key, value)
-
-    for action in args.action:
-        action_id, action_label = action.split(',', 1)
-        notification.add_action(
-            action_id,
-            action_label,
-            action_callback,
-            None
-        )
-
-    def signal_handler(signam, frame):
-        loop.quit()
-
-    signal.signal(signal.SIGINT, signal_handler)
-
-    loop = GLib.MainLoop.new(None, False)
-    notification.connect('closed', quit_callback)
-    notification.show()
-    loop.run()

=== removed file 'tests/autopilot/unity8/shell/emulators/main_window.py'
--- tests/autopilot/unity8/shell/emulators/main_window.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/shell/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Unity Autopilot Test Suite
-# Copyright (C) 2012, 2013, 2014, 2015 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/>.
-#
-
-import logging
-
-import ubuntuuitoolkit
-from autopilot import logging as autopilot_logging
-from autopilot import input
-
-from unity8.shell.emulators.greeter import Greeter
-from unity8.shell.emulators.launcher import Launcher
-
-logger = logging.getLogger(__name__)
-
-
-class QQuickView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-    """An emulator class that makes it easy to interact with the shell"""
-
-    def get_greeter(self):
-        return self.select_single(Greeter)
-
-    def get_login_loader(self):
-        return self.select_single("QQuickLoader", objectName="loginLoader")
-
-    def get_login_list(self):
-        return self.select_single("LoginList")
-
-    def get_bottombar(self):
-        return self.select_single("Bottombar")
-
-    def get_pinPadLoader(self):
-        return self.select_single(
-            "QQuickLoader",
-            objectName="pinPadLoader"
-        )
-
-    def get_lockscreen(self):
-        return self.select_single("Lockscreen")
-
-    def get_pinentryField(self):
-        return self.select_single(objectName="pinentryField")
-
-    def _get_indicator_panel_item(self, indicator_name):
-        return self.select_single(
-            'IndicatorItem',
-            objectName=indicator_name+'-panelItem'
-        )
-
-    def _get_indicator_page(self, indicator_name):
-        return self.select_single(
-            'IndicatorPage',
-            objectName=indicator_name+'-page'
-        )
-
-    @autopilot_logging.log_action(logger.info)
-    def open_indicator_page(self, indicator_name):
-        """Swipe to open the indicator, wait until it's open.
-
-        :returns: The indicator page.
-        """
-        widget = self._get_indicator_panel_item(indicator_name)
-        start_x, start_y = input.get_center_point(widget)
-        end_x = start_x
-        end_y = self.height
-        self.pointing_device.drag(start_x, start_y, end_x, end_y)
-        self.wait_select_single('IndicatorsMenu', fullyOpened=True)
-        return self._get_indicator_page(indicator_name)
-
-    @autopilot_logging.log_action(logger.info)
-    def close_indicator_page(self):
-        """Swipe to close the opened indicator, wait until it's closed."""
-        indicators_menu = self.wait_select_single('IndicatorsMenu')
-        end_x, end_y = input.get_center_point(indicators_menu)
-        start_x = end_x
-        start_y = self.height
-        self.pointing_device.drag(start_x, start_y, end_x, end_y)
-        indicators_menu.fullyClosed.wait_for(True)
-
-    @autopilot_logging.log_action(logger.info)
-    def show_dash_swiping(self):
-        """Show the dash swiping from the left."""
-        x, y, width, height = self._get_shell().globalRect
-        start_x = x
-        end_x = x + width
-        start_y = end_y = y + height // 2
-
-        self.pointing_device.drag(start_x, start_y, end_x, end_y)
-        self.get_current_focused_app_id().wait_for('unity8-dash')
-
-    def _get_shell(self):
-        return self.select_single('Shell')
-
-    def get_current_focused_app_id(self):
-        """Return the id of the focused application."""
-        return self._get_shell().focusedApplicationId
-
-    @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()
-        self.get_current_focused_app_id().wait_for('unity8-dash')
-        launcher.shown.wait_for(False)
-
-    @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
-
-    @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)
-        launcher.shown.wait_for(False)
-
-    def enter_pin_code(self, code):
-        """Enter code 'code' into the single-pin lightdm pincode entry screen.
-
-        :param code: must be a string of numeric characters.
-        :raises: TypeError if code is not a string.
-        :raises: ValueError if code contains non-numeric characters.
-
-        """
-        if not isinstance(code, str):
-            raise TypeError(
-                "'code' parameter must be a string, not %r."
-                % type(code)
-            )
-        for num in code:
-            if not num.isdigit():
-                raise ValueError(
-                    "'code' parameter contains non-numeric characters."
-                )
-            self.pointing_device.click_object(
-                self._get_pinpad_button(int(num)))
-
-    def _get_pinpad_button(self, button_id):
-        return self.select_single(
-            'PinPadButton',
-            objectName='pinPadButton{}'.format(button_id)
-        )
-
-    @autopilot_logging.log_action(logger.info)
-    def wait_for_notification(self):
-        """Wait for a notification dialog to appear.
-
-        :return: An object for the notification dialog data.
-        :raise StateNotFoundError: if the timeout expires when the
-        notification has not appeared.
-
-        """
-        notify_list = self.select_single('Notifications',
-                                         objectName='notificationList')
-        visible_notification = notify_list.wait_select_single('Notification',
-                                                              visible=True)
-        return {'summary': visible_notification.summary,
-                'body': visible_notification.body,
-                'iconSource': visible_notification.iconSource}

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-05-05 14:46:49 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2015-05-15 07:16:40 +0000
@@ -51,9 +51,9 @@
     fixture_setup,
     process_helpers
 )
-from unity8.shell.emulators import (
+from unity8 import (
     dash as dash_helpers,
-    main_window as main_window_emulator,
+    shell
 )
 
 
@@ -297,7 +297,7 @@
 
     @property
     def main_window(self):
-        return self._proxy.select_single(main_window_emulator.QQuickView)
+        return self._proxy.select_single(shell.QQuickView)
 
 
 class DashBaseTestCase(AutopilotTestCase):

=== renamed file 'tests/autopilot/unity8/shell/tests/test_emulators.py' => 'tests/autopilot/unity8/shell/tests/test_helpers.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2015-04-17 21:58:16 +0000
+++ tests/autopilot/unity8/shell/tests/test_helpers.py	2015-05-15 07:16:40 +0000
@@ -17,13 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""Tests for the Dash autopilot emulators.
+"""Tests for the Dash autopilot custom proxy objects.
 
-The autopilot emulators are helpers for tests that check a user journey that
-involves the dash. The code for some of those tests will not be inside this
-branch, but in projects that depend on unity or that test the whole system
-integration. So, we need to test the helpers in order to make sure that we
-don't break them for those external projects.
+The autopilot custom proxy objects are helpers for tests that check a user
+journey that involves the dash. The code for some of those tests will not be
+inside this branch, but in projects that depend on unity or that test the
+whole system integration. So, we need to test the helpers in order to make
+sure that we don't break them for those external projects.
 
 """
 
@@ -31,8 +31,7 @@
 
 from unity8 import process_helpers
 from unity8.shell import fixture_setup, tests
-from unity8.shell.emulators import dash as dash_emulators
-from unity8.shell.emulators.dash import ListViewWithPageHeader
+from unity8 import dash as dash_helpers
 
 
 class MainWindowTestCase(tests.UnityTestCase):
@@ -41,8 +40,8 @@
 
     def setUp(self):
         super().setUp()
-        unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(unity_proxy)
+        self.launch_unity()
+        process_helpers.unlock_unity()
 
 
 class DashEmulatorTestCase(tests.DashBaseTestCase):
@@ -98,13 +97,13 @@
         scope_id = 'musicaggregator'
         scope = self.dash.open_scope(scope_id)
         self._assert_scope_is_opened(scope, scope_id)
-        self.assertIsInstance(scope, dash_emulators.GenericScopeView)
+        self.assertIsInstance(scope, dash_helpers.GenericScopeView)
 
     def test_open_applications_scope(self):
         scope_id = 'clickscope'
         scope = self.dash.open_scope(scope_id)
         self._assert_scope_is_opened(scope, scope_id)
-        self.assertIsInstance(scope, dash_emulators.GenericScopeView)
+        self.assertIsInstance(scope, dash_helpers.GenericScopeView)
 
 
 class GenericScopeViewEmulatorTestCase(tests.DashBaseTestCase):
@@ -117,7 +116,13 @@
 
     def test_open_preview(self):
         preview = self.generic_scope.open_preview('0', 'Title.0.0')
-        self.assertIsInstance(preview, dash_emulators.Preview)
+        self.assertIsInstance(preview, dash_helpers.Preview)
+        self.assertTrue(preview.isCurrent)
+
+    def test_open_preview_of_non_visible_item(self):
+        """Open an item that requires swiping to make it visible."""
+        preview = self.generic_scope.open_preview('2', 'Title.2.0')
+        self.assertIsInstance(preview, dash_helpers.Preview)
         self.assertTrue(preview.isCurrent)
 
 
@@ -139,7 +144,7 @@
         category_element = self.applications_scope._get_category_element(
             category)
         list_view = self.dash.get_scope('clickscope')\
-            .select_single(ListViewWithPageHeader)
+            .select_single(dash_helpers.ListViewWithPageHeader)
         expected_apps_count = self._get_number_of_application_slots(category)
         expected_applications = self.available_applications[
             :expected_apps_count]

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2015-04-17 21:58:16 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2015-05-15 07:16:40 +0000
@@ -119,8 +119,8 @@
 
     def test_interactive(self):
         """Interactive notification must react upon click on itself."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -156,8 +156,8 @@
         """Snap-decision with three actions should use
            one-over two button layout.
         """
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         summary = "Theatre at Ferria Stadium"
         body = "at Ferria Stadium in Bilbao, Spain\n07578545317"
@@ -197,8 +197,8 @@
         """Snap-decision should block input to shell
            without greeter/lockscreen.
         """
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         summary = "Incoming file"
         body = "Frank would like to send you the file: essay.pdf"
@@ -362,7 +362,7 @@
         """Returns the path to the interactive notification
            creation script.
         """
-        file_path = "../../emulators/create_interactive_notification.py"
+        file_path = "../../create_interactive_notification.py"
 
         the_path = os.path.abspath(
             os.path.join(__file__, file_path))
@@ -421,8 +421,8 @@
 
     def test_icon_summary_body(self):
         """Notification must display the expected summary and body text."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -458,8 +458,8 @@
     def test_icon_summary(self):
         """Notification must display the expected summary and secondary
         icon."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -491,8 +491,8 @@
     def test_urgency_order(self):
         """Notifications must be displayed in order according to their
         urgency."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -578,8 +578,8 @@
 
     def test_summary_and_body(self):
         """Notification must display the expected summary- and body-text."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -603,8 +603,8 @@
 
     def test_summary_only(self):
         """Notification must display only the expected summary-text."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -621,8 +621,8 @@
     def test_update_notification_same_layout(self):
         """Notification must allow updating its contents while being
         displayed."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -660,8 +660,8 @@
     def test_update_notification_layout_change(self):
         """Notification must allow updating its contents and layout while
         being displayed."""
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         notify_list = self._get_notifications_list()
 
@@ -709,8 +709,8 @@
         """ use the create notification script to get a notification dialog.
         Check that the arguments passed to the script match the fields. """
 
-        unity_proxy = self.launch_unity()
-        unlock_unity(unity_proxy)
+        self.launch_unity()
+        unlock_unity()
 
         summary = 'Helper summary'
         body = 'Helper body'

=== modified file 'tests/autopilot/unity8/shell/tests/test_tutorial.py'
--- tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-04-20 16:04:34 +0000
+++ tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-05-15 07:16:40 +0000
@@ -24,8 +24,8 @@
     fixture_setup,
     tests
 )
-# unused import to load the tutorial emulators custom proxy objects.
-from unity8.shell.emulators import tutorial as tutorial_emulator  # NOQA
+# unused import to load the tutorial helpers custom proxy objects.
+from unity8 import tutorial as tutorial_helpers  # NOQA
 
 
 class TutorialTestCase(tests.UnityTestCase):

=== renamed file 'tests/autopilot/unity8/shell/emulators/tutorial.py' => 'tests/autopilot/unity8/tutorial.py'