Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #27732: Silence test_idle with dummy bell functions.

This commit is contained in:
Terry Jan Reedy 2016-08-10 23:44:54 -04:00
parent 40f70d1c05
commit 3ff55a8155
10 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/idlelib/autoexpand.py
View File

@ -31,6 +31,7 @@ class AutoExpand:
def __init__(self, editwin):
self.text = editwin.text
self.bell = self.text.bell
self.state = None
def expand_word_event(self, event):
@ -46,14 +47,14 @@ class AutoExpand:
words = self.getwords()
index = 0
if not words:
self.text.bell()
self.bell()
return "break"
word = self.getprevword()
self.text.delete("insert - %d chars" % len(word), "insert")
newword = words[index]
index = (index + 1) % len(words)
if index == 0:
self.text.bell() # Warn we cycled around
self.bell() # Warn we cycled around
self.text.insert("insert", newword)
curinsert = self.text.index("insert")
curline = self.text.get("insert linestart", "insert lineend")
@ -99,6 +100,7 @@ class AutoExpand:
i = i-1
return line[i:]
if __name__ == '__main__':
import unittest
unittest.main('idlelib.idle_test.test_autoexpand', verbosity=2)

2
Lib/idlelib/idle_test/test_autoexpand.py
View File

@ -22,6 +22,7 @@ class AutoExpandTest(unittest.TestCase):
else:
cls.text = Text()
cls.auto_expand = AutoExpand(Dummy_Editwin(cls.text))
cls.auto_expand.bell = lambda: None
@classmethod
def tearDownClass(cls):
@ -137,5 +138,6 @@ class AutoExpandTest(unittest.TestCase):
new_state = self.auto_expand.state
self.assertNotEqual(initial_state, new_state)
if __name__ == '__main__':
unittest.main(verbosity=2)

13
Lib/idlelib/idle_test/test_parenmatch.py
View File

@ -38,12 +38,17 @@ class ParenMatchTest(unittest.TestCase):
def tearDown(self):
self.text.delete('1.0', 'end')
def get_parenmatch(self):
pm = ParenMatch(self.editwin)
pm.bell = lambda: None
return pm
def test_paren_expression(self):
"""
Test ParenMatch with 'expression' style.
"""
text = self.text
pm = ParenMatch(self.editwin)
pm = self.get_parenmatch()
pm.set_style('expression')
text.insert('insert', 'def foobar(a, b')
@ -66,7 +71,7 @@ class ParenMatchTest(unittest.TestCase):
Test ParenMatch with 'default' style.
"""
text = self.text
pm = ParenMatch(self.editwin)
pm = self.get_parenmatch()
pm.set_style('default')
text.insert('insert', 'def foobar(a, b')
@ -86,7 +91,7 @@ class ParenMatchTest(unittest.TestCase):
These cases force conditional expression and alternate paths.
"""
text = self.text
pm = ParenMatch(self.editwin)
pm = self.get_parenmatch()
text.insert('insert', '# this is a commen)')
self.assertIsNone(pm.paren_closed_event('event'))
@ -99,7 +104,7 @@ class ParenMatchTest(unittest.TestCase):
self.assertIsNone(pm.paren_closed_event('event'))
def test_handle_restore_timer(self):
pm = ParenMatch(self.editwin)
pm = self.get_parenmatch()
pm.restore_event = Mock()
pm.handle_restore_timer(0)
self.assertTrue(pm.restore_event.called)

6
Lib/idlelib/idle_test/test_replace.py
View File

@ -7,7 +7,7 @@ from unittest.mock import Mock
from tkinter import Tk, Text
from idlelib.idle_test.mock_tk import Mbox
import idlelib.searchengine as se
import idlelib.replace as rd
from idlelib.replace import ReplaceDialog
orig_mbox = se.tkMessageBox
showerror = Mbox.showerror
@ -21,7 +21,8 @@ class ReplaceDialogTest(unittest.TestCase):
cls.root.withdraw()
se.tkMessageBox = Mbox
cls.engine = se.SearchEngine(cls.root)
cls.dialog = rd.ReplaceDialog(cls.root, cls.engine)
cls.dialog = ReplaceDialog(cls.root, cls.engine)
cls.dialog.bell = lambda: None
cls.dialog.ok = Mock()
cls.text = Text(cls.root)
cls.text.undo_block_start = Mock()
@ -70,7 +71,6 @@ class ReplaceDialogTest(unittest.TestCase):
# text found and replaced
pv.set('a')
rv.set('asdf')
self.dialog.open(self.text)
replace()
equal(text.get('1.8', '1.12'), 'asdf')

