mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
convert old fail* assertions to assert*
This commit is contained in:
Benjamin Peterson
parent
98d23f2e06
commit
c9c0f201fe
275 changed files with 4540 additions and 4540 deletions
|
|
@ -22,16 +22,16 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
x = ttk.LabeledScale()
|
||||
var = x._variable._name
|
||||
x.destroy()
|
||||
self.failUnlessRaises(tkinter.TclError, x.tk.globalgetvar, var)
|
||||
self.assertRaises(tkinter.TclError, x.tk.globalgetvar, var)
|
||||
|
||||
# manually created variable
|
||||
myvar = tkinter.DoubleVar()
|
||||
name = myvar._name
|
||||
x = ttk.LabeledScale(variable=myvar)
|
||||
x.destroy()
|
||||
self.failUnlessEqual(x.tk.globalgetvar(name), myvar.get())
|
||||
self.assertEqual(x.tk.globalgetvar(name), myvar.get())
|
||||
del myvar
|
||||
self.failUnlessRaises(tkinter.TclError, x.tk.globalgetvar, name)
|
||||
self.assertRaises(tkinter.TclError, x.tk.globalgetvar, name)
|
||||
|
||||
# checking that the tracing callback is properly removed
|
||||
myvar = tkinter.IntVar()
|
||||
|
|
@ -45,17 +45,17 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
# it tries calling instance attributes not yet defined.
|
||||
ttk.LabeledScale(variable=myvar)
|
||||
if hasattr(sys, 'last_type'):
|
||||
self.failIf(sys.last_type == tkinter.TclError)
|
||||
self.assertFalse(sys.last_type == tkinter.TclError)
|
||||
|
||||
|
||||
def test_initialization(self):
|
||||
# master passing
|
||||
x = ttk.LabeledScale()
|
||||
self.failUnlessEqual(x.master, tkinter._default_root)
|
||||
self.assertEqual(x.master, tkinter._default_root)
|
||||
x.destroy()
|
||||
master = tkinter.Frame()
|
||||
x = ttk.LabeledScale(master)
|
||||
self.failUnlessEqual(x.master, master)
|
||||
self.assertEqual(x.master, master)
|
||||
x.destroy()
|
||||
|
||||
# variable initialization/passing
|
||||
|
|
@ -63,29 +63,29 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
(-1, -1), (sys.maxsize + 1, sys.maxsize + 1))
|
||||
for pair in passed_expected:
|
||||
x = ttk.LabeledScale(from_=pair[0])
|
||||
self.failUnlessEqual(x.value, pair[1])
|
||||
self.assertEqual(x.value, pair[1])
|
||||
x.destroy()
|
||||
x = ttk.LabeledScale(from_='2.5')
|
||||
self.failUnlessRaises(ValueError, x._variable.get)
|
||||
self.assertRaises(ValueError, x._variable.get)
|
||||
x.destroy()
|
||||
x = ttk.LabeledScale(from_=None)
|
||||
self.failUnlessRaises(ValueError, x._variable.get)
|
||||
self.assertRaises(ValueError, x._variable.get)
|
||||
x.destroy()
|
||||
# variable should have its default value set to the from_ value
|
||||
myvar = tkinter.DoubleVar(value=20)
|
||||
x = ttk.LabeledScale(variable=myvar)
|
||||
self.failUnlessEqual(x.value, 0)
|
||||
self.assertEqual(x.value, 0)
|
||||
x.destroy()
|
||||
# check that it is really using a DoubleVar
|
||||
x = ttk.LabeledScale(variable=myvar, from_=0.5)
|
||||
self.failUnlessEqual(x.value, 0.5)
|
||||
self.failUnlessEqual(x._variable._name, myvar._name)
|
||||
self.assertEqual(x.value, 0.5)
|
||||
self.assertEqual(x._variable._name, myvar._name)
|
||||
x.destroy()
|
||||
|
||||
# widget positionment
|
||||
def check_positions(scale, scale_pos, label, label_pos):
|
||||
self.failUnlessEqual(scale.pack_info()['side'], scale_pos)
|
||||
self.failUnlessEqual(label.place_info()['anchor'], label_pos)
|
||||
self.assertEqual(scale.pack_info()['side'], scale_pos)
|
||||
self.assertEqual(label.place_info()['anchor'], label_pos)
|
||||
x = ttk.LabeledScale(compound='top')
|
||||
check_positions(x.scale, 'bottom', x.label, 'n')
|
||||
x.destroy()
|
||||
|
|
@ -100,7 +100,7 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
x.destroy()
|
||||
|
||||
# extra, and invalid, kwargs
|
||||
self.failUnlessRaises(tkinter.TclError, ttk.LabeledScale, a='b')
|
||||
self.assertRaises(tkinter.TclError, ttk.LabeledScale, a='b')
|
||||
|
||||
|
||||
def test_horizontal_range(self):
|
||||
|
|
@ -111,7 +111,7 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
|
||||
linfo_1 = lscale.label.place_info()
|
||||
prev_xcoord = lscale.scale.coords()[0]
|
||||
self.failUnlessEqual(prev_xcoord, int(linfo_1['x']))
|
||||
self.assertEqual(prev_xcoord, int(linfo_1['x']))
|
||||
# change range to: from -5 to 5. This should change the x coord of
|
||||
# the scale widget, since 0 is at the middle of the new
|
||||
# range.
|
||||
|
|
@ -120,15 +120,15 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
# at the same time this shouldn't affect test outcome
|
||||
lscale.update()
|
||||
curr_xcoord = lscale.scale.coords()[0]
|
||||
self.failUnless(prev_xcoord != curr_xcoord)
|
||||
self.assertTrue(prev_xcoord != curr_xcoord)
|
||||
# the label widget should have been repositioned too
|
||||
linfo_2 = lscale.label.place_info()
|
||||
self.failUnlessEqual(lscale.label['text'], 0)
|
||||
self.failUnlessEqual(curr_xcoord, int(linfo_2['x']))
|
||||
self.assertEqual(lscale.label['text'], 0)
|
||||
self.assertEqual(curr_xcoord, int(linfo_2['x']))
|
||||
# change the range back
|
||||
lscale.scale.configure(from_=0, to=10)
|
||||
self.failUnless(prev_xcoord != curr_xcoord)
|
||||
self.failUnlessEqual(prev_xcoord, int(linfo_1['x']))
|
||||
self.assertTrue(prev_xcoord != curr_xcoord)
|
||||
self.assertEqual(prev_xcoord, int(linfo_1['x']))
|
||||
|
||||
lscale.destroy()
|
||||
|
||||
|
|
@ -145,16 +145,16 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
# The following update is needed since the test doesn't use mainloop,
|
||||
# at the same time this shouldn't affect test outcome
|
||||
x.update()
|
||||
self.failUnlessEqual(x.label['text'], newval)
|
||||
self.failUnless(x.scale.coords()[0] > curr_xcoord)
|
||||
self.failUnlessEqual(x.scale.coords()[0],
|
||||
self.assertEqual(x.label['text'], newval)
|
||||
self.assertTrue(x.scale.coords()[0] > curr_xcoord)
|
||||
self.assertEqual(x.scale.coords()[0],
|
||||
int(x.label.place_info()['x']))
|
||||
|
||||
# value outside range
|
||||
x.value = x.scale['to'] + 1 # no changes shouldn't happen
|
||||
x.update()
|
||||
self.failUnlessEqual(x.label['text'], newval)
|
||||
self.failUnlessEqual(x.scale.coords()[0],
|
||||
self.assertEqual(x.label['text'], newval)
|
||||
self.assertEqual(x.scale.coords()[0],
|
||||
int(x.label.place_info()['x']))
|
||||
|
||||
x.destroy()
|
||||
|
|
@ -172,7 +172,7 @@ class LabeledScaleTest(unittest.TestCase):
|
|||
x.value = 3
|
||||
x.update()
|
||||
x.master.wm_geometry("%dx%d" % (width_new, height_new))
|
||||
self.failUnlessEqual(int(x.label.place_info()['x']),
|
||||
self.assertEqual(int(x.label.place_info()['x']),
|
||||
x.scale.coords()[0])
|
||||
|
||||
# Reset geometry
|
||||
|
|
@ -197,20 +197,20 @@ class OptionMenuTest(unittest.TestCase):
|
|||
name = var._name
|
||||
optmenu.update_idletasks()
|
||||
optmenu.destroy()
|
||||
self.failUnlessEqual(optmenu.tk.globalgetvar(name), var.get())
|
||||
self.assertEqual(optmenu.tk.globalgetvar(name), var.get())
|
||||
del var
|
||||
self.failUnlessRaises(tkinter.TclError, optmenu.tk.globalgetvar, name)
|
||||
self.assertRaises(tkinter.TclError, optmenu.tk.globalgetvar, name)
|
||||
|
||||
|
||||
def test_initialization(self):
|
||||
self.failUnlessRaises(tkinter.TclError,
|
||||
self.assertRaises(tkinter.TclError,
|
||||
ttk.OptionMenu, None, self.textvar, invalid='thing')
|
||||
|
||||
optmenu = ttk.OptionMenu(None, self.textvar, 'b', 'a', 'b')
|
||||
self.failUnlessEqual(optmenu._variable.get(), 'b')
|
||||
self.assertEqual(optmenu._variable.get(), 'b')
|
||||
|
||||
self.failUnless(optmenu['menu'])
|
||||
self.failUnless(optmenu['textvariable'])
|
||||
self.assertTrue(optmenu['menu'])
|
||||
self.assertTrue(optmenu['textvariable'])
|
||||
|
||||
optmenu.destroy()
|
||||
|
||||
|
|
@ -222,10 +222,10 @@ class OptionMenuTest(unittest.TestCase):
|
|||
found_default = False
|
||||
for i in range(len(items)):
|
||||
value = optmenu['menu'].entrycget(i, 'value')
|
||||
self.failUnlessEqual(value, items[i])
|
||||
self.assertEqual(value, items[i])
|
||||
if value == default:
|
||||
found_default = True
|
||||
self.failUnless(found_default)
|
||||
self.assertTrue(found_default)
|
||||
optmenu.destroy()
|
||||
|
||||
# default shouldn't be in menu if it is not part of values
|
||||
|
|
@ -238,26 +238,26 @@ class OptionMenuTest(unittest.TestCase):
|
|||
if last == curr:
|
||||
# no more menu entries
|
||||
break
|
||||
self.failIf(curr == default)
|
||||
self.assertFalse(curr == default)
|
||||
i += 1
|
||||
self.failUnlessEqual(i, len(items))
|
||||
self.assertEqual(i, len(items))
|
||||
|
||||
# check that variable is updated correctly
|
||||
optmenu.pack()
|
||||
optmenu.wait_visibility()
|
||||
optmenu['menu'].invoke(0)
|
||||
self.failUnlessEqual(optmenu._variable.get(), items[0])
|
||||
self.assertEqual(optmenu._variable.get(), items[0])
|
||||
|
||||
# changing to an invalid index shouldn't change the variable
|
||||
self.failUnlessRaises(tkinter.TclError, optmenu['menu'].invoke, -1)
|
||||
self.failUnlessEqual(optmenu._variable.get(), items[0])
|
||||
self.assertRaises(tkinter.TclError, optmenu['menu'].invoke, -1)
|
||||
self.assertEqual(optmenu._variable.get(), items[0])
|
||||
|
||||
optmenu.destroy()
|
||||
|
||||
# specifying a callback
|
||||
success = []
|
||||
def cb_test(item):
|
||||
self.failUnlessEqual(item, items[1])
|
||||
self.assertEqual(item, items[1])
|
||||
success.append(True)
|
||||
optmenu = ttk.OptionMenu(None, self.textvar, 'a', command=cb_test,
|
||||
*items)
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@ 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.failUnlessEqual(result.pop(fmt_opts[i]), fmt_opts[i + 1])
|
||||
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.failIf(ttk._format_optdict({}))
|
||||
self.assertFalse(ttk._format_optdict({}))
|
||||
|
||||
# check list formatting
|
||||
check_against(
|
||||
|
|
@ -62,7 +62,7 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
# check if giving unicode keys is fine
|
||||
check_against(ttk._format_optdict(opts), {'-αβγ': True, '-á': False})
|
||||
# opts should remain unchanged
|
||||
self.failUnlessEqual(opts, orig_opts)
|
||||
self.assertEqual(opts, orig_opts)
|
||||
|
||||
# passing values with spaces inside a tuple/list
|
||||
check_against(
|
||||
|
|
@ -72,113 +72,113 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
|
||||
# ignore an option
|
||||
amount_opts = len(ttk._format_optdict(opts, ignore=('á'))) / 2
|
||||
self.failUnlessEqual(amount_opts, len(opts) - 1)
|
||||
self.assertEqual(amount_opts, len(opts) - 1)
|
||||
|
||||
# ignore non-existing options
|
||||
amount_opts = len(ttk._format_optdict(opts, ignore=('á', 'b'))) / 2
|
||||
self.failUnlessEqual(amount_opts, len(opts) - 1)
|
||||
self.assertEqual(amount_opts, len(opts) - 1)
|
||||
|
||||
# ignore every option
|
||||
self.failIf(ttk._format_optdict(opts, ignore=list(opts.keys())))
|
||||
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.failUnlessEqual(len(result), len(list(opts.keys())) * 2)
|
||||
self.failUnlessEqual(result, ('-a', '{b c} val d otherval {} single'))
|
||||
self.failUnlessEqual(ttk._format_mapdict(opts, script=True),
|
||||
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.failUnlessEqual(ttk._format_mapdict({2: []}), ('-2', ''))
|
||||
self.assertEqual(ttk._format_mapdict({2: []}), ('-2', ''))
|
||||
|
||||
opts = {'üñíćódè': [('á', 'vãl')]}
|
||||
result = ttk._format_mapdict(opts)
|
||||
self.failUnlessEqual(result, ('-üñíćódè', 'á vãl'))
|
||||
self.assertEqual(result, ('-üñíćódè', 'á vãl'))
|
||||
|
||||
# empty states
|
||||
valid = {'opt': [('', '', 'hi')]}
|
||||
self.failUnlessEqual(ttk._format_mapdict(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.failUnlessRaises(TypeError, ttk._format_mapdict, invalid)
|
||||
self.assertRaises(TypeError, ttk._format_mapdict, invalid)
|
||||
invalid = {'opt': [([1], '2', 'valid val')]}
|
||||
self.failUnlessRaises(TypeError, ttk._format_mapdict, invalid)
|
||||
self.assertRaises(TypeError, ttk._format_mapdict, invalid)
|
||||
# but when passing a single state, it can be anything
|
||||
valid = {'opt': [[1, 'value']]}
|
||||
self.failUnlessEqual(ttk._format_mapdict(valid), ('-opt', '1 value'))
|
||||
self.assertEqual(ttk._format_mapdict(valid), ('-opt', '1 value'))
|
||||
# special attention to single states which evalute to False
|
||||
for stateval in (None, 0, False, '', set()): # just some samples
|
||||
valid = {'opt': [(stateval, 'value')]}
|
||||
self.failUnlessEqual(ttk._format_mapdict(valid),
|
||||
self.assertEqual(ttk._format_mapdict(valid),
|
||||
('-opt', '{} value'))
|
||||
|
||||
# values must be iterable
|
||||
opts = {'a': None}
|
||||
self.failUnlessRaises(TypeError, ttk._format_mapdict, opts)
|
||||
self.assertRaises(TypeError, ttk._format_mapdict, opts)
|
||||
|
||||
# items in the value must have size >= 2
|
||||
self.failUnlessRaises(IndexError, ttk._format_mapdict,
|
||||
self.assertRaises(IndexError, ttk._format_mapdict,
|
||||
{'a': [('invalid', )]})
|
||||
|
||||
|
||||
def test_format_elemcreate(self):
|
||||
self.failUnless(ttk._format_elemcreate(None), (None, ()))
|
||||
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.failUnlessRaises(IndexError, ttk._format_elemcreate, 'image')
|
||||
self.assertRaises(IndexError, ttk._format_elemcreate, 'image')
|
||||
|
||||
# don't format returned values as a tcl script
|
||||
# minimum acceptable for image type
|
||||
self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test'),
|
||||
self.assertEqual(ttk._format_elemcreate('image', False, 'test'),
|
||||
("test ", ()))
|
||||
# specifiyng a state spec
|
||||
self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test',
|
||||
self.assertEqual(ttk._format_elemcreate('image', False, 'test',
|
||||
('', 'a')), ("test {} a", ()))
|
||||
# state spec with multiple states
|
||||
self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test',
|
||||
self.assertEqual(ttk._format_elemcreate('image', False, 'test',
|
||||
('a', 'b', 'c')), ("test {a b} c", ()))
|
||||
# state spec and options
|
||||
self.failUnlessEqual(ttk._format_elemcreate('image', False, 'test',
|
||||
self.assertEqual(ttk._format_elemcreate('image', False, 'test',
|
||||
('a', 'b'), a='x', b='y'), ("test a b", ("-a", "x", "-b", "y")))
|
||||
# format returned values as a tcl script
|
||||
# state spec with multiple states and an option with a multivalue
|
||||
self.failUnlessEqual(ttk._format_elemcreate('image', True, 'test',
|
||||
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 an ValueError since it tries to get two elements from
|
||||
# an empty tuple
|
||||
self.failUnlessRaises(ValueError, ttk._format_elemcreate, 'vsapi')
|
||||
self.assertRaises(ValueError, ttk._format_elemcreate, 'vsapi')
|
||||
|
||||
# don't format returned values as a tcl script
|
||||
# minimum acceptable for vsapi
|
||||
self.failUnlessEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b'),
|
||||
self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b'),
|
||||
("a b ", ()))
|
||||
# now with a state spec with multiple states
|
||||
self.failUnlessEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b',
|
||||
self.assertEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b',
|
||||
('a', 'b', 'c')), ("a b {a b} c", ()))
|
||||
# state spec and option
|
||||
self.failUnlessEqual(ttk._format_elemcreate('vsapi', False, 'a', 'b',
|
||||
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.failUnlessEqual(ttk._format_elemcreate('vsapi', True, 'a', 'b',
|
||||
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.failUnlessRaises(IndexError, ttk._format_elemcreate, 'from')
|
||||
self.assertRaises(IndexError, ttk._format_elemcreate, 'from')
|
||||
|
||||
self.failUnlessEqual(ttk._format_elemcreate('from', False, 'a'),
|
||||
self.assertEqual(ttk._format_elemcreate('from', False, 'a'),
|
||||
('a', ()))
|
||||
self.failUnlessEqual(ttk._format_elemcreate('from', False, 'a', 'b'),
|
||||
self.assertEqual(ttk._format_elemcreate('from', False, 'a', 'b'),
|
||||
('a', ('b', )))
|
||||
self.failUnlessEqual(ttk._format_elemcreate('from', True, 'a', 'b'),
|
||||
self.assertEqual(ttk._format_elemcreate('from', True, 'a', 'b'),
|
||||
('{a}', 'b'))
|
||||
|
||||
|
||||
|
|
@ -207,77 +207,77 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
spaces(2 * indent_size), spaces(indent_size), spaces()))
|
||||
|
||||
# empty layout
|
||||
self.failUnlessEqual(ttk._format_layoutlist([])[0], '')
|
||||
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 evalutes to False).
|
||||
self.failUnlessRaises(AttributeError,
|
||||
self.assertRaises(AttributeError,
|
||||
ttk._format_layoutlist, [('a', 'b')])
|
||||
|
||||
smallest = ttk._format_layoutlist([('a', None)], indent=0)
|
||||
self.failUnlessEqual(smallest,
|
||||
self.assertEqual(smallest,
|
||||
ttk._format_layoutlist([('a', '')], indent=0))
|
||||
self.failUnlessEqual(smallest[0], 'a')
|
||||
self.assertEqual(smallest[0], 'a')
|
||||
|
||||
# testing indentation levels
|
||||
self.failUnlessEqual(sample(), sample_expected())
|
||||
self.assertEqual(sample(), sample_expected())
|
||||
for i in range(4):
|
||||
self.failUnlessEqual(sample(i), sample_expected(i))
|
||||
self.failUnlessEqual(sample(i, i), sample_expected(i, i))
|
||||
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.failUnlessRaises(ValueError, ttk._format_layoutlist,
|
||||
self.assertRaises(ValueError, ttk._format_layoutlist,
|
||||
['bad', 'format'])
|
||||
# will try to use iteritems in the 'bad' string
|
||||
self.failUnlessRaises(AttributeError, ttk._format_layoutlist,
|
||||
self.assertRaises(AttributeError, ttk._format_layoutlist,
|
||||
[('name', 'bad')])
|
||||
# bad children formatting
|
||||
self.failUnlessRaises(ValueError, ttk._format_layoutlist,
|
||||
self.assertRaises(ValueError, ttk._format_layoutlist,
|
||||
[('name', {'children': {'a': None}})])
|
||||
|
||||
|
||||
def test_script_from_settings(self):
|
||||
# empty options
|
||||
self.failIf(ttk._script_from_settings({'name':
|
||||
self.assertFalse(ttk._script_from_settings({'name':
|
||||
{'configure': None, 'map': None, 'element create': None}}))
|
||||
|
||||
# empty layout
|
||||
self.failUnlessEqual(
|
||||
self.assertEqual(
|
||||
ttk._script_from_settings({'name': {'layout': None}}),
|
||||
"ttk::style layout name {\nnull\n}")
|
||||
|
||||
configdict = {'αβγ': True, 'á': False}
|
||||
self.failUnless(
|
||||
self.assertTrue(
|
||||
ttk._script_from_settings({'name': {'configure': configdict}}))
|
||||
|
||||
mapdict = {'üñíćódè': [('á', 'vãl')]}
|
||||
self.failUnless(
|
||||
self.assertTrue(
|
||||
ttk._script_from_settings({'name': {'map': mapdict}}))
|
||||
|
||||
# invalid image element
|
||||
self.failUnlessRaises(IndexError,
|
||||
self.assertRaises(IndexError,
|
||||
ttk._script_from_settings, {'name': {'element create': ['image']}})
|
||||
|
||||
# minimal valid image
|
||||
self.failUnless(ttk._script_from_settings({'name':
|
||||
self.assertTrue(ttk._script_from_settings({'name':
|
||||
{'element create': ['image', 'name']}}))
|
||||
|
||||
image = {'thing': {'element create':
|
||||
['image', 'name', ('state1', 'state2', 'val')]}}
|
||||
self.failUnlessEqual(ttk._script_from_settings(image),
|
||||
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.failUnlessEqual(ttk._script_from_settings(image),
|
||||
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.failUnlessEqual(ttk._script_from_settings(image),
|
||||
self.assertEqual(ttk._script_from_settings(image),
|
||||
"ttk::style element create thing image {name {state1 state2} val} "
|
||||
"-opt {3 2m}")
|
||||
|
||||
|
|
@ -285,28 +285,28 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
def test_dict_from_tcltuple(self):
|
||||
fakettuple = ('-a', '{1 2 3}', '-something', 'foo')
|
||||
|
||||
self.failUnlessEqual(ttk._dict_from_tcltuple(fakettuple, False),
|
||||
self.assertEqual(ttk._dict_from_tcltuple(fakettuple, False),
|
||||
{'-a': '{1 2 3}', '-something': 'foo'})
|
||||
|
||||
self.failUnlessEqual(ttk._dict_from_tcltuple(fakettuple),
|
||||
self.assertEqual(ttk._dict_from_tcltuple(fakettuple),
|
||||
{'a': '{1 2 3}', 'something': 'foo'})
|
||||
|
||||
# passing a tuple with a single item should return an empty dict,
|
||||
# since it tries to break the tuple by pairs.
|
||||
self.failIf(ttk._dict_from_tcltuple(('single', )))
|
||||
self.assertFalse(ttk._dict_from_tcltuple(('single', )))
|
||||
|
||||
sspec = MockStateSpec('a', 'b')
|
||||
self.failUnlessEqual(ttk._dict_from_tcltuple(('-a', (sspec, 'val'))),
|
||||
self.assertEqual(ttk._dict_from_tcltuple(('-a', (sspec, 'val'))),
|
||||
{'a': [('a', 'b', 'val')]})
|
||||
|
||||
self.failUnlessEqual(ttk._dict_from_tcltuple((MockTclObj('-padding'),
|
||||
self.assertEqual(ttk._dict_from_tcltuple((MockTclObj('-padding'),
|
||||
[MockTclObj('1'), 2, MockTclObj('3m')])),
|
||||
{'padding': [1, 2, '3m']})
|
||||
|
||||
|
||||
def test_list_from_statespec(self):
|
||||
def test_it(sspec, value, res_value, states):
|
||||
self.failUnlessEqual(ttk._list_from_statespec(
|
||||
self.assertEqual(ttk._list_from_statespec(
|
||||
(sspec, value)), [states + (res_value, )])
|
||||
|
||||
states_even = tuple('state%d' % i for i in range(6))
|
||||
|
|
@ -323,19 +323,19 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
|
||||
def test_list_from_layouttuple(self):
|
||||
# empty layout tuple
|
||||
self.failIf(ttk._list_from_layouttuple(()))
|
||||
self.assertFalse(ttk._list_from_layouttuple(()))
|
||||
|
||||
# shortest layout tuple
|
||||
self.failUnlessEqual(ttk._list_from_layouttuple(('name', )),
|
||||
self.assertEqual(ttk._list_from_layouttuple(('name', )),
|
||||
[('name', {})])
|
||||
|
||||
# not so interesting ltuple
|
||||
sample_ltuple = ('name', '-option', 'value')
|
||||
self.failUnlessEqual(ttk._list_from_layouttuple(sample_ltuple),
|
||||
self.assertEqual(ttk._list_from_layouttuple(sample_ltuple),
|
||||
[('name', {'option': 'value'})])
|
||||
|
||||
# empty children
|
||||
self.failUnlessEqual(ttk._list_from_layouttuple(
|
||||
self.assertEqual(ttk._list_from_layouttuple(
|
||||
('something', '-children', ())),
|
||||
[('something', {'children': []})]
|
||||
)
|
||||
|
|
@ -348,7 +348,7 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
)
|
||||
)
|
||||
)
|
||||
self.failUnlessEqual(ttk._list_from_layouttuple(ltuple),
|
||||
self.assertEqual(ttk._list_from_layouttuple(ltuple),
|
||||
[('name', {'option': 'niceone', 'children':
|
||||
[('otherone', {'otheropt': 'othervalue', 'children':
|
||||
[('child', {})]
|
||||
|
|
@ -357,13 +357,13 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
)
|
||||
|
||||
# bad tuples
|
||||
self.failUnlessRaises(ValueError, ttk._list_from_layouttuple,
|
||||
self.assertRaises(ValueError, ttk._list_from_layouttuple,
|
||||
('name', 'no_minus'))
|
||||
self.failUnlessRaises(ValueError, ttk._list_from_layouttuple,
|
||||
self.assertRaises(ValueError, ttk._list_from_layouttuple,
|
||||
('name', 'no_minus', 'value'))
|
||||
self.failUnlessRaises(ValueError, ttk._list_from_layouttuple,
|
||||
self.assertRaises(ValueError, ttk._list_from_layouttuple,
|
||||
('something', '-children')) # no children
|
||||
self.failUnlessRaises(ValueError, ttk._list_from_layouttuple,
|
||||
self.assertRaises(ValueError, ttk._list_from_layouttuple,
|
||||
('something', '-children', 'value')) # invalid children
|
||||
|
||||
|
||||
|
|
@ -374,10 +374,10 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
return (opt, val)
|
||||
|
||||
options = {'test': None}
|
||||
self.failUnlessEqual(ttk._val_or_dict(options, func), "test val")
|
||||
self.assertEqual(ttk._val_or_dict(options, func), "test val")
|
||||
|
||||
options = {'test': 3}
|
||||
self.failUnlessEqual(ttk._val_or_dict(options, func), options)
|
||||
self.assertEqual(ttk._val_or_dict(options, func), options)
|
||||
|
||||
|
||||
def test_convert_stringval(self):
|
||||
|
|
@ -386,34 +386,34 @@ class InternalFunctionsTest(unittest.TestCase):
|
|||
(None, 'None')
|
||||
)
|
||||
for orig, expected in tests:
|
||||
self.failUnlessEqual(ttk._convert_stringval(orig), expected)
|
||||
self.assertEqual(ttk._convert_stringval(orig), expected)
|
||||
|
||||
|
||||
class TclObjsToPyTest(unittest.TestCase):
|
||||
|
||||
def test_unicode(self):
|
||||
adict = {'opt': 'välúè'}
|
||||
self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': 'välúè'})
|
||||
self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': 'välúè'})
|
||||
|
||||
adict['opt'] = MockTclObj(adict['opt'])
|
||||
self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': 'välúè'})
|
||||
self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': 'välúè'})
|
||||
|
||||
def test_multivalues(self):
|
||||
adict = {'opt': [1, 2, 3, 4]}
|
||||
self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 2, 3, 4]})
|
||||
self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 2, 3, 4]})
|
||||
|
||||
adict['opt'] = [1, 'xm', 3]
|
||||
self.failUnlessEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 'xm', 3]})
|
||||
self.assertEqual(ttk.tclobjs_to_py(adict), {'opt': [1, 'xm', 3]})
|
||||
|
||||
adict['opt'] = (MockStateSpec('a', 'b'), 'válũè')
|
||||
self.failUnlessEqual(ttk.tclobjs_to_py(adict),
|
||||
self.assertEqual(ttk.tclobjs_to_py(adict),
|
||||
{'opt': [('a', 'b', 'válũè')]})
|
||||
|
||||
self.failUnlessEqual(ttk.tclobjs_to_py({'x': ['y z']}),
|
||||
self.assertEqual(ttk.tclobjs_to_py({'x': ['y z']}),
|
||||
{'x': ['y z']})
|
||||
|
||||
def test_nosplit(self):
|
||||
self.failUnlessEqual(ttk.tclobjs_to_py({'text': 'some text'}),
|
||||
self.assertEqual(ttk.tclobjs_to_py({'text': 'some text'}),
|
||||
{'text': 'some text'})
|
||||
|
||||
tests_nogui = (InternalFunctionsTest, TclObjsToPyTest)
|
||||
|
|
|
|||
|
|
@ -16,17 +16,17 @@ class StyleTest(unittest.TestCase):
|
|||
def test_configure(self):
|
||||
style = self.style
|
||||
style.configure('TButton', background='yellow')
|
||||
self.failUnlessEqual(style.configure('TButton', 'background'),
|
||||
self.assertEqual(style.configure('TButton', 'background'),
|
||||
'yellow')
|
||||
self.failUnless(isinstance(style.configure('TButton'), dict))
|
||||
self.assertTrue(isinstance(style.configure('TButton'), dict))
|
||||
|
||||
|
||||
def test_map(self):
|
||||
style = self.style
|
||||
style.map('TButton', background=[('active', 'background', 'blue')])
|
||||
self.failUnlessEqual(style.map('TButton', 'background'),
|
||||
self.assertEqual(style.map('TButton', 'background'),
|
||||
[('active', 'background', 'blue')])
|
||||
self.failUnless(isinstance(style.map('TButton'), dict))
|
||||
self.assertTrue(isinstance(style.map('TButton'), dict))
|
||||
|
||||
|
||||
def test_lookup(self):
|
||||
|
|
@ -34,38 +34,38 @@ class StyleTest(unittest.TestCase):
|
|||
style.configure('TButton', background='yellow')
|
||||
style.map('TButton', background=[('active', 'background', 'blue')])
|
||||
|
||||
self.failUnlessEqual(style.lookup('TButton', 'background'), 'yellow')
|
||||
self.failUnlessEqual(style.lookup('TButton', 'background',
|
||||
self.assertEqual(style.lookup('TButton', 'background'), 'yellow')
|
||||
self.assertEqual(style.lookup('TButton', 'background',
|
||||
['active', 'background']), 'blue')
|
||||
self.failUnlessEqual(style.lookup('TButton', 'optionnotdefined',
|
||||
self.assertEqual(style.lookup('TButton', 'optionnotdefined',
|
||||
default='iknewit'), 'iknewit')
|
||||
|
||||
|
||||
def test_layout(self):
|
||||
style = self.style
|
||||
self.failUnlessRaises(tkinter.TclError, style.layout, 'NotALayout')
|
||||
self.assertRaises(tkinter.TclError, style.layout, 'NotALayout')
|
||||
tv_style = style.layout('Treeview')
|
||||
|
||||
# "erase" Treeview layout
|
||||
style.layout('Treeview', '')
|
||||
self.failUnlessEqual(style.layout('Treeview'),
|
||||
self.assertEqual(style.layout('Treeview'),
|
||||
[('null', {'sticky': 'nswe'})]
|
||||
)
|
||||
|
||||
# restore layout
|
||||
style.layout('Treeview', tv_style)
|
||||
self.failUnlessEqual(style.layout('Treeview'), tv_style)
|
||||
self.assertEqual(style.layout('Treeview'), tv_style)
|
||||
|
||||
# should return a list
|
||||
self.failUnless(isinstance(style.layout('TButton'), list))
|
||||
self.assertTrue(isinstance(style.layout('TButton'), list))
|
||||
|
||||
# correct layout, but "option" doesn't exist as option
|
||||
self.failUnlessRaises(tkinter.TclError, style.layout, 'Treeview',
|
||||
self.assertRaises(tkinter.TclError, style.layout, 'Treeview',
|
||||
[('name', {'option': 'inexistent'})])
|
||||
|
||||
|
||||
def test_theme_use(self):
|
||||
self.failUnlessRaises(tkinter.TclError, self.style.theme_use,
|
||||
self.assertRaises(tkinter.TclError, self.style.theme_use,
|
||||
'nonexistingname')
|
||||
|
||||
curr_theme = self.style.theme_use()
|
||||
|
|
@ -79,8 +79,8 @@ class StyleTest(unittest.TestCase):
|
|||
# just one theme available, can't go on with tests
|
||||
return
|
||||
|
||||
self.failIf(curr_theme == new_theme)
|
||||
self.failIf(new_theme != self.style.theme_use())
|
||||
self.assertFalse(curr_theme == new_theme)
|
||||
self.assertFalse(new_theme != self.style.theme_use())
|
||||
|
||||
self.style.theme_use(curr_theme)
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue