summaryrefslogtreecommitdiff
path: root/tests
diff options
authorThomi Richards <thomi.richards@canonical.com>2012-04-27 08:08:26 +1200
committerThomi Richards <thomi.richards@canonical.com>2012-04-27 08:08:26 +1200
commit2959f7010cdade4a6c4541f8962e3dfdd59d7ac6 (patch)
treed4269beebb41df9a05f4370c5f51b8f055a10fbb /tests
parent1cf6258c47c285e734f639c6d7aeb41e28bcc0df (diff)
Fixed trailing whitespace issues.
(bzr r2317.5.1)
Diffstat (limited to 'tests')
-rw-r--r--tests/autopilot/autopilot/emulators/unity/switcher.py9
-rw-r--r--tests/autopilot/autopilot/tests/test_switcher.py32
2 files changed, 21 insertions, 20 deletions
diff --git a/tests/autopilot/autopilot/emulators/unity/switcher.py b/tests/autopilot/autopilot/emulators/unity/switcher.py
index 5b34bc6f4..637a32805 100644
--- a/tests/autopilot/autopilot/emulators/unity/switcher.py
+++ b/tests/autopilot/autopilot/emulators/unity/switcher.py
@@ -28,8 +28,8 @@ class SwitcherMode():
class Switcher(KeybindingsHelper):
- """A class for interacting with the switcher.
-
+ """A class for interacting with the switcher.
+
Abstracts out switcher implementation, and makes the necessary functionality available
to consumer code.
@@ -66,7 +66,7 @@ class Switcher(KeybindingsHelper):
"""The index of the currently selected icon"""
return self.controller.model.selection_index
- @property
+ @property
def mode(self):
"""Returns the SwitcherMode that the switcher is currently in."""
if not self.visible:
@@ -107,8 +107,9 @@ class Switcher(KeybindingsHelper):
def cancel(self):
"""Stop switcher without activating the selected icon and releasing the keys.
+
NOTE: Does not release Alt.
-
+
"""
logger.debug("Cancelling switcher.")
self.keybinding("switcher/cancel")
diff --git a/tests/autopilot/autopilot/tests/test_switcher.py b/tests/autopilot/autopilot/tests/test_switcher.py
index ec1c92644..cec7dfed5 100644
--- a/tests/autopilot/autopilot/tests/test_switcher.py
+++ b/tests/autopilot/autopilot/tests/test_switcher.py
@@ -94,11 +94,11 @@ class SwitcherTests(SwitcherTestCase):
self.switcher.terminate()
def test_switcher_scroll_next_ignores_fast_events(self):
- """Ensures that smoothing is working correctly for next icon scrolling.
-
- Only the first event in a rapid fire string of events should be acted upon.
+ """Ensures that smoothing is working correctly for next icon scrolling.
+
+ Only the first event in a rapid fire string of events should be acted upon.
The rest ignored.
-
+
"""
self.switcher.initiate()
self.addCleanup(self.switcher.terminate)
@@ -112,11 +112,11 @@ class SwitcherTests(SwitcherTestCase):
self.assertThat(self.switcher.selection_index, Equals(start + 1))
def test_switcher_scroll_prev_ignores_fast_events(self):
- """Ensures that smoothing is working correctly for previous icon scrolling.
-
- Only the first event in a rapid fire string of events should be acted upon.
+ """Ensures that smoothing is working correctly for previous icon scrolling.
+
+ Only the first event in a rapid fire string of events should be acted upon.
The rest ignored.
-
+
"""
self.switcher.initiate()
self.addCleanup(self.switcher.terminate)
@@ -131,7 +131,7 @@ class SwitcherTests(SwitcherTestCase):
def test_switcher_arrow_key_does_not_init(self):
"""Ensure that Alt+Right does not initiate switcher.
-
+
Regression test for LP:??????
"""
@@ -168,7 +168,7 @@ class SwitcherTests(SwitcherTestCase):
def test_switcher_appears_on_monitor_with_focused_window(self):
"""Tests that the switches appears on the correct monitor.
-
+
This is defined as the monitor with a focused window.
"""
@@ -189,11 +189,11 @@ class SwitcherWindowsManagementTests(SwitcherTestCase):
def test_switcher_raises_only_last_focused_window(self):
"""Tests that when we do an alt+tab only the previously focused window is raised.
-
+
This is tests by opening 2 Calculators and a Mahjongg.
Then we do a quick alt+tab twice.
Then we close the currently focused window.
-
+
"""
#FIXME: Setup
# There are a lot of asserts in this test that are just making sure the env. is properly
@@ -268,7 +268,7 @@ class SwitcherDetailsTests(SwitcherTestCase):
def test_no_details_for_apps_on_different_workspace(self):
"""Tests that details mode does not initiates when there are multiple windows
-
+
of an application spread across different workspaces.
Regression test for LP:933406.
@@ -296,7 +296,7 @@ class SwitcherDetailsTests(SwitcherTestCase):
class SwitcherDetailsModeTests(SwitcherTestCase):
"""Tests for the details mode of the switcher.
-
+
Tests for initiation with both grave (`) and Down arrow.
"""
@@ -318,7 +318,7 @@ class SwitcherDetailsModeTests(SwitcherTestCase):
def test_next_icon_from_last_detail_works(self):
"""Pressing next while showing last switcher item in details mode
-
+
must select first item in the model in non-details mode.
"""
@@ -380,7 +380,7 @@ class SwitcherWorkspaceTests(SwitcherTestCase):
def test_switcher_can_switch_to_minimised_window(self):
"""Switcher must be able to switch to a minimised window when there's
-
+
another instance of the same application on a different workspace.
"""