[WIP] MultitouchSimulatorTestCase: Fix CI failing test

kivy/input/providers/mouse.py

@@ -148,7 +148,9 @@ def __init__(self, device, args):
         self.disable_on_activity = False
         self.disable_multitouch = False
         self.multitouch_on_demand = False
+        self.hover_disabled = False
         self.hover_event = None
+        self._running = False
         # split arguments
         args = args.split(',')
         for arg in args:
@@ -161,38 +163,44 @@ def __init__(self, device, args):
                 self.disable_multitouch = True
             elif arg == 'multitouch_on_demand':
                 self.multitouch_on_demand = True
+            elif arg == 'hover_disabled':
+                self.hover_disabled = True
             else:
                 Logger.error('Mouse: unknown parameter <%s>' % arg)
 
     def start(self):
         '''Start the mouse provider'''
-        if not EventLoop.window:
+        if not EventLoop.window or self._running:
             return
+        self._running = True
         fbind = EventLoop.window.fbind
         fbind('on_mouse_down', self.on_mouse_press)
         fbind('on_mouse_move', self.on_mouse_motion)
         fbind('on_mouse_up', self.on_mouse_release)
-        fbind('mouse_pos', self.begin_or_update_hover_event)
-        fbind('system_size', self.update_hover_event)
-        fbind('on_cursor_enter', self.begin_hover_event)
-        fbind('on_cursor_leave', self.end_hover_event)
-        fbind('on_close', self.end_hover_event)
-        fbind('on_rotate', self.update_hover_event)
+        if not self.hover_disabled:
+            fbind('mouse_pos', self.begin_or_update_hover_event)
+            fbind('system_size', self.update_hover_event)
+            fbind('on_cursor_enter', self.begin_hover_event)
+            fbind('on_cursor_leave', self.end_hover_event)
+            fbind('on_close', self.end_hover_event)
+            fbind('on_rotate', self.update_hover_event)
 
     def stop(self):
         '''Stop the mouse provider'''
-        if not EventLoop.window:
+        if not EventLoop.window or not self._running:
             return
+        self._running = False
         funbind = EventLoop.window.funbind
         funbind('on_mouse_down', self.on_mouse_press)
         funbind('on_mouse_move', self.on_mouse_motion)
         funbind('on_mouse_up', self.on_mouse_release)
-        funbind('mouse_pos', self.begin_or_update_hover_event)
-        funbind('system_size', self.update_hover_event)
-        funbind('on_cursor_enter', self.begin_hover_event)
-        funbind('on_cursor_leave', self.end_hover_event)
-        funbind('on_close', self.end_hover_event)
-        funbind('on_rotate', self.update_hover_event)
+        if not self.hover_disabled:
+            funbind('mouse_pos', self.begin_or_update_hover_event)
+            funbind('system_size', self.update_hover_event)
+            funbind('on_cursor_enter', self.begin_hover_event)
+            funbind('on_cursor_leave', self.end_hover_event)
+            funbind('on_close', self.end_hover_event)
+            funbind('on_rotate', self.update_hover_event)
 
     def test_activity(self):
         if not self.disable_on_activity:

kivy/tests/common.py

@@ -164,6 +164,18 @@ def setUp(self):
         Window.initialized = True
         Window.canvas.clear()
         Window.close = lambda *s: True
+        self.clear_event_loop_and_window()
+
+    def clear_event_loop_and_window(self):
+        from kivy.base import EventLoop
+        for child in self.Window.children[:]:
+            self.Window.remove_widget(child)
+        EventLoop.touches.clear()
+        for post_proc in EventLoop.postproc_modules:
+            if hasattr(post_proc, 'touches'):
+                post_proc.touches.clear()
+            elif hasattr(post_proc, 'last_touches'):
+                post_proc.last_touches.clear()
 
     def on_window_flip(self, window):
         '''Internal method to be called when the window have just displayed an
@@ -299,10 +311,10 @@ def tearDown(self, fake=False):
         '''
         from kivy.base import stopTouchApp
         from kivy.core.window import Window
