Merge lp:~canonical-platform-qa/ubuntu-system-tests/helpers-autopilot-selftests into lp:ubuntu-system-tests

[Richard Huddie]

[lp:~canonical-platform-qa/ubuntu-system-tests/helpers-autopilot-selftests]

390. By Richard Huddie on 2016-05-23

Some basic tests, don't restart unity8.

391. By Richard Huddie on 2016-05-23

search selftest.

392. By Richard Huddie on 2016-05-23

Open scope test.

393. By Richard Huddie on 2016-05-24

More dash helpers tests.

394. By Richard Huddie on 2016-05-24

Merge from trunk.

395. By Richard Huddie on 2016-05-24

Minor updates.

396. By Richard Huddie on 2016-06-07

Merge from trunk.

397. By Richard Huddie on 2016-06-07

unity8 shellview selftests.

Unmerged revisions

397. By Richard Huddie on 2016-06-07

unity8 shellview selftests.

396. By Richard Huddie on 2016-06-07

Merge from trunk.

395. By Richard Huddie on 2016-05-24

Minor updates.

394. By Richard Huddie on 2016-05-24

Merge from trunk.

393. By Richard Huddie on 2016-05-24

More dash helpers tests.

392. By Richard Huddie on 2016-05-23

Open scope test.

391. By Richard Huddie on 2016-05-23

search selftest.

390. By Richard Huddie on 2016-05-23

Some basic tests, don't restart unity8.

389. By Richard Huddie on 2016-05-20

Move existing selftests to host directory.

=== modified file 'setup.py'
--- setup.py	2016-05-09 13:56:53 +0000
+++ setup.py	2016-06-07 18:44:26 +0000
@@ -48,7 +48,7 @@
             'ubuntu-system-tests = ubuntu_system_tests.run:main'
         ]
     },
-    test_suite='ubuntu_system_tests.selftests',
+    test_suite='ubuntu_system_tests.selftests.host',
     tests_require=[
         'python-subunit',
     ]

=== modified file 'ubuntu_system_tests/helpers/unity8/__init__.py'
--- ubuntu_system_tests/helpers/unity8/__init__.py	2016-05-05 19:11:42 +0000
+++ ubuntu_system_tests/helpers/unity8/__init__.py	2016-06-07 18:44:26 +0000
@@ -19,6 +19,8 @@
 #
 
 from ubuntuuitoolkit import UbuntuUIToolkitCustomProxyObjectBase
+from ubuntuuitoolkit._custom_proxy_objects._common import (
+    _is_testability_enabled_for_process)
 from unity8 import process_helpers
 
 from autopilot import introspection
@@ -27,6 +29,7 @@
 
 from ubuntu_system_tests.helpers import context
 from ubuntu_system_tests.helpers import timer
+from ubuntu_system_tests.helpers.processes import get_process_id
 from ubuntu_system_tests.helpers.unity8 import greeter
 
 PROC_NAME = 'unity8'
@@ -49,6 +52,10 @@
     greeter.hide_greeter_with_dbus()
 
 
+def is_testability_enabled_for_unity8():
+    return _is_testability_enabled_for_process(get_process_id(PROC_NAME))
+
+
 def _is_unity8_running():
     return process_helpers.is_job_running('unity8')
 

