Index: xpresser/tests/test_xp.py |
=== gustavo@niemeyer.net-20110514045251-qj5fj1bye7syxhwh > chris.wayne@canonical.com-20111213235530-pjt86sxuqwzs5ouf |
=== modified file 'xpresser/tests/test_xp.py' |
--- xpresser/tests/test_xp.py 2010-11-08 14:38:23 +0000 |
+++ xpresser/tests/test_xp.py 2011-12-13 23:55:30 +0000 |
@@ -71,13 +71,15 @@ |
self.button_clicked = False |
self.button_rclicked = False |
self.button_hovered = False |
- |
+ self.button_dclicked = False |
+ |
def clicked(widget, event): |
- if event.button == 1: |
+ if event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS: |
+ self.button_dclicked = True |
+ elif event.button == 1 and event.type == gtk.gdk.BUTTON_PRESS: |
self.button_clicked = True |
elif event.button == 3: |
self.button_rclicked = True |
- self.window.destroy() |
def entered(widget): |
self.button_hovered = True |
@@ -148,6 +150,7 @@ |
self.xp.click(*self.get_button_center()) |
self.flush_gtk() |
self.assertTrue(self.button_clicked) |
+ self.window.destroy() |
def test_hover_position(self): |
self.xp.hover(*self.get_button_center()) |
@@ -159,11 +162,19 @@ |
self.xp.click("red-square") |
self.flush_gtk() |
self.assertTrue(self.button_clicked) |
+ self.window.destroy() |
def test_right_click_image_name(self): |
self.xp.right_click("red-square") |
self.flush_gtk() |
self.assertTrue(self.button_rclicked) |
+ self.window.destroy() |
+ |
+ def test_double_click_image_name(self): |
+ self.xp.double_click("red-square") |
+ self.flush_gtk() |
+ self.assertTrue(self.button_dclicked) |
+ self.window.destroy() |
def test_hover_image_name(self): |
self.xp.hover("red-square") |
@@ -176,12 +187,21 @@ |
self.xp.click(match) |
self.flush_gtk() |
self.assertTrue(self.button_clicked) |
+ self.window.destroy() |
def test_right_click_image_match(self): |
match = self.xp.find("red-square") |
self.xp.right_click(match) |
self.flush_gtk() |
self.assertTrue(self.button_rclicked) |
+ self.window.destroy() |
+ |
+ def test_double_click_image_match(self): |
+ match = self.xp.find("red-square") |
+ self.xp.double_click(match) |
+ self.flush_gtk() |
+ self.assertTrue(self.button_dclicked) |
+ self.window.destroy() |
def test_hover_image_match(self): |
match = self.xp.find("red-square") |
@@ -204,6 +224,7 @@ |
self.assertTrue(time.time() - started > SLEEP_DELAY) |
self.flush_gtk() |
self.assertTrue(self.button_clicked) |
+ self.window.destroy() |
def test_right_click_waits(self): |
self.window.hide() |
@@ -219,6 +240,23 @@ |
self.assertTrue(time.time() - started > SLEEP_DELAY) |
self.flush_gtk() |
self.assertTrue(self.button_rclicked) |
+ self.window.destroy() |
+ |
+ def test_double_click_waits(self): |
+ self.window.hide() |
+ self.flush_gtk() |
+ def show_window(): |
+ time.sleep(SLEEP_DELAY) |
+ self.window.show() |
+ self.flush_gtk() |
+ thread = threading.Thread(target=show_window) |
+ started = time.time() |
+ thread.start() |
+ self.xp.double_click("red-square") |
+ self.assertTrue(time.time() - started > SLEEP_DELAY) |
+ self.flush_gtk() |
+ self.assertTrue(self.button_dclicked) |
+ self.window.destroy() |
def test_hover_waits(self): |
self.window.hide() |