Merge lp:~cwayne/xpresser/xpresser-double-click into lp:~niemeyer/xpresser/trunk

[Chris Wayne]

Add support for double clicking.

https://codereview.appspot.com/5485056/

[Chris Wayne (cwayne)]

Reviewers: mp+85175_code.launchpad.net,

Message:
Please take a look.

Description:
Added double click funcitonality

https://code.launchpad.net/~cwayne18/xpresser/xpresser-double-click/+merge/85175

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/5485056/

Affected files:
   M xpresser/xp.py
   M xpresser/xutils.py

Index: xpresser/xp.py
=== <email address hidden> >
<email address hidden>
=== modified file 'xpresser/xp.py'
--- xpresser/xp.py 2010-11-08 14:38:23 +0000
+++ xpresser/xp.py 2011-12-09 18:35:34 +0000
@@ -76,6 +76,16 @@
              xp.right_click(x, y)
          """
          xutils.right_click(*self._compute_focus_point(args))
+
+ def double_click(self, *args):
+ '''Double clicks over the position specified by arguments
+
+ The following examples show valid ways of specifying te position:
+ xp.double_click("image-name")
+ xp.double_click(image_match)
+ xp.double_click(x, y)
+ '''
+ xutils.double_click(*self._compute_focus_point(args))

      def hover(self, *args):
          """Hover over the position specified by the provided arguments.

Index: xpresser/xutils.py
=== <email address hidden> >
<email address hidden>
=== modified file 'xpresser/xutils.py'
--- xpresser/xutils.py 2010-11-04 22:14:59 +0000
+++ xpresser/xutils.py 2011-12-09 18:35:34 +0000
@@ -34,6 +34,9 @@
  def right_click(x, y):
      pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_B3C)

+def double_click(x, y):
+ pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_B1D)
+
  def hover(x, y):
      pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_ABS)

[Gustavo Niemeyer (niemeyer)]

This looks fine, but it'd be nice to have some tests. As per the IRC
conversation:

<niemeyer> cwayne: Is there any chance we could have a test for that?
<niemeyer> cwayne: Should be very easy to introduce one
<niemeyer> cwayne: Check out test_xutils.py and test_xp.py
<niemeyer> cwayne: Search for right_click

https://codereview.appspot.com/5485056/

[lp:~cwayne/xpresser/xpresser-double-click]

11. By Chris Wayne on 2011-12-13

added tests

12. By Chris Wayne on 2011-12-13

fixed small (re: stupid) erros in double click test

13. By Chris Wayne on 2011-12-13

small fix

14. By Chris Wayne on 2011-12-13

have it look for _2BUTTON_PRESS before regular, since doubleclicking sends both

15. By Chris Wayne on 2011-12-13

 took self.destroy_window() out of click method, and added it to the end of each test that needs it. no reason it should be killed when theres a click necessarily, but it does need to be killed between tests

[Chris Wayne (cwayne)]

Please take a look.

https://codereview.appspot.com/5485056/

[Gustavo Niemeyer (niemeyer)]

*** Submitted:

Add support for double clicking.

R=niemeyer
CC=
https://codereview.appspot.com/5485056

https://codereview.appspot.com/5485056/

=== 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:58:23 +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()

=== modified file 'xpresser/tests/test_xutils.py'
--- xpresser/tests/test_xutils.py	2010-11-08 14:38:23 +0000
+++ xpresser/tests/test_xutils.py	2011-12-13 23:58:23 +0000
@@ -150,14 +150,16 @@
         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
 
@@ -173,16 +175,25 @@
         button_x, button_y = self.button.window.get_position()
         button_width, button_height = self.button.window.get_size()
         return (button_x + button_width//2, button_y + button_height//2)
+        self.window.destroy()
 
     def test_click(self):
         xutils.click(*self.get_button_center())
         self.flush_gtk()
         self.assertTrue(self.button_clicked)
+        self.window.destroy()
 
     def test_right_click(self):
         xutils.right_click(*self.get_button_center())
         self.flush_gtk()
         self.assertTrue(self.button_rclicked)
+        self.window.destroy()
+
+    def test_double_click(self):
+        xutils.double_click(*self.get_button_center())
+        self.flush_gtk()
+        self.assertTrue(self.button_dclicked)
+        self.window.destroy()
 
     def test_hover(self):
         xutils.hover(*self.get_button_center())

=== modified file 'xpresser/xp.py'
--- xpresser/xp.py	2010-11-08 14:38:23 +0000
+++ xpresser/xp.py	2011-12-13 23:58:23 +0000
@@ -76,6 +76,16 @@
             xp.right_click(x, y)
         """
         xutils.right_click(*self._compute_focus_point(args))
+
+    def double_click(self, *args):
+        '''Double clicks over the position specified by arguments
+
+        The following examples show valid ways of specifying te position:
+             xp.double_click("image-name")
+             xp.double_click(image_match)
+             xp.double_click(x, y)
+        '''
+        xutils.double_click(*self._compute_focus_point(args))
             
     def hover(self, *args):
         """Hover over the position specified by the provided arguments.

=== modified file 'xpresser/xutils.py'
--- xpresser/xutils.py	2010-11-04 22:14:59 +0000
+++ xpresser/xutils.py	2011-12-13 23:58:23 +0000
@@ -34,6 +34,9 @@
 def right_click(x, y):
     pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_B3C)
 
+def double_click(x, y):
+    pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_B1D)
+
 def hover(x, y):
     pyatspi.Registry.generateMouseEvent(x, y, pyatspi.MOUSE_ABS)