bpo-45229: Make tkinter tests discoverable (GH-28637) (GH-28927)
(cherry picked from commit f59ed3c310a7ceebf2a56a84ea969a7f75d95b64)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Lib/test/test_tk.py b/Lib/test/test_tk.py
index 59842a5..69cc232 100644
--- a/Lib/test/test_tk.py
+++ b/Lib/test/test_tk.py
@@ -6,11 +6,9 @@
# Skip test if tk cannot be initialized.
support.requires('gui')
-from tkinter.test import runtktests
+def load_tests(loader, tests, pattern):
+ return loader.discover('tkinter.test.test_tkinter')
-def test_main():
- support.run_unittest(
- *runtktests.get_tests(text=False, packages=['test_tkinter']))
if __name__ == '__main__':
- test_main()
+ unittest.main()
diff --git a/Lib/test/test_ttk_guionly.py b/Lib/test/test_ttk_guionly.py
index abb2643..8f59839 100644
--- a/Lib/test/test_ttk_guionly.py
+++ b/Lib/test/test_ttk_guionly.py
@@ -11,25 +11,26 @@
import tkinter
from _tkinter import TclError
from tkinter import ttk
-from tkinter.test import runtktests
-root = None
-try:
- root = tkinter.Tk()
- button = ttk.Button(root)
- button.destroy()
- del button
-except TclError as msg:
- # assuming ttk is not available
- raise unittest.SkipTest("ttk not available: %s" % msg)
-finally:
- if root is not None:
- root.destroy()
- del root
-def test_main():
- support.run_unittest(
- *runtktests.get_tests(text=False, packages=['test_ttk']))
+def setUpModule():
+ root = None
+ try:
+ root = tkinter.Tk()
+ button = ttk.Button(root)
+ button.destroy()
+ del button
+ except TclError as msg:
+ # assuming ttk is not available
+ raise unittest.SkipTest("ttk not available: %s" % msg)
+ finally:
+ if root is not None:
+ root.destroy()
+ del root
+
+def load_tests(loader, tests, pattern):
+ return loader.discover('tkinter.test.test_ttk')
+
if __name__ == '__main__':
- test_main()
+ unittest.main()
diff --git a/Lib/test/test_ttk_textonly.py b/Lib/test/test_ttk_textonly.py
index 013b0e9..96dc179 100644
--- a/Lib/test/test_ttk_textonly.py
+++ b/Lib/test/test_ttk_textonly.py
@@ -1,15 +1,463 @@
-from test import support
from test.support import import_helper
-
# Skip this test if _tkinter does not exist.
import_helper.import_module('_tkinter')
-from tkinter.test import runtktests
+import unittest
+from tkinter import ttk
-def test_main():
- support.run_unittest(
- *runtktests.get_tests(gui=False, packages=['test_ttk']))
+
+class MockTkApp:
+
+ def splitlist(self, arg):
+ if isinstance(arg, tuple):
+ return arg
+ return arg.split(':')
+
+ def wantobjects(self):
+ return True
+
+
+class MockTclObj(object):
+ typename = 'test'
+
+ def __init__(self, val):
+ self.val = val
+
+ def __str__(self):
+ return str(self.val)
+
+
+class MockStateSpec(object):
+ typename = 'StateSpec'
+
+ def __init__(self, *args):
+ self.val = args
+
+ def __str__(self):
+ return ' '.join(self.val)
+
+
+class InternalFunctionsTest(unittest.TestCase):
+
+ def test_format_optdict(self):
+ def check_against(fmt_opts, result):
+ for i in range(0, len(fmt_opts), 2):
+ self.assertEqual(result.pop(fmt_opts[i]), fmt_opts[i + 1])
+ if result:
+ self.fail("result still got elements: %s" % result)
+
+ # passing an empty dict should return an empty object (tuple here)
+ self.assertFalse(ttk._format_optdict({}))
+
+ # check list formatting
+ check_against(
+ ttk._format_optdict({'fg': 'blue', 'padding': [1, 2, 3, 4]}),
+ {'-fg': 'blue', '-padding': '1 2 3 4'})
+
+ # check tuple formatting (same as list)
+ check_against(
+ ttk._format_optdict({'test': (1, 2, '', 0)}),
+ {'-test': '1 2 {} 0'})
+
+ # check untouched values
+ check_against(
+ ttk._format_optdict({'test': {'left': 'as is'}}),
+ {'-test': {'left': 'as is'}})
+
+ # check script formatting
+ check_against(
+ ttk._format_optdict(
+ {'test': [1, -1, '', '2m', 0], 'test2': 3,
+ 'test3': '', 'test4': 'abc def',
+ 'test5': '"abc"', 'test6': '{}',
+ 'test7': '} -spam {'}, script=True),
+ {'-test': '{1 -1 {} 2m 0}', '-test2': '3',
+ '-test3': '{}', '-test4': '{abc def}',
+ '-test5': '{"abc"}', '-test6': r'\{\}',
+ '-test7': r'\}\ -spam\ \{'})
+
+ opts = {'αβγ': True, 'á': False}
+ orig_opts = opts.copy()
+ # check if giving unicode keys is fine
+ check_against(ttk._format_optdict(opts), {'-αβγ': True, '-á': False})
+ # opts should remain unchanged
+ self.assertEqual(opts, orig_opts)
+
+ # passing values with spaces inside a tuple/list
+ check_against(
+ ttk._format_optdict(
+ {'option': ('one two', 'three')}),
+ {'-option': '{one two} three'})
+ check_against(
+ ttk._format_optdict(
+ {'option': ('one\ttwo', 'three')}),
+ {'-option': '{one\ttwo} three'})
+
+ # passing empty strings inside a tuple/list
+ check_against(
+ ttk._format_optdict(
+ {'option': ('', 'one')}),
+ {'-option': '{} one'})
+
+ # passing values with braces inside a tuple/list
+ check_against(
+ ttk._format_optdict(
+ {'option': ('one} {two', 'three')}),
+ {'-option': r'one\}\ \{two three'})
+
+ # passing quoted strings inside a tuple/list
+ check_against(
+ ttk._format_optdict(
+ {'option': ('"one"', 'two')}),
+ {'-option': '{"one"} two'})
+ check_against(
+ ttk._format_optdict(
+ {'option': ('{one}', 'two')}),
+ {'-option': r'\{one\} two'})
+
+ # ignore an option
+ amount_opts = len(ttk._format_optdict(opts, ignore=('á'))) / 2
+ self.assertEqual(amount_opts, len(opts) - 1)
+
+ # ignore non-existing options
+ amount_opts = len(ttk._format_optdict(opts, ignore=('á', 'b'))) / 2
+ self.assertEqual(amount_opts, len(opts) - 1)
+
+ # ignore every option
+ self.assertFalse(ttk._format_optdict(opts, ignore=list(opts.keys())))
+
+
+ def test_format_mapdict(self):
+ opts = {'a': [('b', 'c', 'val'), ('d', 'otherval'), ('', 'single')]}
+ result = ttk._format_mapdict(opts)
+ self.assertEqual(len(result), len(list(opts.keys())) * 2)
+ self.assertEqual(result, ('-a', '{b c} val d otherval {} single'))
+ self.assertEqual(ttk._format_mapdict(opts, script=True),
+ ('-a', '{{b c} val d otherval {} single}'))
+
+ self.assertEqual(ttk._format_mapdict({2: []}), ('-2', ''))
+
+ opts = {'üñíćódè': [('á', 'vãl')]}
+ result = ttk._format_mapdict(opts)
+ self.assertEqual(result, ('-üñíćódè', 'á vãl'))
+
+ self.assertEqual(ttk._format_mapdict({'opt': [('value',)]}),
+ ('-opt', '{} value'))
+
+ # empty states
+ valid = {'opt': [('', '', 'hi')]}
+ self.assertEqual(ttk._format_mapdict(valid), ('-opt', '{ } hi'))
+
+ # when passing multiple states, they all must be strings
+ invalid = {'opt': [(1, 2, 'valid val')]}
+ self.assertRaises(TypeError, ttk._format_mapdict, invalid)
+ invalid = {'opt': [([1], '2', 'valid val')]}
+ self.assertRaises(TypeError, ttk._format_mapdict, invalid)
+ # but when passing a single state, it can be anything
+ valid = {'opt': [[1, 'value']]}
+ self.assertEqual(ttk._format_mapdict(valid), ('-opt', '1 value'))
+ # special attention to single states which evaluate to False
+ for stateval in (None, 0, False, '', set()): # just some samples
+ valid = {'opt': [(stateval, 'value')]}
+ self.assertEqual(ttk._format_mapdict(valid),
+ ('-opt', '{} value'))
+
+ # values must be iterable
+ opts = {'a': None}
+ self.assertRaises(TypeError, ttk._format_mapdict, opts)
+
+
+ def test_format_elemcreate(self):
+ self.assertTrue(ttk._format_elemcreate(None), (None, ()))
+
+ ## Testing type = image
+ # image type expects at least an image name, so this should raise
+ # IndexError since it tries to access the index 0 of an empty tuple
+ self.assertRaises(IndexError, ttk._format_elemcreate, 'image')
+
+ # don't format returned values as a tcl script
+ # minimum acceptable for image type
+ self.assertEqual(ttk._format_elemcreate('image', False, 'test'),
+ ("test ", ()))
+ # specifying a state spec
+ self.assertEqual(ttk._format_elemcreate('image', False, 'test',
+ ('', 'a')), ("test {} a", ()))
+ # state spec with multiple states
+ self.assertEqual(ttk._format_elemcreate('image', False, 'test',
+ ('a', 'b', 'c')), ("test {a b} c", ()))
+ # state spec and options
+ self.assertEqual(ttk._format_elemcreate('image', False, 'test',
+ ('a', 'b'), a='x'), ("test a b", ("-a", "x")))
+ # format returned values as a tcl script
+ # state spec with multiple states and an option with a multivalue
+ self.assertEqual(ttk._format_elemcreate('image', True, 'test',
+ ('a', 'b', 'c', 'd'), x=[2, 3]), ("{test {a b c} d}", "-x {2 3}"))
+
+ ## Testing type = vsapi
+ # vsapi type expects at least a class name and a part_id, so this
+ # should raise a ValueError since it tries to get two elements from
+ # an empty tuple
+ self.assertRaises(ValueError, ttk._format_elemcreate, 'vsapi')
+
+ # don't format returned values as a tcl script
+ # minimum acceptable for vsapi
+ self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b'),
+ ("a b ", ()))
+ # now with a state spec with multiple states
+ self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b',
+ ('a', 'b', 'c')), ("a b {a b} c", ()))
+ # state spec and option
+ self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b',
+ ('a', 'b'), opt='x'), ("a b a b", ("-opt", "x")))
+ # format returned values as a tcl script
+ # state spec with a multivalue and an option
+ self.assertEqual(ttk._format_elemcreate('vsapi', True, 'a', 'b',
+ ('a', 'b', [1, 2]), opt='x'), ("{a b {a b} {1 2}}", "-opt x"))
+
+ # Testing type = from
+ # from type expects at least a type name
+ self.assertRaises(IndexError, ttk._format_elemcreate, 'from')
+
+ self.assertEqual(ttk._format_elemcreate('from', False, 'a'),
+ ('a', ()))
+ self.assertEqual(ttk._format_elemcreate('from', False, 'a', 'b'),
+ ('a', ('b', )))
+ self.assertEqual(ttk._format_elemcreate('from', True, 'a', 'b'),
+ ('{a}', 'b'))
+
+
+ def test_format_layoutlist(self):
+ def sample(indent=0, indent_size=2):
+ return ttk._format_layoutlist(
+ [('a', {'other': [1, 2, 3], 'children':
+ [('b', {'children':
+ [('c', {'children':
+ [('d', {'nice': 'opt'})], 'something': (1, 2)
+ })]
+ })]
+ })], indent=indent, indent_size=indent_size)[0]
+
+ def sample_expected(indent=0, indent_size=2):
+ spaces = lambda amount=0: ' ' * (amount + indent)
+ return (
+ "%sa -other {1 2 3} -children {\n"
+ "%sb -children {\n"
+ "%sc -something {1 2} -children {\n"
+ "%sd -nice opt\n"
+ "%s}\n"
+ "%s}\n"
+ "%s}" % (spaces(), spaces(indent_size),
+ spaces(2 * indent_size), spaces(3 * indent_size),
+ spaces(2 * indent_size), spaces(indent_size), spaces()))
+
+ # empty layout
+ self.assertEqual(ttk._format_layoutlist([])[0], '')
+
+ # _format_layoutlist always expects the second item (in every item)
+ # to act like a dict (except when the value evaluates to False).
+ self.assertRaises(AttributeError,
+ ttk._format_layoutlist, [('a', 'b')])
+
+ smallest = ttk._format_layoutlist([('a', None)], indent=0)
+ self.assertEqual(smallest,
+ ttk._format_layoutlist([('a', '')], indent=0))
+ self.assertEqual(smallest[0], 'a')
+
+ # testing indentation levels
+ self.assertEqual(sample(), sample_expected())
+ for i in range(4):
+ self.assertEqual(sample(i), sample_expected(i))
+ self.assertEqual(sample(i, i), sample_expected(i, i))
+
+ # invalid layout format, different kind of exceptions will be
+ # raised by internal functions
+
+ # plain wrong format
+ self.assertRaises(ValueError, ttk._format_layoutlist,
+ ['bad', 'format'])
+ # will try to use iteritems in the 'bad' string
+ self.assertRaises(AttributeError, ttk._format_layoutlist,
+ [('name', 'bad')])
+ # bad children formatting
+ self.assertRaises(ValueError, ttk._format_layoutlist,
+ [('name', {'children': {'a': None}})])
+
+
+ def test_script_from_settings(self):
+ # empty options
+ self.assertFalse(ttk._script_from_settings({'name':
+ {'configure': None, 'map': None, 'element create': None}}))
+
+ # empty layout
+ self.assertEqual(
+ ttk._script_from_settings({'name': {'layout': None}}),
+ "ttk::style layout name {\nnull\n}")
+
+ configdict = {'αβγ': True, 'á': False}
+ self.assertTrue(
+ ttk._script_from_settings({'name': {'configure': configdict}}))
+
+ mapdict = {'üñíćódè': [('á', 'vãl')]}
+ self.assertTrue(
+ ttk._script_from_settings({'name': {'map': mapdict}}))
+
+ # invalid image element
+ self.assertRaises(IndexError,
+ ttk._script_from_settings, {'name': {'element create': ['image']}})
+
+ # minimal valid image
+ self.assertTrue(ttk._script_from_settings({'name':
+ {'element create': ['image', 'name']}}))
+
+ image = {'thing': {'element create':
+ ['image', 'name', ('state1', 'state2', 'val')]}}
+ self.assertEqual(ttk._script_from_settings(image),
+ "ttk::style element create thing image {name {state1 state2} val} ")
+
+ image['thing']['element create'].append({'opt': 30})
+ self.assertEqual(ttk._script_from_settings(image),
+ "ttk::style element create thing image {name {state1 state2} val} "
+ "-opt 30")
+
+ image['thing']['element create'][-1]['opt'] = [MockTclObj(3),
+ MockTclObj('2m')]
+ self.assertEqual(ttk._script_from_settings(image),
+ "ttk::style element create thing image {name {state1 state2} val} "
+ "-opt {3 2m}")
+
+
+ def test_tclobj_to_py(self):
+ self.assertEqual(
+ ttk._tclobj_to_py((MockStateSpec('a', 'b'), 'val')),
+ [('a', 'b', 'val')])
+ self.assertEqual(
+ ttk._tclobj_to_py([MockTclObj('1'), 2, MockTclObj('3m')]),
+ [1, 2, '3m'])
+
+
+ def test_list_from_statespec(self):
+ def test_it(sspec, value, res_value, states):
+ self.assertEqual(ttk._list_from_statespec(
+ (sspec, value)), [states + (res_value, )])
+
+ states_even = tuple('state%d' % i for i in range(6))
+ statespec = MockStateSpec(*states_even)
+ test_it(statespec, 'val', 'val', states_even)
+ test_it(statespec, MockTclObj('val'), 'val', states_even)
+
+ states_odd = tuple('state%d' % i for i in range(5))
+ statespec = MockStateSpec(*states_odd)
+ test_it(statespec, 'val', 'val', states_odd)
+
+ test_it(('a', 'b', 'c'), MockTclObj('val'), 'val', ('a', 'b', 'c'))
+
+
+ def test_list_from_layouttuple(self):
+ tk = MockTkApp()
+
+ # empty layout tuple
+ self.assertFalse(ttk._list_from_layouttuple(tk, ()))
+
+ # shortest layout tuple
+ self.assertEqual(ttk._list_from_layouttuple(tk, ('name', )),
+ [('name', {})])
+
+ # not so interesting ltuple
+ sample_ltuple = ('name', '-option', 'value')
+ self.assertEqual(ttk._list_from_layouttuple(tk, sample_ltuple),
+ [('name', {'option': 'value'})])
+
+ # empty children
+ self.assertEqual(ttk._list_from_layouttuple(tk,
+ ('something', '-children', ())),
+ [('something', {'children': []})]
+ )
+
+ # more interesting ltuple
+ ltuple = (
+ 'name', '-option', 'niceone', '-children', (
+ ('otherone', '-children', (
+ ('child', )), '-otheropt', 'othervalue'
+ )
+ )
+ )
+ self.assertEqual(ttk._list_from_layouttuple(tk, ltuple),
+ [('name', {'option': 'niceone', 'children':
+ [('otherone', {'otheropt': 'othervalue', 'children':
+ [('child', {})]
+ })]
+ })]
+ )
+
+ # bad tuples
+ self.assertRaises(ValueError, ttk._list_from_layouttuple, tk,
+ ('name', 'no_minus'))
+ self.assertRaises(ValueError, ttk._list_from_layouttuple, tk,
+ ('name', 'no_minus', 'value'))
+ self.assertRaises(ValueError, ttk._list_from_layouttuple, tk,
+ ('something', '-children')) # no children
+
+
+ def test_val_or_dict(self):
+ def func(res, opt=None, val=None):
+ if opt is None:
+ return res
+ if val is None:
+ return "test val"
+ return (opt, val)
+
+ tk = MockTkApp()
+ tk.call = func
+
+ self.assertEqual(ttk._val_or_dict(tk, {}, '-test:3'),
+ {'test': '3'})
+ self.assertEqual(ttk._val_or_dict(tk, {}, ('-test', 3)),
+ {'test': 3})
+
+ self.assertEqual(ttk._val_or_dict(tk, {'test': None}, 'x:y'),
+ 'test val')
+
+ self.assertEqual(ttk._val_or_dict(tk, {'test': 3}, 'x:y'),
+ {'test': 3})
+
+
+ def test_convert_stringval(self):
+ tests = (
+ (0, 0), ('09', 9), ('a', 'a'), ('áÚ', 'áÚ'), ([], '[]'),
+ (None, 'None')
+ )
+ for orig, expected in tests:
+ self.assertEqual(ttk._convert_stringval(orig), expected)
+
+
+class TclObjsToPyTest(unittest.TestCase):
+
+ def test_unicode(self):
+ adict = {'opt': 'välúè'}
+ self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': 'välúè'})
+
+ adict['opt'] = MockTclObj(adict['opt'])
+ self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': 'välúè'})
+
+ def test_multivalues(self):
+ adict = {'opt': [1, 2, 3, 4]}
+ self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 2, 3, 4]})
+
+ adict['opt'] = [1, 'xm', 3]
+ self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 'xm', 3]})
+
+ adict['opt'] = (MockStateSpec('a', 'b'), 'válũè')
+ self.assertEqual(ttk.tclobjs_to_py(adict),
+ {'opt': [('a', 'b', 'válũè')]})
+
+ self.assertEqual(ttk.tclobjs_to_py({'x': ['y z']}),
+ {'x': ['y z']})
+
+ def test_nosplit(self):
+ self.assertEqual(ttk.tclobjs_to_py({'text': 'some text'}),
+ {'text': 'some text'})
+
if __name__ == '__main__':
- test_main()
+ unittest.main()