Update ConsoleWidget anchor handling test code.

The test code wasn't updated to test the eventFilter based implementation.

IPython/frontend/qt/console/tests/test_console_widget.py

@@ -1,62 +1,73
 # Standard library imports
 import unittest
 
 # System library imports
 from IPython.external.qt import QtCore, QtGui
 
 # Local imports
 from IPython.frontend.qt.console.console_widget import ConsoleWidget
 
 
 class TestConsoleWidget(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
         """ Create the application for the test case.
         """
         cls._app = QtGui.QApplication.instance()
         if cls._app is None:
             cls._app = QtGui.QApplication([])
         cls._app.setQuitOnLastWindowClosed(False)
 
     @classmethod
     def tearDownClass(cls):
         """ Exit the application.
         """
         QtGui.QApplication.quit()
 
     def test_special_characters(self):
         """ Are special characters displayed correctly?
         """
         w = ConsoleWidget()
         cursor = w._get_prompt_cursor()
 
         test_inputs = ['xyz\b\b=\n', 'foo\b\nbar\n', 'foo\b\nbar\r\n', 'abc\rxyz\b\b=']
         expected_outputs = [u'x=z\u2029', u'foo\u2029bar\u2029', u'foo\u2029bar\u2029', 'x=z']
         for i, text in enumerate(test_inputs):
             w._insert_plain_text(cursor, text)
             cursor.select(cursor.Document)
             selection = cursor.selectedText()
             self.assertEqual(expected_outputs[i], selection)
             # clear all the text
             cursor.insertText('')
 
     def test_link_handling(self):
-        class event(object):
-            def __init__(self, pos):
-                self._pos = pos
-            def pos(self):
-                return self._pos
-            
+        noKeys = QtCore.Qt
+        noButton = QtCore.Qt.MouseButton(0)
+        noButtons = QtCore.Qt.MouseButtons(0)
+        noModifiers = QtCore.Qt.KeyboardModifiers(0)
+        MouseMove = QtCore.QEvent.MouseMove
+        QMouseEvent = QtGui.QMouseEvent
+        
         w = ConsoleWidget()
         cursor = w._get_prompt_cursor()
         w._insert_html(cursor, '<a href="http://python.org">written in</a>')
+        obj = w._control
         self.assertEqual(w._anchor, None)
+        
         # should be over text
-        w.mouseMoveEvent(event(QtCore.QPoint(1,5)))
+        overTextEvent = QMouseEvent(MouseMove, QtCore.QPoint(1,5),
+                                    noButton, noButtons, noModifiers)
+        w.eventFilter(obj, overTextEvent)
         self.assertEqual(w._anchor, "http://python.org")
+        
         # should still be over text
-        w.mouseMoveEvent(event(QtCore.QPoint(5,5)))
+        stillOverTextEvent = QMouseEvent(MouseMove, QtCore.QPoint(1,5),
+                                         noButton, noButtons, noModifiers)
+        w.eventFilter(obj, stillOverTextEvent)
+        
         # should be somewhere else
-        w.mouseMoveEvent(event(QtCore.QPoint(50,50)))
+        elsewhereEvent = QMouseEvent(MouseMove, QtCore.QPoint(50,50),
+                                         noButton, noButtons, noModifiers)
+        w.eventFilter(obj, elsewhereEvent)
         self.assertEqual(w._anchor, None)