=== added directory 'ubuntu_system_tests/selftests/helpers'
=== added file 'ubuntu_system_tests/selftests/helpers/base.py'
--- ubuntu_system_tests/selftests/helpers/base.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/selftests/helpers/base.py	2016-06-07 18:44:26 +0000
@@ -0,0 +1,45 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 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
+
+from ubuntu_system_tests.helpers import unity8
+from ubuntu_system_tests.tests.base import BaseUbuntuSystemTestCase
+
+logger = logging.getLogger(__name__)
+
+
+class BaseHelperSelfTestCase(BaseUbuntuSystemTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+    def setUp(self):
+        super().setUp()
+        if not unity8.is_testability_enabled_for_unity8():
+            self.shell = self.restart_unity().main_window
+        else:
+            self.shell = self._get_unity8_proxy_object().main_window
+        self.shell.show_dash_from_launcher()

=== added directory 'ubuntu_system_tests/selftests/helpers/unity8'
=== added file 'ubuntu_system_tests/selftests/helpers/unity8/test_dash.py'
--- ubuntu_system_tests/selftests/helpers/unity8/test_dash.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/selftests/helpers/unity8/test_dash.py	2016-06-07 18:44:26 +0000
@@ -0,0 +1,75 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 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/>.
+#
+
+from ubuntu_system_tests.helpers.maliit import get_keyboard
+from ubuntu_system_tests.helpers.unity8 import get_dash
+from ubuntu_system_tests.selftests.helpers import base
+
+
+class DashHelpersTestCase(base.BaseHelperSelfTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.dash = get_dash()
+
+    def _open_apps_scope(self):
+        original = self.dash.get_current_scope().get_title()
+        self.dash.open_scope('clickscope')
+        apps_scope = self.dash.get_current_scope()
+        apps_title = apps_scope.get_title()
+        self.assertEqual(apps_title, 'Apps')
+        self.assertNotEqual(apps_title, original)
+        return apps_scope
+
+    def test_scroll_scope_left_right(self):
+        original = self.dash.get_current_scope().get_title()
+        self.dash.scroll_to_right_scope()
+        right = self.dash.get_current_scope().get_title()
+        self.assertNotEqual(original, right)
+        self.dash.scroll_to_left_scope()
+        left = self.dash.get_current_scope().get_title()
+        self.assertEqual(original, left)
+
+    def test_manage_scopes(self):
+        manager = self.dash.open_manage_scopes()
+        self.assertGreater(len(manager.get_scopes_list()), 0)
+
+    def test_search(self):
+        textfield = self.dash.get_search_text_field()
+        query = 'test query'
+        self.dash.enter_search_query(query, get_keyboard())
+        self.assertEqual(textfield.text, query)
+
+    def test_open_scope(self):
+        self._open_apps_scope()
+
+    def test_wait_for_dash_loaded(self):
+        scope = self._open_apps_scope()
+        scope.refresh()
+        self.dash.wait_for_dash_loaded()
+
+    def test_wait_for_processing_to_complete(self):
+        scope = self._open_apps_scope()
+        scope.refresh()
+        self.dash.wait_for_processing_to_complete()
+
+    def test_get_application_icon(self):
+        self._open_apps_scope()
+        self.assertIsNotNone(self.dash.get_application_icon('Phone'))

=== added file 'ubuntu_system_tests/selftests/helpers/unity8/test_shell.py'
--- ubuntu_system_tests/selftests/helpers/unity8/test_shell.py	1970-01-01 00:00:00 +0000
+++ ubuntu_system_tests/selftests/helpers/unity8/test_shell.py	2016-06-07 18:44:26 +0000
@@ -0,0 +1,51 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 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/>.
+#
+
+
+from ubuntu_system_tests.helpers.unity8 import get_dash
+from ubuntu_system_tests.selftests.helpers import base
+
+
+class ShellViewHelpersTestCase(base.BaseHelperSelfTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.dash = get_dash()
+
+    def _launch_application(self, app_id):
+        self.shell.launch_application(app_id)
+        self.assertEqual(self.shell.get_current_focused_app(), app_id)
+
+    def test_launch_application(self):
+        self.assertEqual(self.shell.get_current_focused_app(), 'unity8-dash')
+        self._launch_application('dialer-app')
+
+    def test_show_dash_from_launcher(self):
+        self._launch_application('dialer-app')
+        self.shell.show_dash_from_launcher()
+        self.assertEqual(self.shell.get_current_focused_app(), 'unity8-dash')
+
+    def test_open_launcher(self):
+        self.assertFalse(self.shell.is_launcher_open())
+        launcher = self.shell.open_launcher()
+        self.assertTrue(self.shell.is_launcher_open())
+        launcher.click_dash_icon()
+        launcher.shown.wait_for(False)
+        self.assertFalse(self.shell.is_launcher_open())

=== added directory 'ubuntu_system_tests/selftests/host'
=== renamed file 'ubuntu_system_tests/selftests/__init__.py' => 'ubuntu_system_tests/selftests/host/__init__.py'
=== renamed file 'ubuntu_system_tests/selftests/test_command_line.py' => 'ubuntu_system_tests/selftests/host/test_command_line.py'
--- ubuntu_system_tests/selftests/test_command_line.py	2016-05-26 16:40:52 +0000
+++ ubuntu_system_tests/selftests/host/test_command_line.py	2016-06-07 18:44:26 +0000
@@ -26,9 +26,9 @@
 
 import testscenarios
 
-from ubuntu_system_tests import selftests
 from ubuntu_system_tests.host import command_line
 from ubuntu_system_tests.common import config
+from ubuntu_system_tests.selftests.host import ConfigBaseTestCase
 
 
 def check_any_item_in_list_contains_value(list, value):
@@ -39,7 +39,7 @@
     return any(item.startswith(value) for item in list)
 
 
-class CommandLineTestCase(selftests.ConfigBaseTestCase):
+class CommandLineTestCase(ConfigBaseTestCase):
 
     def setUp(self):
         super().setUp()
@@ -269,7 +269,7 @@
                 self.assertEqual(tmp_control_content, expected_content)
 
 
-class RunSystemTestsCommandsTestCase(selftests.ConfigBaseTestCase,
+class RunSystemTestsCommandsTestCase(ConfigBaseTestCase,
                                      testscenarios.TestWithScenarios):
 
     scenarios = [

=== renamed file 'ubuntu_system_tests/selftests/test_config.py' => 'ubuntu_system_tests/selftests/host/test_config.py'
--- ubuntu_system_tests/selftests/test_config.py	2016-05-06 16:39:14 +0000
+++ ubuntu_system_tests/selftests/host/test_config.py	2016-06-07 18:44:26 +0000
@@ -25,13 +25,14 @@
 import fixtures
 from autopilot.introspection import ProxyBase
 
-from ubuntu_system_tests import selftests
 from ubuntu_system_tests.common import config
 from ubuntu_system_tests.common.options import Option
 from ubuntu_system_tests.helpers.autopilot import override_proxy_timeout
-
-
-class HelpersTestCase(selftests.ConfigBaseTestCase):
+from ubuntu_system_tests.selftests.host import (
+    ConfigBaseTestCase, DEFAULT_SECTION)
+
+
+class HelpersTestCase(ConfigBaseTestCase):
 
     def get_mock_proxy(self):
         """Returns a rubbish proxy object that doesn't actually do anything."""
@@ -58,7 +59,7 @@
         self.assertEqual(proxy._poll_time, original_timeout)
 
 
-class ConfigDirTestCase(selftests.ConfigBaseTestCase):
+class ConfigDirTestCase(ConfigBaseTestCase):
 
     def test_default_config_dir_must_be_in_home(self):
         config_dir = os.path.join(os.environ.get('HOME'), '.config')
@@ -70,7 +71,7 @@
         self.assertEqual(xdg_dir, config.get_user_config_dir())
 
 
-class UbuntuSystemTestsStackTestCase(selftests.ConfigBaseTestCase):
+class UbuntuSystemTestsStackTestCase(ConfigBaseTestCase):
 
     def test_store_location(self):
         config_stack = config.UbuntuSystemTestsConfig()
@@ -82,7 +83,7 @@
     def test_get_autopilot_config_string(self):
         config_stack = config.UbuntuSystemTestsConfig()
         config_stack.get_config_from_string(
-            selftests.DEFAULT_SECTION + 'option1 = value1\noption2 = value2\n')
+            DEFAULT_SECTION + 'option1 = value1\noption2 = value2\n')
 
         autopilot_config_string = config_stack.get_autopilot_config_string()
         self.assertEqual(
@@ -118,8 +119,7 @@
         stream.seek(0)
 
 
-class UbuntuSystemTestsStackWithTestOptionsTestCase(
-        selftests.ConfigBaseTestCase):
+class UbuntuSystemTestsStackWithTestOptionsTestCase(ConfigBaseTestCase):
 
     MANDATORY = [
         Option('test.option1', help_string='Test option 1', mandatory=True),
@@ -176,7 +176,7 @@
         self.register_test_options(only_default)
         config_stack = config.UbuntuSystemTestsConfig(
             options=self.test_options)
-        config_string = selftests.DEFAULT_SECTION
+        config_string = DEFAULT_SECTION
         config_string += '\n'.join(
             ['{} = {}\n'.format(o, v) for o, v in self.ALL_EXISTING_OPTIONS]
         )
@@ -288,7 +288,7 @@
             config_lines.pop()
 
         expected_config_lines = [
-            selftests.DEFAULT_SECTION,
+            DEFAULT_SECTION,
             # Already existing options.
             'test.option7 = option7 existing value\n',
             'test.option8 = option8 existing value\n',
@@ -316,7 +316,7 @@
             config_lines.pop()
 
         expected_config_lines = [
-            selftests.DEFAULT_SECTION,
+            DEFAULT_SECTION,
             # Already existing options.
             'test.option7 = option7 existing value\n',
             'test.option8 = option8 existing value\n',

=== renamed file 'ubuntu_system_tests/selftests/test_results.py' => 'ubuntu_system_tests/selftests/host/test_results.py'
--- ubuntu_system_tests/selftests/test_results.py	2016-05-09 12:46:08 +0000
+++ ubuntu_system_tests/selftests/host/test_results.py	2016-06-07 18:44:26 +0000
@@ -22,19 +22,19 @@
 import os
 from unittest import mock
 
-from ubuntu_system_tests import selftests
+from ubuntu_system_tests.common import config
 from ubuntu_system_tests.host import results
-from ubuntu_system_tests.common import config
-
-
-class ResultsTestCase(selftests.ConfigBaseTestCase):
+from ubuntu_system_tests.selftests.host import (
+    ConfigBaseTestCase, DEFAULT_SECTION)
+
+
+class ResultsTestCase(ConfigBaseTestCase):
 
     def setUp(self):
         super().setUp()
         self.config_stack = config.UbuntuSystemTestsConfig()
         self.config_stack.get_config_from_string(
-            selftests.DEFAULT_SECTION + 'output_dir = {}'.format(
-                self.uniq_dir))
+            DEFAULT_SECTION + 'output_dir = {}'.format(self.uniq_dir))
 
     def test_convert_subunit_results_to_pyunit(self):
         artifacts_directory = results.get_artifacts_directory(

=== renamed file 'ubuntu_system_tests/selftests/test_testbed_commands.py' => 'ubuntu_system_tests/selftests/host/test_testbed_commands.py'
--- ubuntu_system_tests/selftests/test_testbed_commands.py	2016-05-06 16:39:14 +0000
+++ ubuntu_system_tests/selftests/host/test_testbed_commands.py	2016-06-07 18:44:26 +0000
@@ -18,14 +18,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from ubuntu_system_tests import (
-    systemtests,
-    selftests
-)
+from ubuntu_system_tests import systemtests
 from ubuntu_system_tests.common import config
-
-
-class AutopilotCommandsTestCase(selftests.ConfigBaseTestCase):
+from ubuntu_system_tests.selftests.host import ConfigBaseTestCase
+
+
+class AutopilotCommandsTestCase(ConfigBaseTestCase):
 
     def test_verbose_flag_present_by_default(self):
         self.config_stack = config.UbuntuSystemTestsConfig()

=== renamed file 'ubuntu_system_tests/selftests/test_tests_to_run.py' => 'ubuntu_system_tests/selftests/host/test_tests_to_run.py'
--- ubuntu_system_tests/selftests/test_tests_to_run.py	2016-05-06 16:39:14 +0000
+++ ubuntu_system_tests/selftests/host/test_tests_to_run.py	2016-06-07 18:44:26 +0000
@@ -28,11 +28,9 @@
 import fixtures
 import testscenarios
 
-from ubuntu_system_tests import (
-    external_tests,
-    selftests,
-)
+from ubuntu_system_tests import external_tests
 from ubuntu_system_tests.common import get_tests_ids_to_run
+from ubuntu_system_tests.selftests.host import ConfigBaseTestCase
 
 
 class ExternalTestsListFile(fixtures.Fixture):
@@ -170,7 +168,7 @@
         self.assertTrue(fake_process_helpers.is_job_running('unity8'))
 
 
-class GetTestIdsToRunTestCase(selftests.ConfigBaseTestCase):
+class GetTestIdsToRunTestCase(ConfigBaseTestCase):
 
     def test_get_tests_with_no_internal_tests_module(self):
         external_tests = ['external_test_1']