Merge lp:~canonical-platform-qa/unity8/dash-as-app-autopilot into lp:unity8

[Leo Arias]

Update the autopilot tests to work with the new dash app.

[Leo Arias (elopio)]

Not ready yet. Just proposing to start getting jenkins results earlier.

[lp:~canonical-platform-qa/unity8/dash-as-app-autopilot]

1120. By Leo Arias on 2014-07-31

Merged with trunk.

1121. By Leo Arias on 2014-07-31

Removed extra space.

1122. By Leo Arias on 2014-07-31

Removed tags.

1123. By Leo Arias on 2014-07-31

Merged with prerequisite.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1120
http://jenkins.qa.ubuntu.com/job/unity8-ci/3718/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2873/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/720
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/812/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/812/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/812/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4116/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1123
http://jenkins.qa.ubuntu.com/job/unity8-ci/3720/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2880
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/814
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/814/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/814
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4123
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10821

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

\o/ Only one error on the autopilot tests, the one that exposes a bug.

[Michał Sawicz (saviq)]

Minor comments inline.

Thanks!

review: Needs Fixing

[lp:~canonical-platform-qa/unity8/dash-as-app-autopilot]

1124. By Leo Arias on 2014-08-04

Remove unused import.

1125. By Leo Arias on 2014-08-04

Fixed typo.

1126. By Leo Arias on 2014-08-04

Fixed typo.

1127. By Leo Arias on 2014-08-04

Fixed grammar erro.

1128. By Leo Arias on 2014-08-04

Only check for the start part of the status, as suggested by saviq.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1128
http://jenkins.qa.ubuntu.com/job/unity8-ci/3750/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2996
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/844
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/844
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3048
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4239
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4239/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10954

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Still good.

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

 * Did CI run pass? If not, please explain why.
Known ap issue that's being fixed in the prerequisite, unrelated issues in qmltests.

review: Approve

=== 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-08-04 16:55:24 +0000
@@ -106,7 +106,7 @@
         self.assert_current_focused_application(application_name)
 
         self.main_window.show_dash_swiping()
