git.iko.soy/unity8
on xenial help sign in
Drop "8" from all the docstrings and copyright.
34e252bMichał Sawicz
tests/autopilot/setup.py+2−2
compare with xenial
unifiedsplit
@@ -1,7 +1,7 @@
1#!/usr/bin/python
1#!/usr/bin/python
2# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3#
3#
4−# Unity8 Autopilot Test Suite
4+# Unity Autopilot Test Suite
5# Copyright (C) 2012-2013 Canonical
5# Copyright (C) 2012-2013 Canonical
6#
6#
7# This program is free software: you can redistribute it and/or modify
7# This program is free software: you can redistribute it and/or modify
@@ -25,7 +25,7 @@ from setuptools import find_packages
25setup(
25setup(
26 name='unity',
26 name='unity',
27 version='8.0',
27 version='8.0',
28− description='Unity 8 autopilot tests.',
28+ description='Unity autopilot tests.',
29 url='https://launchpad.net/unity',
29 url='https://launchpad.net/unity',
30 license='GPLv3',
30 license='GPLv3',
31 packages=find_packages(),
31 packages=find_packages(),
tests/autopilot/unity8/__init__.py+2−2
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
18#
19
19
20−"""unity8 autopilot tests and emulators - top level package."""
20+"""unity autopilot tests and emulators - top level package."""
21import os
21import os
22import os.path
22import os.path
23import subprocess
23import subprocess
tests/autopilot/unity8/indicators_client/__init__.py+1−1
@@ -5,4 +5,4 @@
5# under the terms of the GNU General Public License version 3, as published
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
6# by the Free Software Foundation.
7
7
8−"""unity8 indicators-client autopilot tests and emulators - sub level package."""
8+"""unity indicators-client autopilot tests and emulators - sub level package."""
tests/autopilot/unity8/indicators_client/tests/__init__.py+1−1
@@ -5,7 +5,7 @@
5# under the terms of the GNU General Public License version 3, as published
5# under the terms of the GNU General Public License version 3, as published
6# by the Free Software Foundation.
6# by the Free Software Foundation.
7
7
8−"""qml-phone-shell autopilot tests."""
8+"""indicators-client autopilot tests."""
9
9
10import os.path
10import os.path
11
11
tests/autopilot/unity8/shell/__init__.py+2−2
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
18#
19
19
20−"""unity8 shell autopilot tests and emulators - sub level package."""
20+"""unity shell autopilot tests and emulators - sub level package."""
21
21
22from functools import wraps
22from functools import wraps
23import logging
23import logging
tests/autopilot/unity8/shell/emulators/__init__.py+3−3
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -21,5 +21,5 @@
21from autopilot.introspection import CustomEmulatorBase
21from autopilot.introspection import CustomEmulatorBase
22
22
23
23
24−class Unity8EmulatorBase(CustomEmulatorBase):
24+class UnityEmulatorBase(CustomEmulatorBase):
25− """A base class for all unity8 emulators."""
25+ """A base class for all unity emulators."""
tests/autopilot/unity8/shell/emulators/dash.py+3−3
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -17,10 +17,10 @@
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
18#
19
19
20−from unity8.shell.emulators import Unity8EmulatorBase
20+from unity8.shell.emulators import UnityEmulatorBase
21
21
22
22
23−class Dash(Unity8EmulatorBase):
23+class Dash(UnityEmulatorBase):
24
24
25 """An emulator that understands the Dash."""
25 """An emulator that understands the Dash."""
26
26
tests/autopilot/unity8/shell/emulators/greeter.py+3−3
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -17,11 +17,11 @@
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
18#
19
19
20−from unity8.shell.emulators import Unity8EmulatorBase
20+from unity8.shell.emulators import UnityEmulatorBase
21from autopilot.input import Touch
21from autopilot.input import Touch
22
22
23
23
24−class Greeter(Unity8EmulatorBase):
24+class Greeter(UnityEmulatorBase):
25
25
26 """An emulator that understands the greeter screen."""
26 """An emulator that understands the greeter screen."""
27
27
tests/autopilot/unity8/shell/emulators/hud.py+3−3
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -18,11 +18,11 @@
18#
18#
19
19
20from unity8 import get_grid_size
20from unity8 import get_grid_size
21−from unity8.shell.emulators import Unity8EmulatorBase
21+from unity8.shell.emulators import UnityEmulatorBase
22from autopilot.input import Touch
22from autopilot.input import Touch
23
23
24
24
25−class Hud(Unity8EmulatorBase):
25+class Hud(UnityEmulatorBase):
26
26
27 """An emulator that understands the Hud."""
27 """An emulator that understands the Hud."""
28
28
tests/autopilot/unity8/shell/emulators/launcher.py+3−3
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -17,11 +17,11 @@
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
18#
19
19
20−from unity8.shell.emulators import Unity8EmulatorBase
20+from unity8.shell.emulators import UnityEmulatorBase
21from autopilot.input import Touch
21from autopilot.input import Touch
22
22
23
23
24−class Launcher(Unity8EmulatorBase):
24+class Launcher(UnityEmulatorBase):
25
25
26 """An emulator that understands the Launcher."""
26 """An emulator that understands the Launcher."""
27
27
tests/autopilot/unity8/shell/emulators/main_window.py+1−1
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
tests/autopilot/unity8/shell/tests/__init__.py+10−10
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
18#
19
19
20−"""unity8 autopilot tests."""
20+"""unity autopilot tests."""
21
21
22from autopilot.platform import model
22from autopilot.platform import model
23from autopilot.testcase import AutopilotTestCase
23from autopilot.testcase import AutopilotTestCase
@@ -29,7 +29,7 @@ import os.path
29from testtools.matchers import Equals, NotEquals
29from testtools.matchers import Equals, NotEquals
30
30
31from unity8 import get_lib_path, get_binary_path, get_mocks_library_path
31from unity8 import get_lib_path, get_binary_path, get_mocks_library_path
32−from unity8.shell.emulators import Unity8EmulatorBase
32+from unity8.shell.emulators import UnityEmulatorBase
33from unity8.shell.emulators.dash import Dash
33from unity8.shell.emulators.dash import Dash
34from unity8.shell.emulators.main_window import MainWindow
34from unity8.shell.emulators.main_window import MainWindow
35
35
@@ -58,12 +58,12 @@ def _get_device_emulation_scenarios():
58 ]
58 ]
59
59
60
60
61−class Unity8TestCase(AutopilotTestCase):
61+class UnityTestCase(AutopilotTestCase):
62
62
63− """A test case base class for the Unity8 shell tests."""
63+ """A test case base class for the Unity shell tests."""
64
64
65 def setUp(self):
65 def setUp(self):
66− super(Unity8TestCase, self).setUp()
66+ super(UnityTestCase, self).setUp()
67 self._proxy = None
67 self._proxy = None
68 self.touch = Touch.create()
68 self.touch = Touch.create()
69 self._setup_display_details()
69 self._setup_display_details()
@@ -123,7 +123,7 @@ class Unity8TestCase(AutopilotTestCase):
123 return divisor
123 return divisor
124
124
125 def launch_unity(self):
125 def launch_unity(self):
126− """Launch the unity8 shell, return a proxy object for it."""
126+ """Launch the unity shell, return a proxy object for it."""
127 binary_path = get_binary_path()
127 binary_path = get_binary_path()
128 lib_path = get_lib_path()
128 lib_path = get_lib_path()
129
129
@@ -139,14 +139,14 @@ class Unity8TestCase(AutopilotTestCase):
139 binary_path,
139 binary_path,
140 *self.unity_geometry_args,
140 *self.unity_geometry_args,
141 app_type='qt',
141 app_type='qt',
142− emulator_base=Unity8EmulatorBase
142+ emulator_base=UnityEmulatorBase
143 )
143 )
144 self._set_proxy(app_proxy)
144 self._set_proxy(app_proxy)
145
145
146 # Ensure that the dash is visible before we return:
146 # Ensure that the dash is visible before we return:
147− logger.debug("Unity8 started, waiting for it to be ready.")
147+ logger.debug("Unity started, waiting for it to be ready.")
148 self.assertUnityReady()
148 self.assertUnityReady()
149− logger.debug("Unity8 loaded and ready.")
149+ logger.debug("Unity loaded and ready.")
150
150
151 return app_proxy
151 return app_proxy
152
152
tests/autopilot/unity8/shell/tests/test_hud.py+4−4
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@ from __future__ import absolute_import
22from collections import namedtuple
22from collections import namedtuple
23
23
24from unity8.shell import with_lightdm_mock
24from unity8.shell import with_lightdm_mock
25−from unity8.shell.tests import Unity8TestCase, _get_device_emulation_scenarios
25+from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
26
26
27from testtools.matchers import Equals
27from testtools.matchers import Equals
28from autopilot.matchers import Eventually
28from autopilot.matchers import Eventually
@@ -31,7 +31,7 @@ from autopilot.matchers import Eventually
31SwipeCoords = namedtuple('SwipeCoords', 'start_x end_x start_y end_y')
31SwipeCoords = namedtuple('SwipeCoords', 'start_x end_x start_y end_y')
32
32
33
33
34−class TestHud(Unity8TestCase):
34+class TestHud(UnityTestCase):
35
35
36 """Tests the Shell HUD."""
36 """Tests the Shell HUD."""
37
37
@@ -139,7 +139,7 @@ class TestHud(Unity8TestCase):
139
139
140 Because when testing on the desktop running
140 Because when testing on the desktop running
141 self.launch_application() will launch the application on the desktop
141 self.launch_application() will launch the application on the desktop
142− itself and not within the Unity8 UI.
142+ itself and not within the Unity UI.
143
143
144 """
144 """
145 dash = self.main_window.get_dash()
145 dash = self.main_window.get_dash()
tests/autopilot/unity8/shell/tests/test_lock_screen.py+3−3
@@ -1,6 +1,6 @@
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2#
2#
3−# Unity8 Autopilot Test Suite
3+# Unity Autopilot Test Suite
4# Copyright (C) 2012-2013 Canonical
4# Copyright (C) 2012-2013 Canonical
5#
5#
6# This program is free software: you can redistribute it and/or modify
6# This program is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@
21from __future__ import absolute_import
21from __future__ import absolute_import
22
22
23from unity8.shell import with_lightdm_mock
23from unity8.shell import with_lightdm_mock
24−from unity8.shell.tests import Unity8TestCase, _get_device_emulation_scenarios
24+from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
25
25
26from autopilot.matchers import Eventually
26from autopilot.matchers import Eventually
27from autopilot.platform import model
27from autopilot.platform import model
@@ -29,7 +29,7 @@ from testtools import skipUnless
29from testtools.matchers import Equals
29from testtools.matchers import Equals
30
30
31
31
32−class TestLockscreen(Unity8TestCase):
32+class TestLockscreen(UnityTestCase):
33
33
34 """Tests for the lock screen."""
34 """Tests for the lock screen."""
35
35