summaryrefslogtreecommitdiff
path: root/tests
diff options
authorThomi Richards <thomi.richards@canonical.com>2012-07-05 17:48:38 +1200
committerThomi Richards <thomi.richards@canonical.com>2012-07-05 17:48:38 +1200
commit0d62f895fa367db7823b2c2d41f5e65107577e4d (patch)
tree4b12aca8fbdda32aa5a197be3759651319d1ba8f /tests
parent6c25e741e3c0f8553d36f724f2cefb7a18dd03ac (diff)
Removed some tests that I realised were duplicated.
(bzr r2470.5.46)
Diffstat (limited to 'tests')
-rw-r--r--tests/autopilot/unity/tests/test_panel.py54
1 files changed, 0 insertions, 54 deletions
diff --git a/tests/autopilot/unity/tests/test_panel.py b/tests/autopilot/unity/tests/test_panel.py
index 1a5c8520b..3818f5e57 100644
--- a/tests/autopilot/unity/tests/test_panel.py
+++ b/tests/autopilot/unity/tests/test_panel.py
@@ -887,60 +887,6 @@ class PanelMenuTests(PanelTestsBase):
self.assertThat(self.panel.menus_shown, Eventually(Equals(False)))
- def test_menus_show_after_closing_an_entry(self):
- """Opening a menu entry, and then hovering on other entries must open them.
-
- We also check that the menus are still drawn when closed.
- """
- # TODO - should be split into multiple tests.
- self.open_new_application_window("Calculator")
- entries = self.panel.menus.get_entries()
-
- self.assertThat(len(entries), GreaterThan(0))
- self.mouse_open_indicator(entries[0])
-
- for entry in entries:
- entry.mouse_move_to()
-
- self.assertThat(entry.active, Eventually(Equals(True)))
- self.assertThat(entry.menu_y, Eventually(NotEquals(0)))
-
- entries[-1].mouse_click()
- self.assertThat(entries[-1].active, Eventually(Equals(False)))
- self.assertThat(entries[-1].menu_y, Eventually(Equals(0)))
-
- def test_menus_show_when_indicator_active_and_mouse_over_panel(self):
- """When an indicator is opened, and the mouse goes over the panel view,
- the menus must be revealed.
- """
- self.open_new_application_window("Calculator")
- indicator = self.panel.indicators.get_indicator_by_name_hint("indicator-session-devices")
- self.mouse_open_indicator(indicator)
- self.sleep_menu_settle_period()
-
- self.assertThat(self.panel.menus_shown, Eventually(Equals(False)))
- self.panel.move_mouse_below_the_panel()
-
- self.assertThat(self.panel.menus_shown, Eventually(Equals(False)))
- self.panel.move_mouse_over_grab_area()
- self.assertThat(self.panel.menus_shown, Eventually(Equals(True)))
-
- def test_menus_show_when_holding_show_menu_key(self):
- self.open_new_application_window("Calculator")
- sleep(self.panel.menus.fadein_duration / 1000.0)
- sleep(self.panel.menus.discovery_duration)
- sleep(self.panel.menus.fadeout_duration / 1000.0)
-
- self.keybinding_hold("panel/show_menus")
- self.addCleanup(self.keybinding_release, "panel/show_menus")
- sleep(1)
- self.assertTrue(self.panel.menus_shown)
-
- self.keybinding_release("panel/show_menus")
- sleep(self.panel.menus.fadeout_duration / 1000.0)
-
- self.assertFalse(self.panel.menus_shown)
-
class PanelIndicatorEntriesTests(PanelTestsBase):
"""Tests for the indicator entries, including both menu and indicators."""