-        self.assert_current_focused_application('')
+        self.assert_current_focused_application('unity8-dash')
 
         process_helpers.lock_unity()
         greeter = self.main_window.get_greeter()

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-08-04 16:55:24 +0000
@@ -39,7 +39,8 @@
         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.assertEqual(
+            'unity8-dash', self.main_window.get_current_focused_app_id())
         self.addCleanup(os.system, 'pkill qmlscene')
 
         subprocess.check_call(
@@ -47,4 +48,4 @@
         self.assert_current_focused_application(application_name)
 
         self.main_window.show_dash_swiping()
-        self.assert_current_focused_application('')
+        self.assert_current_focused_application('unity8-dash')

=== added file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2014-08-04 16:55:24 +0000
@@ -0,0 +1,64 @@
+# -*- 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/>.
+#
+
+import fixtures
+from autopilot import introspection
+
+from unity8 import process_helpers
+from unity8.shell import emulators
+
+
+class LaunchDashApp(fixtures.Fixture):
+
+    """Fixture to launch the Dash app."""
+
+    def __init__(self, binary_path, variables):
+        """Initialize an instance.
+
+        :param str binary_path: The path to the Dash app binary.
+        :param variables: The variables to use when launching the app.
+        :type variables: A dictionary.
+
+        """
+        super(LaunchDashApp, self).__init__()
+        self.binary_path = binary_path
+        self.variables = variables
+
+    def setUp(self):
+        """Launch the dash app when the fixture is used."""
+        super(LaunchDashApp, self).setUp()
+        self.addCleanup(self.stop_application)
+        self.application_proxy = self.launch_application()
+
+    def launch_application(self):
+        binary_arg = 'BINARY={}'.format(self.binary_path)
+        testability_arg = 'QT_LOAD_TESTABILITY={}'.format(1)
+        env_args = [
+            '{}={}'.format(key, value) for key, value in self.variables.items()
+        ]
+        all_args = [binary_arg, testability_arg] + env_args
+
+        pid = process_helpers.start_job('unity8-dash', *all_args)
+        return introspection.get_proxy_object_for_existing_process(
+            pid=pid,
+            emulator_base=emulators.UnityEmulatorBase,
+        )
+
+    def stop_application(self):
+        process_helpers.stop_job('unity8-dash')

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2014-06-27 13:13:04 +0000
+++ tests/autopilot/unity8/process_helpers.py	2014-08-04 16:55:24 +0000
@@ -36,6 +36,10 @@
 logger = logging.getLogger(__name__)
 
 
+class JobError(Exception):
+    pass
+
+
 class CannotAccessUnity(Exception):
     pass
 
@@ -134,48 +138,113 @@
     """
     status = _get_unity_status()
     if "start/" in status:
-        try:
-            output = subprocess.check_output(
-                ['/sbin/initctl', 'stop', 'unity8'])
-            logger.info(output)
-        except subprocess.CalledProcessError as e:
-            e.args += (
-                "Failed to stop running instance of unity8: %s" % e.output,
-            )
-            raise
-
+        stop_job('unity8')
+
+    pid = start_job('unity8', *args)
+    return _get_unity_proxy_object(pid)
+
+
+def start_job(name, *args):
+    """Start a job.
+
+    :param str name: The name of the job.
+    :param args: The arguments to be used when starting the job.
+    :return: The process id of the started job.
+    :raises CalledProcessError: if the job failed to start.
+
+    """
+    logger.info('Starting job {} with arguments {}.'.format(name, args))
+    command = ['/sbin/initctl', 'start', name] + list(args)
     try:
-        command = ['/sbin/initctl', 'start', 'unity8'] + list(args)
         output = subprocess.check_output(
             command,
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         )
         logger.info(output)
-        pid = _get_unity_pid()
+        pid = get_job_pid(name)
     except subprocess.CalledProcessError as e:
-        e.args += ("Failed to start unity8: %s" % e.output,)
+        e.args += ('Failed to start {}: {}.'.format(name, e.output),)
         raise
     else:
-        return _get_unity_proxy_object(pid)
-
-
-def _get_unity_status():
+        return pid
+
+
+def get_job_pid(name):
+    """Return the process id of a running job.
+
+    :param str name: The name of the job.
+    :raises JobError: if the job is not running.
+
+    """
+    status = get_job_status(name)
+    if "start/" not in status:
+        raise JobError('{} is not in the running state.'.format(name))
+    return int(status.split()[-1])
+
+
+def get_job_status(name):
+    """Return the status of a job.
+
+    :param str name: The name of the job.
+    :raises JobError: if it's not possible to get the status of the job.
+
+    """
     try:
         return subprocess.check_output([
             '/sbin/initctl',
             'status',
-            'unity8'
+            name
         ], universal_newlines=True)
+    except subprocess.CalledProcessError as error:
+        raise JobError(
+                "Unable to get {}'s status: {}".format(name, error)
+        )
+
+
+def stop_job(name):
+    """Stop a job.
+
+    :param str name: The name of the job.
+    :raises CalledProcessError: if the job failed to stop.
+
+    """
+    logger.info('Stoping job {}.'.format(name))
+    command = ['/sbin/initctl', 'stop', name]
+    try:
+        output = subprocess.check_output(
+            command,
+            stderr=subprocess.STDOUT,
+            universal_newlines=True,
+        )
+        logger.info(output)
     except subprocess.CalledProcessError as e:
-        raise CannotAccessUnity("Unable to get unity's status: %s" % str(e))
+        e.args += ('Failed to stop {}: {}.'.format(name, e.output),)
+        raise
+
+
+def is_job_running(name):
+    """Return True if the job is running. Otherwise, False.
+
+    :param str name: The name of the job.
+    :raises JobError: if it's not possible to get the status of the job.
+
+    """
+    return 'start/' in get_job_status(name)
+
+
+def _get_unity_status():
+    try:
+        return get_job_status('unity8')
+    except JobError as error:
+        raise CannotAccessUnity(str(error))
 
 
 def _get_unity_pid():
-    status = _get_unity_status()
-    if "start/" not in status:
-        raise CannotAccessUnity("Unity is not in the running state.")
-    return int(status.split()[-1])
+    try:
+        return get_job_pid('unity8')
+    except JobError as error:
+        raise CannotAccessUnity(str(error))
 
 
 def _get_unity_proxy_object(pid):

=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-07-28 17:06:57 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-08-04 16:55:24 +0000
@@ -31,6 +31,17 @@
 logger = logging.getLogger(__name__)
 
 
+class DashApp(object):
+
+    """Autopilot helper for the Dash app."""
+
+    def __init__(self, app_proxy):
+        self.app_proxy = app_proxy
+        self.main_view = self.app_proxy.select_single(
+            toolkit_emulators.MainView)
+        self.dash = self.main_view.select_single(Dash)
+
+
 class Dash(emulators.UnityEmulatorBase):
     """An emulator that understands the Dash."""
 
@@ -109,20 +120,22 @@
     @autopilot_logging.log_action(logger.info)
     def _scroll_to_left_scope(self):
         original_index = self.dash_content_list.currentIndex
-        dashContent = self.select_single(objectName="dashContent")
-        start_x = dashContent.width / 3
-        stop_x = dashContent.width / 3 * 2
-        start_y = stop_y = dashContent.globalRect.y + 1
+        dash_content = self.select_single(objectName="dashContent")
+        x, y, width, height = dash_content.globalRect
+        start_x = x + width / 3
+        stop_x = x + width / 3 * 2
+        start_y = stop_y = y + 1
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
         self.dash_content_list.currentIndex.wait_for(original_index - 1)
 
     @autopilot_logging.log_action(logger.info)
     def _scroll_to_right_scope(self):
         original_index = self.dash_content_list.currentIndex
-        dashContent = self.select_single(objectName="dashContent")
-        start_x = dashContent.width / 3 * 2
-        stop_x = dashContent.width / 3
-        start_y = stop_y = dashContent.globalRect.y + 1
+        dash_content = self.select_single(objectName="dashContent")
+        x, y, width, height = dash_content.globalRect
+        start_x = x + width / 3 * 2
+        stop_x = x + width / 3
+        start_y = stop_y = y + 1
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
         self.dash_content_list.currentIndex.wait_for(original_index + 1)
 

=== modified file 'tests/autopilot/unity8/shell/emulators/greeter.py'
--- tests/autopilot/unity8/shell/emulators/greeter.py	2014-01-09 15:53:05 +0000
+++ tests/autopilot/unity8/shell/emulators/greeter.py	2014-08-04 16:55:24 +0000
@@ -17,6 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import ubuntuuitoolkit
+
 from unity8.shell.emulators import UnityEmulatorBase
 
 
@@ -37,4 +39,5 @@
         self.created.wait_for(False)
 
     def get_prompt(self):
-        return self.select_single("TextField", objectName="passwordInput")
+        return self.select_single(
+            ubuntuuitoolkit.TextField, objectName='passwordInput')

=== 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-08-04 16:55:24 +0000
@@ -25,7 +25,6 @@
 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
 
 logger = logging.getLogger(__name__)
@@ -61,9 +60,6 @@
     def get_hud_edge_drag_area(self):
         return self.select_single(objectName="hudDragArea")
 
-    def get_dash(self):
-        return self.select_single(Dash)
-
     def get_bottombar(self):
         return self.select_single("Bottombar")
 
@@ -76,12 +72,6 @@
             objectName="pinPadLoader"
         )
 
-    def get_pinPadButton(self, buttonId):
-        return self.select_single(
-            "PinPadButton",
-            objectName="pinPadButton%i" % buttonId
-        )
-
     def get_lockscreen(self):
         return self.select_single("Lockscreen")
 
@@ -117,20 +107,44 @@
     @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
+        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)
-        return self.get_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.select_single('Shell').focusedApplicationId
+        return self._get_shell().focusedApplicationId
 
     @autopilot_logging.log_action(logger.info)
-    def search(self, query):
-        self.get_dash().enter_search_query(query)
+    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)
+        )

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2014-06-27 13:13:04 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2014-08-04 16:55:24 +0000
@@ -24,6 +24,7 @@
 except ImportError:
     Gio = None
 
+from autopilot import introspection
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 from autopilot.matchers import Eventually
@@ -34,6 +35,10 @@
 import subprocess
 import sys
 from testtools.matchers import Equals
+from ubuntuuitoolkit import (
+    fixture_setup as toolkit_fixtures,
+    ubuntu_scenarios
+)
 
 from unity8 import (
     get_lib_path,
@@ -42,9 +47,15 @@
     get_default_extra_mock_libraries,
     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 import (
+    fixture_setup,
+    process_helpers
+)
+from unity8.shell import emulators
+from unity8.shell.emulators import (
+    dash as dash_helpers,
+    main_window as main_window_emulator,
+)
 
 
 logger = logging.getLogger(__name__)
@@ -78,6 +89,26 @@
         return [native]
 
 
+def is_unity7_running():
+    """Return True if Unity7 is running. Otherwise, return False."""
+    return (
+        Gio is not None and
+        UNITYSHELL_GSETTINGS_SCHEMA in
+        Gio.Settings.list_relocatable_schemas()
+    )
+
+
+def get_qml_import_path_with_mock():
+    """Return the QML2_IMPORT_PATH value with the mock path prepended."""
+    qml_import_path = [get_mocks_library_path()]
+    if os.getenv('QML2_IMPORT_PATH') is not None:
+        qml_import_path.append(os.getenv('QML2_IMPORT_PATH'))
+
+    qml_import_path = ':'.join(qml_import_path)
+    logger.info("New QML2 import path: %s", qml_import_path)
+    return qml_import_path
+
+
 class UnityTestCase(AutopilotTestCase):
 
     """A test case base class for the Unity shell tests."""
@@ -118,23 +149,8 @@
 
     def setUp(self):
         super(UnityTestCase, self).setUp()
-        if (Gio is not None and
-                UNITYSHELL_GSETTINGS_SCHEMA in
-                Gio.Settings.list_relocatable_schemas()):
-
-            # Hide Unity launcher
-            self._unityshell_schema = Gio.Settings.new_with_path(
-                UNITYSHELL_GSETTINGS_SCHEMA,
-                UNITYSHELL_GSETTINGS_PATH,
-            )
-            self._launcher_hide_mode = self._unityshell_schema.get_int(
-                UNITYSHELL_LAUNCHER_KEY,
-            )
-            self._unityshell_schema.set_int(
-                UNITYSHELL_LAUNCHER_KEY,
-                UNITYSHELL_LAUNCHER_MODE,
-            )
-            self.addCleanup(self._reset_launcher)
+        if is_unity7_running():
+            self.useFixture(toolkit_fixtures.HideUnity7Launcher())
 
         self._proxy = None
         self._lightdm_mock_type = None
@@ -151,13 +167,6 @@
         self.touch = Touch.create()
         self._setup_display_details()
 
-    def _reset_launcher(self):
-        """Reset Unity launcher hide mode"""
-        self._unityshell_schema.set_int(
-            UNITYSHELL_LAUNCHER_KEY,
-            self._launcher_hide_mode,
-        )
-
     def _setup_display_details(self):
         scale_divisor = self._determine_geometry()
         self._setup_grid_size(scale_divisor)
@@ -263,7 +272,9 @@
             self.patch_lightdm_mock()
 
         if self._qml_mock_enabled:
-            self._setup_extra_mock_environment_patch()
+            self._environment['QML2_IMPORT_PATH'] = (
+                get_qml_import_path_with_mock()
+            )
 
         if self._data_dirs_mock_enabled:
             self._patch_data_dirs()
@@ -292,9 +303,14 @@
 
         # Ensure that the dash is visible before we return:
         logger.debug("Unity started, waiting for it to be ready.")
-        self.assertUnityReady()
+        self.wait_for_unity()
         logger.debug("Unity loaded and ready.")
 
+        if model() == 'Desktop':
+            # On desktop, close the dash because it's opened in a separate
+            # window and it gets in the way.
+            process_helpers.stop_job('unity8-dash')
+
         return app_proxy
 
     def _launch_unity_with_upstart(self, binary_path, args):
@@ -308,7 +324,7 @@
 
         self.addCleanup(self._cleanup_launching_upstart_unity)
 
-        return restart_unity_with_testability(*all_args)
+        return process_helpers.restart_unity_with_testability(*all_args)
 
     def _cleanup_launching_upstart_unity(self):
         logger.info("Stopping unity")
@@ -353,15 +369,6 @@
             )
         return lightdm_mock_path
 
-    def _setup_extra_mock_environment_patch(self):
-        qml_import_path = [get_mocks_library_path()]
-        if os.getenv('QML2_IMPORT_PATH') is not None:
-            qml_import_path.append(os.getenv('QML2_IMPORT_PATH'))
-
-        qml_import_path = ':'.join(qml_import_path)
-        logger.info("New QML2 import path: %s", qml_import_path)
-        self._environment['QML2_IMPORT_PATH'] = qml_import_path
-
     def _set_proxy(self, proxy):
         """Keep a copy of the proxy object, so we can use it to get common
         parts of the shell later on.
@@ -373,10 +380,80 @@
     def _clear_proxy(self):
         self._proxy = None
 
-    def assertUnityReady(self):
-        dash = self.get_dash()
-        home_scope = dash.get_scope('clickscope')
-
+    def wait_for_unity(self):
+        greeter_content_loader = self.main_window.wait_select_single(
+            objectName='greeterContentLoader')
+        greeter_content_loader.progress.wait_for(1)
+
+    def get_dash(self):
+        pid = process_helpers.get_job_pid('unity8-dash')
+        dash_proxy = introspection.get_proxy_object_for_existing_process(
+            pid=pid,
+            emulator_base=emulators.UnityEmulatorBase,
+        )
+        dash_app = dash_helpers.DashApp(dash_proxy)
+        return dash_app.dash
+
+    @property
+    def main_window(self):
+        return self._proxy.select_single(main_window_emulator.QQuickView)
+
+
+class DashBaseTestCase(AutopilotTestCase):
+
+    scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
+    qml_mock_enabled = True
+    environment = {}
+
+    def setUp(self):
+        super(DashBaseTestCase, self).setUp()
+
+        if is_unity7_running():
+            self.useFixture(toolkit_fixtures.HideUnity7Launcher())
+
+        if model() != 'Desktop':
+            # On the phone, we need unity to be running and unlocked.
+            self.addCleanup(process_helpers.stop_job, 'unity8')
+            process_helpers.restart_unity_with_testability()
+            process_helpers.unlock_unity()
+
+        self.ensure_dash_not_running()
+
+        if self.qml_mock_enabled:
+            self.environment['QML2_IMPORT_PATH'] = (
+                get_qml_import_path_with_mock()
+            )
+
+        if self.should_simulate_device():
+            # This sets the grid units, so it should be called before launching
+            # the app.
+            self.simulate_device()
+
+        binary_path = get_binary_path('unity8-dash')
+        dash_proxy = self.launch_dash(binary_path, self.environment)
+
+        if self.should_simulate_device():
+            # XXX Currently we have no way to launch the application with a
+            # specific size, so we must resize it after it's launched.
+            # --elopio - 2014-06-25
+            self.resize_window()
+
+        self.dash_app = dash_helpers.DashApp(dash_proxy)
+        self.dash = self.dash_app.dash
+        self.wait_for_dash()
+
+    def ensure_dash_not_running(self):
+        if process_helpers.is_job_running('unity8-dash'):
+            process_helpers.stop_job('unity8-dash')
+
+    def launch_dash(self, binary_path, variables):
+        launch_dash_app_fixture = fixture_setup.LaunchDashApp(
+            binary_path, variables)
+        self.useFixture(launch_dash_app_fixture)
+        return launch_dash_app_fixture.application_proxy
+
+    def wait_for_dash(self):
+        home_scope = self.dash.get_scope('clickscope')
         # FIXME! There is a huge timeout here for when we're doing CI on
         # VMs. See lp:1203715
         self.assertThat(
@@ -385,10 +462,26 @@
         )
         self.assertThat(home_scope.isCurrent, Eventually(Equals(True)))
 
-    def get_dash(self):
-        dash = self._proxy.wait_select_single(Dash)
-        return dash
-
-    @property
-    def main_window(self):
-        return self._proxy.select_single(main_window_emulator.QQuickView)
+    def should_simulate_device(self):
+        return (hasattr(self, 'app_width') and hasattr(self, 'app_height') and
+                hasattr(self, 'grid_unit_px'))
+
+    def simulate_device(self):
+        simulate_device_fixture = self.useFixture(
+            toolkit_fixtures.SimulateDevice(
+                self.app_width, self.app_height, self.grid_unit_px))
+        self.app_width = simulate_device_fixture.app_width
+        self.app_height = simulate_device_fixture.app_height
+
+    def resize_window(self):
+        application = self.process_manager.get_running_applications()[0]
+        window = application.get_windows()[0]
+        window.resize(self.app_width, self.app_height)
+
+        def get_window_size():
+            _, _, window_width, window_height = window.geometry
+            return window_width, window_height
+
+        self.assertThat(
+            get_window_size,
+            Eventually(Equals((self.app_width, self.app_height))))

=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-07-25 11:49:28 +0000
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-08-04 16:55:24 +0000
@@ -47,25 +47,14 @@
         unity_proxy = self.launch_unity()
         process_helpers.unlock_unity(unity_proxy)
 
+
+class DashEmulatorTestCase(tests.DashBaseTestCase):
+
     def test_search(self):
-        self.main_window.search('Test')
-        text_field = self.main_window.get_dash()._get_search_text_field()
+        self.dash.enter_search_query('Test')
+        text_field = self.dash._get_search_text_field()
         self.assertEqual(text_field.text, 'Test')
 
-
-class DashBaseTestCase(tests.UnityTestCase):
-
-    scenarios = tests._get_device_emulation_scenarios()
-
-    def setUp(self):
-        super(DashBaseTestCase, self).setUp()
-        unity_proxy = self.launch_unity()
-        process_helpers.unlock_unity(unity_proxy)
-        self.dash = self.main_window.get_dash()
-
-
-class DashEmulatorTestCase(DashBaseTestCase):
-
     def test_open_unexisting_scope(self):
         scope_name = 'unexisting'
         with mock.patch.object(self.dash, 'pointing_device') as mock_pointer:
@@ -145,7 +134,7 @@
         self.assertIsInstance(scope, dash_emulators.GenericScopeView)
 
 
-class GenericScopeViewEmulatorTestCase(DashBaseTestCase):
+class GenericScopeViewEmulatorTestCase(tests.DashBaseTestCase):
 
     def setUp(self):
         # Set up the fake scopes before launching unity.
@@ -159,7 +148,7 @@
         self.assertTrue(preview.isCurrent)
 
 
-class DashAppsEmulatorTestCase(DashBaseTestCase):
+class DashAppsEmulatorTestCase(tests.DashBaseTestCase):
 
     available_applications = [
         'Title.2.0', 'Title.2.1', 'Title.2.2',  'Title.2.3', 'Title.2.4',

=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-06-18 01:52:15 +0000
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-08-04 16:55:24 +0000
@@ -51,7 +51,7 @@
         if greeter.narrowMode:
             unlock_unity(unity_proxy)
             lockscreen = self._wait_for_lockscreen()
-            self._enter_pincode("1234")
+            self.main_window.enter_pin_code("1234")
             self.assertThat(lockscreen.shown, Eventually(Equals(False)))
         else:
             self._enter_prompt_passphrase("1234")
@@ -81,7 +81,7 @@
         if greeter.narrowMode:
             unlock_unity(unity_proxy)
             lockscreen = self._wait_for_lockscreen()
-            self._enter_pincode("4321")
+            self.main_window.enter_pin_code("4321")
             pinentryField = self.main_window.get_pinentryField()
             self.assertThat(pinentryField.text, Eventually(Equals("")))
             self.assertThat(lockscreen.shown, Eventually(Equals(True)))
@@ -118,28 +118,6 @@
         self.assertThat(lockscreen.shown, Eventually(Equals(True)))
         return lockscreen
 
-    def _enter_pincode(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, basestring):
-            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.touch.tap_object(self.main_window.get_pinPadButton(int(num)))
-
     def _enter_pin_passphrase(self, passphrase):
         """Enter the password specified in 'passphrase' into the password entry
         field of the pin lock screen.
@@ -148,18 +126,15 @@
         :raises: TypeError if passphrase is not a string.
 
         """
-        if not isinstance(passphrase, basestring):
+        if not isinstance(passphrase, str):
             raise TypeError(
                 "'passphrase' parameter must be a string, not %r."
                 % type(passphrase)
             )
 
-        pinentryField = self.main_window.get_pinentryField()
-        self.touch.tap_object(pinentryField)
-        self.assertThat(pinentryField.activeFocus, Eventually(Equals(True)))
-        for character in passphrase:
-            self._type_character(character, pinentryField)
-        logger.debug("Typed passphrase: %s", pinentryField.text)
+        pin_entry_field = self.main_window.get_pinentryField()
+        pin_entry_field.write(passphrase)
+        logger.debug("Typed passphrase: %s", pin_entry_field.text)
         self.keyboard.type("\n")
 
     def _enter_prompt_passphrase(self, passphrase):
@@ -177,21 +152,6 @@
             )
 
         prompt = self.main_window.get_greeter().get_prompt()
-        self.touch.tap_object(prompt)
-        self.assertThat(prompt.activeFocus, Eventually(Equals(True)))
-        for character in passphrase:
-            self._type_character(character, prompt)
+        prompt.write(passphrase)
         logger.debug("Typed passphrase: %s", prompt.text)
         self.keyboard.type("\n")
-
-    def _type_character(self, character, prompt, retries=5):
-        current_text = prompt.text
-        self.keyboard.type(character)
-        try:
-            self.assertThat(
-                prompt.text, Eventually(Equals(current_text + character)))
-        except AssertionError:
-            if retries > 0:
-                self._type_character(character, prompt, retries-1)
-            else:
-                raise

=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-18 15:13:35 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-08-04 16:55:24 +0000
@@ -154,7 +154,7 @@
             'Notification', objectName='notification1')
         notification = get_notification()
 