2
Lib/idlelib/idle_test/test_search.py
View File

@ -29,6 +29,7 @@ class SearchDialogTest(unittest.TestCase):
def setUp(self):
self.engine = se.SearchEngine(self.root)
self.dialog = sd.SearchDialog(self.root, self.engine)
self.dialog.bell = lambda: None
self.text = tk.Text(self.root)
self.text.insert('1.0', 'Hello World!')
@ -38,6 +39,7 @@ class SearchDialogTest(unittest.TestCase):
self.engine.setpat('')
self.assertFalse(self.dialog.find_again(text))
self.dialog.bell = lambda: None
self.engine.setpat('Hello')
self.assertTrue(self.dialog.find_again(text))

2
Lib/idlelib/idle_test/test_undo.py
View File

@ -29,8 +29,8 @@ class UndoDelegatorTest(unittest.TestCase):
def setUp(self):
self.delegator = UndoDelegator()
self.delegator.bell = Mock()
self.percolator.insertfilter(self.delegator)
self.delegator.bell = Mock(wraps=self.delegator.bell)
def tearDown(self):
self.percolator.removefilter(self.delegator)

9
Lib/idlelib/parenmatch.py
View File

@ -64,6 +64,7 @@ class ParenMatch:
# and deactivate_restore (which calls event_delete).
editwin.text.bind(self.RESTORE_VIRTUAL_EVENT_NAME,
self.restore_event)
self.bell = self.text.bell if self.BELL else lambda: None
self.counter = 0
self.is_restore_active = 0
self.set_style(self.STYLE)
@ -93,7 +94,7 @@ class ParenMatch:
indices = (HyperParser(self.editwin, "insert")
.get_surrounding_brackets())
if indices is None:
self.warn_mismatched()
self.bell()
return
self.activate_restore()
self.create_tag(indices)
@ -109,7 +110,7 @@ class ParenMatch:
return
indices = hp.get_surrounding_brackets(_openers[closer], True)
if indices is None:
self.warn_mismatched()
self.bell()
return
self.activate_restore()
self.create_tag(indices)
@ -124,10 +125,6 @@ class ParenMatch:
if timer_count == self.counter:
self.restore_event()
def warn_mismatched(self):
if self.BELL:
self.text.bell()
# any one of the create_tag_XXX methods can be used depending on
# the style

8
Lib/idlelib/replace.py
View File

@ -95,7 +95,7 @@ class ReplaceDialog(SearchDialogBase):
text = self.text
res = self.engine.search_text(text, prog)
if not res:
text.bell()
self.bell()
return
text.tag_remove("sel", "1.0", "end")
text.tag_remove("hit", "1.0", "end")
@ -142,7 +142,7 @@ class ReplaceDialog(SearchDialogBase):
text = self.text
res = self.engine.search_text(text, None, ok)
if not res:
text.bell()
self.bell()
return False
line, m = res
i, j = m.span()
@ -204,8 +204,8 @@ class ReplaceDialog(SearchDialogBase):
def _replace_dialog(parent): # htest #
from tkinter import Toplevel, Text
from tkiter.ttk import Button
from tkinter import Toplevel, Text, END, SEL
from tkinter.ttk import Button
box = Toplevel(parent)
box.title("Test ReplaceDialog")

4
Lib/idlelib/search.py
View File

@ -51,7 +51,7 @@ class SearchDialog(SearchDialogBase):
selfirst = text.index("sel.first")
sellast = text.index("sel.last")
if selfirst == first and sellast == last:
text.bell()
self.bell()
return False
except TclError:
pass
@ -61,7 +61,7 @@ class SearchDialog(SearchDialogBase):
text.see("insert")
return True
else:
text.bell()
self.bell()
return False
def find_selection(self, text):

3
Lib/idlelib/searchbase.py
View File

@ -79,6 +79,7 @@ class SearchDialogBase:
top.wm_title(self.title)
top.wm_iconname(self.icon)
self.top = top
self.bell = top.bell
self.row = 0
self.top.grid_columnconfigure(0, pad=2, weight=0)
@ -188,7 +189,7 @@ class _searchbase(SearchDialogBase): # htest #
width,height, x,y = list(map(int, re.split('[x+]', parent.geometry())))
self.top.geometry("+%d+%d" % (x + 40, y + 175))
def default_command(self): pass
def default_command(self, dummy): pass
if __name__ == '__main__':
import unittest