bpo-27313: Fix ttk_guionly tests failing on Framework builds on macOS… · python/cpython@885e57c
@@ -61,7 +61,6 @@ def setUp(self):
6161self.widget = ttk.Button(self.root, width=0, text="Text")
6262self.widget.pack()
636364-6564def test_identify(self):
6665self.widget.update()
6766self.assertEqual(self.widget.identify(
@@ -74,7 +73,6 @@ def test_identify(self):
7473self.assertRaises(tkinter.TclError, self.widget.identify, 5, None)
7574self.assertRaises(tkinter.TclError, self.widget.identify, 5, '')
767577-7876def test_widget_state(self):
7977# XXX not sure about the portability of all these tests
8078self.assertEqual(self.widget.state(), ())
@@ -287,6 +285,7 @@ class EntryTest(AbstractWidgetTest, unittest.TestCase):
287285'show', 'state', 'style', 'takefocus', 'textvariable',
288286'validate', 'validatecommand', 'width', 'xscrollcommand',
289287 )
288+IDENTIFY_AS = 'Entry.field' if sys.platform == 'darwin' else 'textarea'
290289291290def setUp(self):
292291super().setUp()
@@ -319,30 +318,23 @@ def test_configure_validatecommand(self):
319318widget = self.create()
320319self.checkCommandParam(widget, 'validatecommand')
321320322-323321def test_bbox(self):
324322self.assertIsBoundingBox(self.entry.bbox(0))
325323self.assertRaises(tkinter.TclError, self.entry.bbox, 'noindex')
326324self.assertRaises(tkinter.TclError, self.entry.bbox, None)
327325328-329326def test_identify(self):
330327self.entry.pack()
331328self.entry.update()
332329333330# bpo-27313: macOS Cocoa widget differs from X, allow either
334-if sys.platform == 'darwin':
335-self.assertIn(self.entry.identify(5, 5),
336- ("textarea", "Combobox.button") )
337-else:
338-self.assertEqual(self.entry.identify(5, 5), "textarea")
331+self.assertEqual(self.entry.identify(5, 5), self.IDENTIFY_AS)
339332self.assertEqual(self.entry.identify(-1, -1), "")
340333341334self.assertRaises(tkinter.TclError, self.entry.identify, None, 5)
342335self.assertRaises(tkinter.TclError, self.entry.identify, 5, None)
343336self.assertRaises(tkinter.TclError, self.entry.identify, 5, '')
344337345-346338def test_validation_options(self):
347339success = []
348340test_invalid = lambda: success.append(True)
@@ -370,7 +362,6 @@ def test_validation_options(self):
370362self.entry['validatecommand'] = True
371363self.assertRaises(tkinter.TclError, self.entry.validate)
372364373-374365def test_validation(self):
375366validation = []
376367def validate(to_insert):
@@ -388,7 +379,6 @@ def validate(to_insert):
388379self.assertEqual(validation, [False, True])
389380self.assertEqual(self.entry.get(), 'a')
390381391-392382def test_revalidation(self):
393383def validate(content):
394384for letter in content:
@@ -424,6 +414,7 @@ class ComboboxTest(EntryTest, unittest.TestCase):
424414'validate', 'validatecommand', 'values',
425415'width', 'xscrollcommand',
426416 )
417+IDENTIFY_AS = 'Combobox.button' if sys.platform == 'darwin' else 'textarea'
427418428419def setUp(self):
429420super().setUp()
@@ -439,7 +430,8 @@ def test_configure_height(self):
439430def _show_drop_down_listbox(self):
440431width = self.combo.winfo_width()
441432x, y = width - 5, 5
442-self.assertRegex(self.combo.identify(x, y), r'.*downarrow\Z')
433+if sys.platform != 'darwin': # there's no down arrow on macOS
434+self.assertRegex(self.combo.identify(x, y), r'.*downarrow\Z')
443435self.combo.event_generate('<ButtonPress-1>', x=x, y=y)
444436self.combo.event_generate('<ButtonRelease-1>', x=x, y=y)
445437self.combo.update_idletasks()
@@ -461,7 +453,6 @@ def test_virtual_event(self):
461453462454self.assertTrue(success)
463455464-465456def test_configure_postcommand(self):
466457success = []
467458@@ -477,7 +468,6 @@ def test_configure_postcommand(self):
477468self._show_drop_down_listbox()
478469self.assertEqual(len(success), 1)
479470480-481471def test_configure_values(self):
482472def check_get_current(getval, currval):
483473self.assertEqual(self.combo.get(), getval)
@@ -592,7 +582,6 @@ def test_add(self):
592582other_child.destroy()
593583self.assertRaises(tkinter.TclError, self.paned.pane, 0)
594584595-596585def test_forget(self):
597586self.assertRaises(tkinter.TclError, self.paned.forget, None)
598587self.assertRaises(tkinter.TclError, self.paned.forget, 0)
@@ -601,7 +590,6 @@ def test_forget(self):
601590self.paned.forget(0)
602591self.assertRaises(tkinter.TclError, self.paned.forget, 0)
603592604-605593def test_insert(self):
606594self.assertRaises(tkinter.TclError, self.paned.insert, None, 0)
607595self.assertRaises(tkinter.TclError, self.paned.insert, 0, None)
@@ -636,7 +624,6 @@ def test_insert(self):
636624self.assertEqual(self.paned.panes(),
637625 (str(child3), str(child2), str(child)))
638626639-640627def test_pane(self):
641628self.assertRaises(tkinter.TclError, self.paned.pane, 0)
642629@@ -653,7 +640,6 @@ def test_pane(self):
653640self.assertRaises(tkinter.TclError, self.paned.pane, 0,
654641badoption='somevalue')
655642656-657643def test_sashpos(self):
658644self.assertRaises(tkinter.TclError, self.paned.sashpos, None)
659645self.assertRaises(tkinter.TclError, self.paned.sashpos, '')
@@ -801,7 +787,6 @@ def test_custom_event(self):
801787802788self.assertFalse(failure)
803789804-805790def test_get(self):
806791if self.wantobjects:
807792conv = lambda x: x
@@ -819,7 +804,6 @@ def test_get(self):
819804self.assertRaises(tkinter.TclError, self.scale.get, '', 0)
820805self.assertRaises(tkinter.TclError, self.scale.get, 0, '')
821806822-823807def test_set(self):
824808if self.wantobjects:
825809conv = lambda x: x
@@ -952,7 +936,6 @@ def test_tab_identifiers(self):
952936else:
953937self.fail("Tab with text 'a' not found")
954938955-956939def test_add_and_hidden(self):
957940self.assertRaises(tkinter.TclError, self.nb.hide, -1)
958941self.assertRaises(tkinter.TclError, self.nb.hide, 'hi')
@@ -981,7 +964,6 @@ def test_add_and_hidden(self):
981964# but the tab next to it (not hidden) is the one selected now
982965self.assertEqual(self.nb.index('current'), curr + 1)
983966984-985967def test_forget(self):
986968self.assertRaises(tkinter.TclError, self.nb.forget, -1)
987969self.assertRaises(tkinter.TclError, self.nb.forget, 'hi')
@@ -997,7 +979,6 @@ def test_forget(self):
997979self.assertEqual(self.nb.index(self.child1), 1)
998980self.assertNotEqual(child1_index, self.nb.index(self.child1))
9999811000-1001982def test_index(self):
1002983self.assertRaises(tkinter.TclError, self.nb.index, -1)
1003984self.assertRaises(tkinter.TclError, self.nb.index, None)
@@ -1007,7 +988,6 @@ def test_index(self):
1007988self.assertEqual(self.nb.index(self.child2), 1)
1008989self.assertEqual(self.nb.index('end'), 2)
10099901010-1011991def test_insert(self):
1012992# moving tabs
1013993tabs = self.nb.tabs()
@@ -1040,7 +1020,6 @@ def test_insert(self):
10401020self.assertRaises(tkinter.TclError, self.nb.insert, None, 0)
10411021self.assertRaises(tkinter.TclError, self.nb.insert, None, None)
104210221043-10441023def test_select(self):
10451024self.nb.pack()
10461025self.nb.update()
@@ -1060,7 +1039,6 @@ def test_select(self):
10601039self.nb.update()
10611040self.assertTrue(tab_changed)
106210411063-10641042def test_tab(self):
10651043self.assertRaises(tkinter.TclError, self.nb.tab, -1)
10661044self.assertRaises(tkinter.TclError, self.nb.tab, 'notab')
@@ -1074,7 +1052,6 @@ def test_tab(self):
10741052self.assertEqual(self.nb.tab(self.child1, text=None), 'abc')
10751053self.assertEqual(self.nb.tab(self.child1, 'text'), 'abc')
107610541077-10781055def test_configure_tabs(self):
10791056self.assertEqual(len(self.nb.tabs()), 2)
10801057@@ -1083,14 +1060,14 @@ def test_configure_tabs(self):
1083106010841061self.assertEqual(self.nb.tabs(), ())
108510621086-10871063def test_traversal(self):
10881064self.nb.pack()
10891065self.nb.update()
1090106610911067self.nb.select(0)
109210681093-self.assertEqual(self.nb.identify(5, 5), 'focus')
1069+focus_identify_as = 'focus' if sys.platform != 'darwin' else ''
1070+self.assertEqual(self.nb.identify(5, 5), focus_identify_as)
10941071simulate_mouse_click(self.nb, 5, 5)
10951072self.nb.focus_force()
10961073self.nb.event_generate('<Control-Tab>')
@@ -1103,15 +1080,24 @@ def test_traversal(self):
11031080self.assertEqual(self.nb.select(), str(self.child2))
1104108111051082self.nb.tab(self.child1, text='a', underline=0)
1083+self.nb.tab(self.child2, text='e', underline=0)
11061084self.nb.enable_traversal()
11071085self.nb.focus_force()
1108-self.assertEqual(self.nb.identify(5, 5), 'focus')
1086+self.assertEqual(self.nb.identify(5, 5), focus_identify_as)
11091087simulate_mouse_click(self.nb, 5, 5)
1088+# on macOS Emacs-style keyboard shortcuts are region-dependent;
1089+# let's use the regular arrow keys instead
11101090if sys.platform == 'darwin':
1111-self.nb.event_generate('<Option-a>')
1091+begin = '<Left>'
1092+end = '<Right>'
11121093else:
1113-self.nb.event_generate('<Alt-a>')
1094+begin = '<Alt-a>'
1095+end = '<Alt-e>'
1096+self.nb.event_generate(begin)
11141097self.assertEqual(self.nb.select(), str(self.child1))
1098+self.nb.event_generate(end)
1099+self.assertEqual(self.nb.select(), str(self.child2))
1100+1115110111161102@add_standard_options(IntegerSizeTests, StandardTtkOptionsTests)
11171103class SpinboxTest(EntryTest, unittest.TestCase):
@@ -1122,6 +1108,7 @@ class SpinboxTest(EntryTest, unittest.TestCase):
11221108'takefocus', 'textvariable', 'to', 'validate', 'validatecommand',
11231109'values', 'width', 'wrap', 'xscrollcommand',
11241110 )
1111+IDENTIFY_AS = 'Spinbox.field' if sys.platform == 'darwin' else 'textarea'
1125111211261113def setUp(self):
11271114super().setUp()
@@ -1370,7 +1357,6 @@ def test_bbox(self):
13701357child1 = self.tv.insert(item_id, 'end')
13711358self.assertEqual(self.tv.bbox(child1), '')
137213591373-13741360def test_children(self):
13751361# no children yet, should get an empty tuple
13761362self.assertEqual(self.tv.get_children(), ())
@@ -1398,7 +1384,6 @@ def test_children(self):
13981384self.tv.set_children('')
13991385self.assertEqual(self.tv.get_children(), ())
140013861401-14021387def test_column(self):
14031388# return a dict with all options/values
14041389self.assertIsInstance(self.tv.column('#0'), dict)
@@ -1424,7 +1409,6 @@ def test_column(self):
14241409self.assertRaises(tkinter.TclError, self.tv.column, '#0',
14251410**kw)
142614111427-14281412def test_delete(self):
14291413self.assertRaises(tkinter.TclError, self.tv.delete, '#0')
14301414@@ -1448,7 +1432,6 @@ def test_delete(self):
14481432self.tv.delete(item1, item2)
14491433self.assertFalse(self.tv.get_children())
145014341451-14521435def test_detach_reattach(self):
14531436item_id = self.tv.insert('', 'end')
14541437item2 = self.tv.insert(item_id, 'end')
@@ -1490,7 +1473,6 @@ def test_detach_reattach(self):
14901473self.assertEqual(self.tv.get_children(), ())
14911474self.assertEqual(self.tv.get_children(item_id), ())
149214751493-14941476def test_exists(self):
14951477self.assertEqual(self.tv.exists('something'), False)
14961478self.assertEqual(self.tv.exists(''), True)
@@ -1501,7 +1483,6 @@ def test_exists(self):
15011483# in the tcl interpreter since tk requires an item.
15021484self.assertRaises(tkinter.TclError, self.tv.exists, None)
150314851504-15051486def test_focus(self):
15061487# nothing is focused right now
15071488self.assertEqual(self.tv.focus(), '')
@@ -1516,7 +1497,6 @@ def test_focus(self):
15161497# try focusing inexistent item
15171498self.assertRaises(tkinter.TclError, self.tv.focus, 'hi')
151814991519-15201500def test_heading(self):
15211501# check a dict is returned
15221502self.assertIsInstance(self.tv.heading('#0'), dict)
@@ -1568,7 +1548,6 @@ def simulate_heading_click(x, y):
15681548#self.tv.heading('#0', command='I dont exist')
15691549#simulate_heading_click(5, 5)
157015501571-15721551def test_index(self):
15731552# item 'what' doesn't exist
15741553self.assertRaises(tkinter.TclError, self.tv.index, 'what')
@@ -1599,7 +1578,6 @@ def test_index(self):
15991578self.tv.delete(item1)
16001579self.assertRaises(tkinter.TclError, self.tv.index, c2)
160115801602-16031581def test_insert_item(self):
16041582# parent 'none' doesn't exist
16051583self.assertRaises(tkinter.TclError, self.tv.insert, 'none', 'end')
@@ -1676,7 +1654,6 @@ def test_insert_item(self):
16761654self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', False)
16771655self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end', '')
167816561679-16801657def test_selection(self):
16811658self.assertRaises(TypeError, self.tv.selection, 'spam')
16821659# item 'none' doesn't exist
@@ -1747,7 +1724,6 @@ def test_selection(self):
17471724self.tv.selection_toggle((c1, c3))
17481725self.assertEqual(self.tv.selection(), (c3, item2))
174917261750-17511727def test_set(self):
17521728self.tv['columns'] = ['A', 'B']
17531729item = self.tv.insert('', 'end', values=['a', 'b'])
@@ -1780,7 +1756,6 @@ def test_set(self):
17801756# inexistent item
17811757self.assertRaises(tkinter.TclError, self.tv.set, 'notme')
178217581783-17841759def test_tag_bind(self):
17851760events = []
17861761item1 = self.tv.insert('', 'end', tags=['call'])
@@ -1813,7 +1788,6 @@ def test_tag_bind(self):
18131788for evt in zip(events[::2], events[1::2]):
18141789self.assertEqual(evt, (1, 2))
181517901816-18171791def test_tag_configure(self):
18181792# Just testing parameter passing for now
18191793self.assertRaises(TypeError, self.tv.tag_configure)