-        from kivy.clock import Clock
         Window.unbind(on_flip=self.on_window_flip)
+        self.clear_event_loop_and_window()
+        self.Window = None
         stopTouchApp()
-
         if not fake and self.test_failed:
             self.assertTrue(False)
         super(GraphicUnitTest, self).tearDown()

kivy/tests/test_mouse_hover_event.py

@@ -32,7 +32,7 @@ def setUp(self):
         # window from event listeners list.
         if not (platform == 'win' and 'CI' in os.environ):
             self.old_on_close = win.on_close
-            win.on_close = lambda *args: None
+            win.on_close = self.on_window_close
 
     def tearDown(self, fake=False):
         self.etype = None
@@ -60,6 +60,9 @@ def tearDown(self, fake=False):
             self.old_on_close = None
         super().tearDown(fake)
 
+    def on_window_close(self, *args, **kwargs):
+        pass
+
     def on_window_flip(self, window):
         # Not rendering widgets in tests so don't do screenshots
         pass

kivy/tests/test_mouse_multitouchsim.py

@@ -33,6 +33,7 @@ def mouse_init(self, on_demand=False, disabled=False, scatter=False):
             mode = 'disable_multitouch'
         else:
             mode = ''
+        mode = mode + ',hover_disabled'
         from kivy.input.providers.mouse import MouseMotionEventProvider
         mouse = MouseMotionEventProvider('unittest', mode)
         mouse.is_touch = True
@@ -47,6 +48,10 @@ def mouse_init(self, on_demand=False, disabled=False, scatter=False):
             self.assertTrue(mouse.multitouch_on_demand)
         return (eventloop, win, mouse, wid)
 
+    def remove_sim_touch(self, win, x, y):
+        win.dispatch('on_mouse_down', x, self.correct_y(win, y), 'left', {})
+        win.dispatch('on_mouse_up', x, self.correct_y(win, y), 'left', {})
+
     def multitouch_dot_touch(self, button, **kwargs):
         # touch -> dot appears -> touch again -> dot disappears
         eventloop, win, mouse, wid = self.mouse_init(**kwargs)
@@ -70,10 +75,14 @@ def multitouch_dot_touch(self, button, **kwargs):
 
         if 'on_demand' in kwargs and 'scatter' not in kwargs:
             # doesn't do anything on a pure Button
-            self.render(wid)
-
+            # self.render(wid)
             # cleanup!
-            # remove mouse provider
+            win.dispatch(
+                'on_mouse_up',
+                10, self.correct_y(win, 10),
+                'right', {}
+            )
+            self.assertFalse(mouse.touches)
             mouse.stop()
             eventloop.remove_input_provider(mouse)
             return
@@ -94,7 +103,9 @@ def multitouch_dot_touch(self, button, **kwargs):
             # called == multitouch_sim is False
             self.advance_frames(1)  # initialize stuff
             wid.on_touch_down(mouse.touches[event_id])
+            mouse.touches[event_id].grab_state = True
             wid.on_touch_up(mouse.touches[event_id])
+            mouse.touches[event_id].grab_state = False
             self.assertTrue(mouse.touches[event_id].multitouch_sim)
 
         elif 'disabled' in kwargs:
@@ -124,6 +135,10 @@ def multitouch_dot_touch(self, button, **kwargs):
         # because the red dot is removed by the left button
         if 'disabled' not in kwargs:
             self.assertIn(event_id, mouse.touches)
+            print(mouse.touches)
+            print('Mouse touches count: %s' % len(mouse.touches))
+            print('Hover event: %s' % mouse.hover_event)
+            print('Eventloop.me_list count: %s' % len(eventloop.me_list))
             self.assertIsNotNone(
                 mouse.touches[event_id].ud.get('_drawelement')
             )  # the red dot is present
@@ -146,7 +161,12 @@ def multitouch_dot_touch(self, button, **kwargs):
                 event_id, mouse.touches
             )
             # cleanup!
