diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2020-11-24 17:35:39 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-24 17:35:39 (GMT) |
commit | b0b428510cfd604a8eef1f245f039331e671ea4a (patch) | |
tree | 96df82866236428c22f0aab53c095b88b4bf39a4 /Lib/tkinter | |
parent | ac7d0169d2bce2021b8d88973e649889d7dc1b03 (diff) | |
download | cpython-b0b428510cfd604a8eef1f245f039331e671ea4a.zip cpython-b0b428510cfd604a8eef1f245f039331e671ea4a.tar.gz cpython-b0b428510cfd604a8eef1f245f039331e671ea4a.tar.bz2 |
bpo-42370: Check element before making mouse click in ttk tests (GH-23491)
Diffstat (limited to 'Lib/tkinter')
-rw-r--r-- | Lib/tkinter/test/test_ttk/test_widgets.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py index 2598bc6..e20ec39 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -437,11 +437,12 @@ class ComboboxTest(EntryTest, unittest.TestCase): def _show_drop_down_listbox(self): width = self.combo.winfo_width() - self.combo.event_generate('<ButtonPress-1>', x=width - 5, y=5) - self.combo.event_generate('<ButtonRelease-1>', x=width - 5, y=5) + x, y = width - 5, 5 + self.assertRegex(self.combo.identify(x, y), r'.*downarrow\Z') + self.combo.event_generate('<ButtonPress-1>', x=x, y=y) + self.combo.event_generate('<ButtonRelease-1>', x=x, y=y) self.combo.update_idletasks() - def test_virtual_event(self): success = [] @@ -1088,6 +1089,7 @@ class NotebookTest(AbstractWidgetTest, unittest.TestCase): self.nb.select(0) + self.assertEqual(self.nb.identify(5, 5), 'focus') simulate_mouse_click(self.nb, 5, 5) self.nb.focus_force() self.nb.event_generate('<Control-Tab>') @@ -1102,6 +1104,7 @@ class NotebookTest(AbstractWidgetTest, unittest.TestCase): self.nb.tab(self.child1, text='a', underline=0) self.nb.enable_traversal() self.nb.focus_force() + self.assertEqual(self.nb.identify(5, 5), 'focus') simulate_mouse_click(self.nb, 5, 5) if sys.platform == 'darwin': self.nb.event_generate('<Option-a>') @@ -1132,6 +1135,7 @@ class SpinboxTest(EntryTest, unittest.TestCase): height = self.spin.winfo_height() x = width - 5 y = height//2 - 5 + self.assertRegex(self.spin.identify(x, y), r'.*uparrow\Z') self.spin.event_generate('<ButtonPress-1>', x=x, y=y) self.spin.event_generate('<ButtonRelease-1>', x=x, y=y) self.spin.update_idletasks() @@ -1141,6 +1145,7 @@ class SpinboxTest(EntryTest, unittest.TestCase): height = self.spin.winfo_height() x = width - 5 y = height//2 + 4 + self.assertRegex(self.spin.identify(x, y), r'.*downarrow\Z') self.spin.event_generate('<ButtonPress-1>', x=x, y=y) self.spin.event_generate('<ButtonRelease-1>', x=x, y=y) self.spin.update_idletasks() @@ -1530,6 +1535,9 @@ class TreeviewTest(AbstractWidgetTest, unittest.TestCase): def test_heading_callback(self): def simulate_heading_click(x, y): + if tcl_version >= (8, 6): + self.assertEqual(self.tv.identify_column(x), '#0') + self.assertEqual(self.tv.identify_region(x, y), 'heading') simulate_mouse_click(self.tv, x, y) self.tv.update() |