Skip to content

Commit 1af0e89

Browse files
committed
Slighly simpler Window event binding/unbinding tests.
1 parent ebb7d40 commit 1af0e89

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

tests/test_window.py

+10-18
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,15 @@ def setUp(self):
305305

306306
def test_bind_calls_tk_window_bind(self):
307307

308-
handler = lambda e: None
308+
handler = mock.Mock()
309309
self.w.bind('<KeyPress-a>', handler)
310310

311311
self.w._tk_window.bind.assert_called_with('<KeyPress-a>', handler)
312312

313313

314314
def test_bind_unbind_calls_tk_window_bind_unbind(self):
315315

316-
handler = lambda e: None
316+
handler = mock.Mock()
317317
self.w.bind('<KeyPress-a>', handler)
318318
self.w.unbind('<KeyPress-a>')
319319

@@ -335,8 +335,8 @@ def test_unbind_default_works_with_no_bindings(self):
335335

336336
def test_unbind_default_unbinds_all_bindings(self):
337337

338-
self.w.bind('<KeyPress-a>', lambda e: None)
339-
self.w.bind('<KeyPress-b>', lambda e: None)
338+
self.w.bind('<KeyPress-a>', mock.Mock())
339+
self.w.bind('<KeyPress-b>', mock.Mock())
340340

341341
self.w.unbind()
342342
unbind_call_args = self.w._tk_window.unbind.call_args_list
@@ -354,8 +354,7 @@ def test_bind_direct_key_with_press_cb_calls_window_bind_twice(self):
354354
# Ignore any window setup bind calls that may have taken place.
355355
self.w._tk_window.bind.reset_mock()
356356

357-
press_cb = lambda e: None
358-
self.w.bind_direct_key('x', press_cb)
357+
self.w.bind_direct_key('x', mock.Mock())
359358

360359
bind_call_args = self.w._tk_window.bind.call_args_list
361360
self.assertEqual(len(bind_call_args), 2, 'unbind call count')
@@ -370,8 +369,7 @@ def test_bind_direct_key_with_release_cb_calls_window_bind_twice(self):
370369
# Ignore any window setup bind calls that may have taken place.
371370
self.w._tk_window.bind.reset_mock()
372371

373-
release_cb = lambda e: None
374-
self.w.bind_direct_key('y', None, release_cb)
372+
self.w.bind_direct_key('y', None, mock.Mock())
375373

376374
bind_call_args = self.w._tk_window.bind.call_args_list
377375
self.assertEqual(len(bind_call_args), 2, 'unbind call count')
@@ -386,9 +384,7 @@ def test_bind_direct_key_with_both_cbs_calls_window_bind_twice(self):
386384
# Ignore any window setup bind calls that may have taken place.
387385
self.w._tk_window.bind.reset_mock()
388386

389-
press_cb = lambda e: None
390-
release_cb = lambda e: None
391-
self.w.bind_direct_key('z', press_cb, release_cb)
387+
self.w.bind_direct_key('z', mock.Mock(), mock.Mock())
392388

393389
bind_call_args = self.w._tk_window.bind.call_args_list
394390
self.assertEqual(len(bind_call_args), 2, 'bind call count')
@@ -403,9 +399,7 @@ def test_bind_unbind_direct_key_calls_window_bind_unbind_twice(self):
403399
# Ignore any window setup bind calls that may have taken place.
404400
self.w._tk_window.bind.reset_mock()
405401

406-
press_cb = lambda e: None
407-
release_cb = lambda e: None
408-
self.w.bind_direct_key('a', press_cb, release_cb)
402+
self.w.bind_direct_key('a', mock.Mock(), mock.Mock())
409403
self.w.unbind_direct_key('a')
410404

411405
bind_call_args = self.w._tk_window.bind.call_args_list
@@ -437,10 +431,8 @@ def test_unbind_direct_key_default_works_with_no_bindings(self):
437431

438432
def test_unbind_direct_key_default_unbinds_all_direct_keys(self):
439433

440-
press_cb = lambda e: None
441-
release_cb = lambda e: None
442-
self.w.bind_direct_key('a', press_cb, release_cb)
443-
self.w.bind_direct_key('b', press_cb, release_cb)
434+
self.w.bind_direct_key('a', mock.Mock(), mock.Mock())
435+
self.w.bind_direct_key('b', mock.Mock(), mock.Mock())
444436

445437
self.w.unbind_direct_key()
446438

0 commit comments

Comments
 (0)