-            # remove mouse provider
+            win.dispatch(
+                'on_mouse_up',
+                10, self.correct_y(win, 10),
+                button, {}
+            )
+            self.assertFalse(mouse.touches)
             mouse.stop()
             eventloop.remove_input_provider(mouse)
             return
@@ -191,7 +211,12 @@ def multitouch_dot_touch(self, button, **kwargs):
                 mouse.touches[event_id].ud.get('_drawelement')
             )  # the red dot is present
 
-        self.render(wid)
+        # self.render(wid)
+
+        # remove red dot
+        if button == 'right':
+            self.remove_sim_touch(win, 10, 10)
+        self.assertFalse(mouse.touches)
 
         # cleanup!
         # remove mouse provider
@@ -223,10 +248,14 @@ def multitouch_dot_move(self, button, **kwargs):
 
         if 'on_demand' in kwargs and 'scatter' not in kwargs:
             # doesn't do anything on a pure Button
-            self.render(wid)
-
+            # self.render(wid)
             # cleanup!
-            # remove mouse provider
+            win.dispatch(
+                'on_mouse_up',
+                10, self.correct_y(win, 10),
+                'right', {}
+            )
+            self.assertFalse(mouse.touches)
             mouse.stop()
             eventloop.remove_input_provider(mouse)
             return
@@ -254,17 +283,22 @@ def multitouch_dot_move(self, button, **kwargs):
             # called == multitouch_sim is False
             self.advance_frames(1)  # initialize stuff
             wid.on_touch_down(mouse.touches[event_id])
+            mouse.touches[event_id].grab_state = True
             wid.on_touch_up(mouse.touches[event_id])
+            mouse.touches[event_id].grab_state = False
             self.assertTrue(mouse.touches[event_id].multitouch_sim)
-
             win.dispatch(
                 'on_mouse_up',
                 10, self.correct_y(win, 10),
                 'right', {}
             )
-            ellipse = mouse.touches[
-                event_id
-            ].ud.get('_drawelement')[1].proxy_ref
+            print(mouse.touches)
+            print('Mouse touches count: %s' % len(mouse.touches))
+            print('Hover event: %s' % mouse.hover_event)
+            print('Eventloop.me_list count: %s' % len(eventloop.me_list))
+            self.assertIsNotNone(
+                mouse.touches[event_id].ud.get('_drawelement')
+            )
             win.dispatch(
                 'on_mouse_down',
                 10, self.correct_y(win, 10),
@@ -289,7 +323,12 @@ def multitouch_dot_move(self, button, **kwargs):
                 mouse.touches[event_id].ud.get('_drawelement')
             )  # the red dot isn't present
             # cleanup!
-            # remove mouse provider
+            win.dispatch(
+                'on_mouse_up',
+                10, self.correct_y(win, 10),
+                'right', {}
+            )
+            self.assertFalse(mouse.touches)
             mouse.stop()
             eventloop.remove_input_provider(mouse)
             return
@@ -368,7 +407,11 @@ def multitouch_dot_move(self, button, **kwargs):
                 mouse.touches[event_id].ud.get('_drawelement')
             )  # the red dot is present
 
-        self.render(wid)
+        # self.render(wid)
+
+        if button == 'right':
+            self.remove_sim_touch(win, 50, 50)
+        self.assertFalse(mouse.touches)
 
         # cleanup!
         # remove mouse provider
@@ -416,7 +459,9 @@ def test_multitouch_dontappear(self):
         self.assertNotIn(event_id, mouse.touches)
 
         self.advance_frames(1)
-        self.render(wid)
+        # self.render(wid)
+
+        self.assertFalse(mouse.touches)
 
         # cleanup!
         # remove mouse provider
@@ -485,7 +530,11 @@ def test_multitouch_appear(self):
             mouse.touches[event_id].ud.get('_drawelement')
         )  # the red dot is present
 
-        self.render(wid)
+        self.advance_frames(1)
+        # self.render(wid)
+
+        self.remove_sim_touch(win, 11, 11)
+        self.assertFalse(mouse.touches)
 
         # cleanup!
         # remove mouse provider