-        self.touch.tap_object(
+        notification.pointing_device.click_object(
             notification.select_single(objectName="interactiveArea")
         )
 
@@ -201,11 +201,14 @@
             'Notification', objectName='notification1')
         notification = get_notification()
         self._assert_notification(notification, summary, body, True, True, 1.0)
-        initial_height = notification.height
-        self.touch.tap_object(notification.select_single(objectName="combobutton_dropdown"))
-        self.assertThat(notification.select_single(objectName="button2").expanded, Eventually(Equals(True)))
+        notification.pointing_device.click_object(
+            notification.select_single(objectName="combobutton_dropdown"))
+        self.assertThat(
+            notification.select_single(objectName="button2").expanded,
+            Eventually(Equals(True)))
         time.sleep(2)
-        self.touch.tap_object(notification.select_single(objectName="button4"))
+        notification.pointing_device.click_object(
+            notification.select_single(objectName="button4"))
         self.assert_notification_action_id_was_called("action_decline_4")
 
     def test_modal_sd_without_greeter(self):
@@ -249,7 +252,8 @@
         notification = get_notification()
         self._assert_notification(
             notification, summary, body, True, False, 1.0)
-        self.touch.tap_object(notification.select_single(objectName="button0"))
+        notification.pointing_device.click_object(
+            notification.select_single(objectName="button0"))
         self.assert_notification_action_id_was_called("action_accept")
 
     def test_modal_sd_with_greeter(self):
@@ -291,7 +295,8 @@
         notification = get_notification()
         self._assert_notification(
             notification, summary, body, True, False, 1.0)
-        self.touch.tap_object(notification.select_single(objectName="button0"))
+        notification.pointing_device.click_object(
+            notification.select_single(objectName="button0"))
         self.assert_notification_action_id_was_called("action_accept")
 
     def _create_interactive_notification(

=== modified file 'tests/autopilot/unity8/shell/tests/test_upstart.py'
--- tests/autopilot/unity8/shell/tests/test_upstart.py	2014-07-31 10:11:27 +0000
+++ tests/autopilot/unity8/shell/tests/test_upstart.py	2014-08-04 16:55:24 +0000
@@ -119,7 +119,7 @@
         self._set_proxy()
 
         logger.debug("Unity started, waiting for it to be ready.")
-        self.assertUnityReady()
+        self.wait_for_unity()
         logger.debug("Unity loaded and ready.")
 
     def test_expect_sigstop(self):
@@ -137,5 +137,5 @@
 
         logger.debug("Unity started, waiting for it to be ready.")
         self._set_proxy()
-        self.assertUnityReady()
+        self.wait_for_unity()
         logger.debug("Unity loaded and ready.")