summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter/test
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-13 08:51:18 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-13 08:51:18 (GMT)
commitab91fdef1f1e556203a2eee98ba7d379e4790de9 (patch)
tree6f8f00dc18cc5f2801a675df277c2c595eb85ec8 /Lib/tkinter/test
parentef82be368abdea8e8032500e7ecc3a22f5f07851 (diff)
downloadcpython-ab91fdef1f1e556203a2eee98ba7d379e4790de9.zip
cpython-ab91fdef1f1e556203a2eee98ba7d379e4790de9.tar.gz
cpython-ab91fdef1f1e556203a2eee98ba7d379e4790de9.tar.bz2
Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........
Diffstat (limited to 'Lib/tkinter/test')
-rw-r--r--Lib/tkinter/test/test_tkinter/test_text.py12
-rw-r--r--Lib/tkinter/test/test_ttk/test_extensions.py82
-rw-r--r--Lib/tkinter/test/test_ttk/test_functions.py156
-rw-r--r--Lib/tkinter/test/test_ttk/test_style.py30
-rw-r--r--Lib/tkinter/test/test_ttk/test_widgets.py560
5 files changed, 420 insertions, 420 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_text.py b/Lib/tkinter/test/test_tkinter/test_text.py
index fffd455..a93c4ce 100644
--- a/Lib/tkinter/test/test_tkinter/test_text.py
+++ b/Lib/tkinter/test/test_tkinter/test_text.py
@@ -19,18 +19,18 @@ class TextTest(unittest.TestCase):
text = self.text
# pattern and index are obligatory arguments.
- self.failUnlessRaises(tkinter.TclError, text.search, None, '1.0')
- self.failUnlessRaises(tkinter.TclError, text.search, 'a', None)
- self.failUnlessRaises(tkinter.TclError, text.search, None, None)
+ self.assertRaises(tkinter.TclError, text.search, None, '1.0')
+ self.assertRaises(tkinter.TclError, text.search, 'a', None)
+ self.assertRaises(tkinter.TclError, text.search, None, None)
# Invalid text index.
- self.failUnlessRaises(tkinter.TclError, text.search, '', 0)
+ self.assertRaises(tkinter.TclError, text.search, '', 0)
# Check if we are getting the indices as strings -- you are likely
# to get Tcl_Obj under Tk 8.5 if Tkinter doesn't convert it.
text.insert('1.0', 'hi-test')
- self.failUnlessEqual(text.search('-test', '1.0', 'end'), '1.2')
- self.failUnlessEqual(text.search('test', '1.0', 'end'), '1.3')
+ self.assertEqual(text.search('-test', '1.0', 'end'), '1.2')
+ self.assertEqual(text.search('test', '1.0', 'end'), '1.3')
tests_gui = (TextTest, )
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py
index 9e52fc6..5912af4 100644
--- a/Lib/tkinter/test/test_ttk/test_extensions.py
+++ b/Lib/tkinter/test/test_ttk/test_extensions.py
@@ -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)
diff --git a/Lib/tkinter/test/test_ttk/test_functions.py b/Lib/tkinter/test/test_ttk/test_functions.py
index c9f8d5d..f9b908e 100644
--- a/Lib/tkinter/test/test_ttk/test_functions.py
+++ b/Lib/tkinter/test/test_ttk/test_functions.py
@@ -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)
diff --git a/Lib/tkinter/test/test_ttk/test_style.py b/Lib/tkinter/test/test_ttk/test_style.py
index 3eebb64..e9a1eb4 100644
--- a/Lib/tkinter/test/test_ttk/test_style.py
+++ b/Lib/tkinter/test/test_ttk/test_style.py
@@ -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)
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
index 29fdce0..48a5223 100644
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -24,48 +24,48 @@ class WidgetTest(unittest.TestCase):
def test_identify(self):
self.widget.update_idletasks()
- self.failUnlessEqual(self.widget.identify(5, 5), "label")
- self.failUnlessEqual(self.widget.identify(-1, -1), "")
+ self.assertEqual(self.widget.identify(5, 5), "label")
+ self.assertEqual(self.widget.identify(-1, -1), "")
- self.failUnlessRaises(tkinter.TclError, self.widget.identify, None, 5)
- self.failUnlessRaises(tkinter.TclError, self.widget.identify, 5, None)
- self.failUnlessRaises(tkinter.TclError, self.widget.identify, 5, '')
+ self.assertRaises(tkinter.TclError, self.widget.identify, None, 5)
+ self.assertRaises(tkinter.TclError, self.widget.identify, 5, None)
+ self.assertRaises(tkinter.TclError, self.widget.identify, 5, '')
def test_widget_state(self):
# XXX not sure about the portability of all these tests
- self.failUnlessEqual(self.widget.state(), ())
- self.failUnlessEqual(self.widget.instate(['!disabled']), True)
+ self.assertEqual(self.widget.state(), ())
+ self.assertEqual(self.widget.instate(['!disabled']), True)
# changing from !disabled to disabled
- self.failUnlessEqual(self.widget.state(['disabled']), ('!disabled', ))
+ self.assertEqual(self.widget.state(['disabled']), ('!disabled', ))
# no state change
- self.failUnlessEqual(self.widget.state(['disabled']), ())
+ self.assertEqual(self.widget.state(['disabled']), ())
# change back to !disable but also active
- self.failUnlessEqual(self.widget.state(['!disabled', 'active']),
+ self.assertEqual(self.widget.state(['!disabled', 'active']),
('!active', 'disabled'))
# no state changes, again
- self.failUnlessEqual(self.widget.state(['!disabled', 'active']), ())
- self.failUnlessEqual(self.widget.state(['active', '!disabled']), ())
+ self.assertEqual(self.widget.state(['!disabled', 'active']), ())
+ self.assertEqual(self.widget.state(['active', '!disabled']), ())
def test_cb(arg1, **kw):
return arg1, kw
- self.failUnlessEqual(self.widget.instate(['!disabled'],
+ self.assertEqual(self.widget.instate(['!disabled'],
test_cb, "hi", **{"msg": "there"}),
('hi', {'msg': 'there'}))
# attempt to set invalid statespec
currstate = self.widget.state()
- self.failUnlessRaises(tkinter.TclError, self.widget.instate,
+ self.assertRaises(tkinter.TclError, self.widget.instate,
['badstate'])
- self.failUnlessRaises(tkinter.TclError, self.widget.instate,
+ self.assertRaises(tkinter.TclError, self.widget.instate,
['disabled', 'badstate'])
# verify that widget didn't change its state
- self.failUnlessEqual(currstate, self.widget.state())
+ self.assertEqual(currstate, self.widget.state())
# ensuring that passing None as state doesn't modify current state
self.widget.state(['active', '!disabled'])
- self.failUnlessEqual(self.widget.state(), ('active', ))
+ self.assertEqual(self.widget.state(), ('active', ))
class ButtonTest(unittest.TestCase):
@@ -74,7 +74,7 @@ class ButtonTest(unittest.TestCase):
success = []
btn = ttk.Button(command=lambda: success.append(1))
btn.invoke()
- self.failUnless(success)
+ self.assertTrue(success)
class CheckbuttonTest(unittest.TestCase):
@@ -88,21 +88,21 @@ class CheckbuttonTest(unittest.TestCase):
cbtn = ttk.Checkbutton(command=cb_test)
# the variable automatically created by ttk.Checkbutton is actually
# undefined till we invoke the Checkbutton
- self.failUnlessEqual(cbtn.state(), ('alternate', ))
- self.failUnlessRaises(tkinter.TclError, cbtn.tk.globalgetvar,
+ self.assertEqual(cbtn.state(), ('alternate', ))
+ self.assertRaises(tkinter.TclError, cbtn.tk.globalgetvar,
cbtn['variable'])
res = cbtn.invoke()
- self.failUnlessEqual(res, "cb test called")
- self.failUnlessEqual(cbtn['onvalue'],
+ self.assertEqual(res, "cb test called")
+ self.assertEqual(cbtn['onvalue'],
cbtn.tk.globalgetvar(cbtn['variable']))
- self.failUnless(success)
+ self.assertTrue(success)
cbtn['command'] = ''
res = cbtn.invoke()
- self.failUnlessEqual(res, '')
- self.failIf(len(success) > 1)
- self.failUnlessEqual(cbtn['offvalue'],
+ self.assertEqual(res, '')
+ self.assertFalse(len(success) > 1)
+ self.assertEqual(cbtn['offvalue'],
cbtn.tk.globalgetvar(cbtn['variable']))
@@ -138,7 +138,7 @@ class ComboboxTest(unittest.TestCase):
self.combo.event_generate('<Return>')
self.combo.update()
- self.failUnless(success)
+ self.assertTrue(success)
def test_postcommand(self):
@@ -149,18 +149,18 @@ class ComboboxTest(unittest.TestCase):
self.combo.wait_visibility()
self._show_drop_down_listbox()
- self.failUnless(success)
+ self.assertTrue(success)
# testing postcommand removal
self.combo['postcommand'] = ''
self._show_drop_down_listbox()
- self.failUnlessEqual(len(success), 1)
+ self.assertEqual(len(success), 1)
def test_values(self):
def check_get_current(getval, currval):
- self.failUnlessEqual(self.combo.get(), getval)
- self.failUnlessEqual(self.combo.current(), currval)
+ self.assertEqual(self.combo.get(), getval)
+ self.assertEqual(self.combo.current(), currval)
check_get_current('', -1)
@@ -182,17 +182,17 @@ class ComboboxTest(unittest.TestCase):
# testing values with empty string set through configure
self.combo.configure(values=[1, '', 2])
- self.failUnlessEqual(self.combo['values'], ('1', '', '2'))
+ self.assertEqual(self.combo['values'], ('1', '', '2'))
# out of range
- self.failUnlessRaises(tkinter.TclError, self.combo.current,
+ self.assertRaises(tkinter.TclError, self.combo.current,
len(self.combo['values']))
# it expects an integer (or something that can be converted to int)
- self.failUnlessRaises(tkinter.TclError, self.combo.current, '')
+ self.assertRaises(tkinter.TclError, self.combo.current, '')
# testing creating combobox with empty string in values
combo2 = ttk.Combobox(values=[1, 2, ''])
- self.failUnlessEqual(combo2['values'], ('1', '2', ''))
+ self.assertEqual(combo2['values'], ('1', '2', ''))
combo2.destroy()
@@ -208,12 +208,12 @@ class EntryTest(unittest.TestCase):
def test_bbox(self):
- self.failUnlessEqual(len(self.entry.bbox(0)), 4)
+ self.assertEqual(len(self.entry.bbox(0)), 4)
for item in self.entry.bbox(0):
- self.failUnless(isinstance(item, int))
+ self.assertTrue(isinstance(item, int))
- self.failUnlessRaises(tkinter.TclError, self.entry.bbox, 'noindex')
- self.failUnlessRaises(tkinter.TclError, self.entry.bbox, None)
+ self.assertRaises(tkinter.TclError, self.entry.bbox, 'noindex')
+ self.assertRaises(tkinter.TclError, self.entry.bbox, None)
def test_identify(self):
@@ -221,12 +221,12 @@ class EntryTest(unittest.TestCase):
self.entry.wait_visibility()
self.entry.update_idletasks()
- self.failUnlessEqual(self.entry.identify(5, 5), "textarea")
- self.failUnlessEqual(self.entry.identify(-1, -1), "")
+ self.assertEqual(self.entry.identify(5, 5), "textarea")
+ self.assertEqual(self.entry.identify(-1, -1), "")
- self.failUnlessRaises(tkinter.TclError, self.entry.identify, None, 5)
- self.failUnlessRaises(tkinter.TclError, self.entry.identify, 5, None)
- self.failUnlessRaises(tkinter.TclError, self.entry.identify, 5, '')
+ self.assertRaises(tkinter.TclError, self.entry.identify, None, 5)
+ self.assertRaises(tkinter.TclError, self.entry.identify, 5, None)
+ self.assertRaises(tkinter.TclError, self.entry.identify, 5, '')
def test_validation_options(self):
@@ -238,23 +238,23 @@ class EntryTest(unittest.TestCase):
self.entry['invalidcommand'] = test_invalid
self.entry.validate()
- self.failUnless(success)
+ self.assertTrue(success)
self.entry['invalidcommand'] = ''
self.entry.validate()
- self.failUnlessEqual(len(success), 1)
+ self.assertEqual(len(success), 1)
self.entry['invalidcommand'] = test_invalid
self.entry['validatecommand'] = lambda: True
self.entry.validate()
- self.failUnlessEqual(len(success), 1)
+ self.assertEqual(len(success), 1)
self.entry['validatecommand'] = ''
self.entry.validate()
- self.failUnlessEqual(len(success), 1)
+ self.assertEqual(len(success), 1)
self.entry['validatecommand'] = True
- self.failUnlessRaises(tkinter.TclError, self.entry.validate)
+ self.assertRaises(tkinter.TclError, self.entry.validate)
def test_validation(self):
@@ -271,8 +271,8 @@ class EntryTest(unittest.TestCase):
self.entry.insert('end', 1)
self.entry.insert('end', 'a')
- self.failUnlessEqual(validation, [False, True])
- self.failUnlessEqual(self.entry.get(), 'a')
+ self.assertEqual(validation, [False, True])
+ self.assertEqual(self.entry.get(), 'a')
def test_revalidation(self):
@@ -285,19 +285,19 @@ class EntryTest(unittest.TestCase):
self.entry['validatecommand'] = self.entry.register(validate), '%P'
self.entry.insert('end', 'avocado')
- self.failUnlessEqual(self.entry.validate(), True)
- self.failUnlessEqual(self.entry.state(), ())
+ self.assertEqual(self.entry.validate(), True)
+ self.assertEqual(self.entry.state(), ())
self.entry.delete(0, 'end')
- self.failUnlessEqual(self.entry.get(), '')
+ self.assertEqual(self.entry.get(), '')
self.entry.insert('end', 'a1b')
- self.failUnlessEqual(self.entry.validate(), False)
- self.failUnlessEqual(self.entry.state(), ('invalid', ))
+ self.assertEqual(self.entry.validate(), False)
+ self.assertEqual(self.entry.state(), ('invalid', ))
self.entry.delete(1)
- self.failUnlessEqual(self.entry.validate(), True)
- self.failUnlessEqual(self.entry.state(), ())
+ self.assertEqual(self.entry.validate(), True)
+ self.assertEqual(self.entry.state(), ())
class PanedwindowTest(unittest.TestCase):
@@ -315,108 +315,108 @@ class PanedwindowTest(unittest.TestCase):
# attempt to add a child that is not a direct child of the paned window
label = ttk.Label(self.paned)
child = ttk.Label(label)
- self.failUnlessRaises(tkinter.TclError, self.paned.add, child)
+ self.assertRaises(tkinter.TclError, self.paned.add, child)
label.destroy()
child.destroy()
# another attempt
label = ttk.Label()
child = ttk.Label(label)
- self.failUnlessRaises(tkinter.TclError, self.paned.add, child)
+ self.assertRaises(tkinter.TclError, self.paned.add, child)
child.destroy()
label.destroy()
good_child = ttk.Label()
self.paned.add(good_child)
# re-adding a child is not accepted
- self.failUnlessRaises(tkinter.TclError, self.paned.add, good_child)
+ self.assertRaises(tkinter.TclError, self.paned.add, good_child)
other_child = ttk.Label(self.paned)
self.paned.add(other_child)
- self.failUnlessEqual(self.paned.pane(0), self.paned.pane(1))
- self.failUnlessRaises(tkinter.TclError, self.paned.pane, 2)
+ self.assertEqual(self.paned.pane(0), self.paned.pane(1))
+ self.assertRaises(tkinter.TclError, self.paned.pane, 2)
good_child.destroy()
other_child.destroy()
- self.failUnlessRaises(tkinter.TclError, self.paned.pane, 0)
+ self.assertRaises(tkinter.TclError, self.paned.pane, 0)
def test_forget(self):
- self.failUnlessRaises(tkinter.TclError, self.paned.forget, None)
- self.failUnlessRaises(tkinter.TclError, self.paned.forget, 0)
+ self.assertRaises(tkinter.TclError, self.paned.forget, None)
+ self.assertRaises(tkinter.TclError, self.paned.forget, 0)
self.paned.add(ttk.Label())
self.paned.forget(0)
- self.failUnlessRaises(tkinter.TclError, self.paned.forget, 0)
+ self.assertRaises(tkinter.TclError, self.paned.forget, 0)
def test_insert(self):
- self.failUnlessRaises(tkinter.TclError, self.paned.insert, None, 0)
- self.failUnlessRaises(tkinter.TclError, self.paned.insert, 0, None)
- self.failUnlessRaises(tkinter.TclError, self.paned.insert, 0, 0)
+ self.assertRaises(tkinter.TclError, self.paned.insert, None, 0)
+ self.assertRaises(tkinter.TclError, self.paned.insert, 0, None)
+ self.assertRaises(tkinter.TclError, self.paned.insert, 0, 0)
child = ttk.Label()
child2 = ttk.Label()
child3 = ttk.Label()
- self.failUnlessRaises(tkinter.TclError, self.paned.insert, 0, child)
+ self.assertRaises(tkinter.TclError, self.paned.insert, 0, child)
self.paned.insert('end', child2)
self.paned.insert(0, child)
- self.failUnlessEqual(self.paned.panes(), (str(child), str(child2)))
+ self.assertEqual(self.paned.panes(), (str(child), str(child2)))
self.paned.insert(0, child2)
- self.failUnlessEqual(self.paned.panes(), (str(child2), str(child)))
+ self.assertEqual(self.paned.panes(), (str(child2), str(child)))
self.paned.insert('end', child3)
- self.failUnlessEqual(self.paned.panes(),
+ self.assertEqual(self.paned.panes(),
(str(child2), str(child), str(child3)))
# reinserting a child should move it to its current position
panes = self.paned.panes()
self.paned.insert('end', child3)
- self.failUnlessEqual(panes, self.paned.panes())
+ self.assertEqual(panes, self.paned.panes())
# moving child3 to child2 position should result in child2 ending up
# in previous child position and child ending up in previous child3
# position
self.paned.insert(child2, child3)
- self.failUnlessEqual(self.paned.panes(),
+ self.assertEqual(self.paned.panes(),
(str(child3), str(child2), str(child)))
def test_pane(self):
- self.failUnlessRaises(tkinter.TclError, self.paned.pane, 0)
+ self.assertRaises(tkinter.TclError, self.paned.pane, 0)
child = ttk.Label()
self.paned.add(child)
- self.failUnless(isinstance(self.paned.pane(0), dict))
- self.failUnlessEqual(self.paned.pane(0, weight=None), 0)
+ self.assertTrue(isinstance(self.paned.pane(0), dict))
+ self.assertEqual(self.paned.pane(0, weight=None), 0)
# newer form for querying a single option
- self.failUnlessEqual(self.paned.pane(0, 'weight'), 0)
- self.failUnlessEqual(self.paned.pane(0), self.paned.pane(str(child)))
+ self.assertEqual(self.paned.pane(0, 'weight'), 0)
+ self.assertEqual(self.paned.pane(0), self.paned.pane(str(child)))
- self.failUnlessRaises(tkinter.TclError, self.paned.pane, 0,
+ self.assertRaises(tkinter.TclError, self.paned.pane, 0,
badoption='somevalue')
def test_sashpos(self):
- self.failUnlessRaises(tkinter.TclError, self.paned.sashpos, None)
- self.failUnlessRaises(tkinter.TclError, self.paned.sashpos, '')
- self.failUnlessRaises(tkinter.TclError, self.paned.sashpos, 0)
+ self.assertRaises(tkinter.TclError, self.paned.sashpos, None)
+ self.assertRaises(tkinter.TclError, self.paned.sashpos, '')
+ self.assertRaises(tkinter.TclError, self.paned.sashpos, 0)
child = ttk.Label(self.paned, text='a')
self.paned.add(child, weight=1)
- self.failUnlessRaises(tkinter.TclError, self.paned.sashpos, 0)
+ self.assertRaises(tkinter.TclError, self.paned.sashpos, 0)
child2 = ttk.Label(self.paned, text='b')
self.paned.add(child2)
- self.failUnlessRaises(tkinter.TclError, self.paned.sashpos, 1)
+ self.assertRaises(tkinter.TclError, self.paned.sashpos, 1)
self.paned.pack(expand=True, fill='both')
self.paned.wait_visibility()
curr_pos = self.paned.sashpos(0)
self.paned.sashpos(0, 1000)
- self.failUnless(curr_pos != self.paned.sashpos(0))
- self.failUnless(isinstance(self.paned.sashpos(0), int))
+ self.assertTrue(curr_pos != self.paned.sashpos(0))
+ self.assertTrue(isinstance(self.paned.sashpos(0), int))
class RadiobuttonTest(unittest.TestCase):
@@ -432,21 +432,21 @@ class RadiobuttonTest(unittest.TestCase):
cbtn2 = ttk.Radiobutton(command=cb_test, variable=myvar, value=1)
res = cbtn.invoke()
- self.failUnlessEqual(res, "cb test called")
- self.failUnlessEqual(cbtn['value'], myvar.get())
- self.failUnlessEqual(myvar.get(),
+ self.assertEqual(res, "cb test called")
+ self.assertEqual(cbtn['value'], myvar.get())
+ self.assertEqual(myvar.get(),
cbtn.tk.globalgetvar(cbtn['variable']))
- self.failUnless(success)
+ self.assertTrue(success)
cbtn2['command'] = ''
res = cbtn2.invoke()
- self.failUnlessEqual(res, '')
- self.failIf(len(success) > 1)
- self.failUnlessEqual(cbtn2['value'], myvar.get())
- self.failUnlessEqual(myvar.get(),
+ self.assertEqual(res, '')
+ self.assertFalse(len(success) > 1)
+ self.assertEqual(cbtn2['value'], myvar.get())
+ self.assertEqual(myvar.get(),
cbtn.tk.globalgetvar(cbtn['variable']))
- self.failUnlessEqual(str(cbtn['variable']), str(cbtn2['variable']))
+ self.assertEqual(str(cbtn['variable']), str(cbtn2['variable']))
@@ -472,27 +472,27 @@ class ScaleTest(unittest.TestCase):
self.scale['from_'] = 10
self.scale['to'] = 3
- self.failIf(failure)
+ self.assertFalse(failure)
failure = [1, 1, 1]
self.scale.configure(from_=2, to=5)
self.scale.configure(from_=0, to=-2)
self.scale.configure(to=10)
- self.failIf(failure)
+ self.assertFalse(failure)
def test_get(self):
scale_width = self.scale.winfo_width()
- self.failUnlessEqual(self.scale.get(scale_width, 0), self.scale['to'])
+ self.assertEqual(self.scale.get(scale_width, 0), self.scale['to'])
- self.failUnlessEqual(self.scale.get(0, 0), self.scale['from'])
- self.failUnlessEqual(self.scale.get(), self.scale['value'])
+ self.assertEqual(self.scale.get(0, 0), self.scale['from'])
+ self.assertEqual(self.scale.get(), self.scale['value'])
self.scale['value'] = 30
- self.failUnlessEqual(self.scale.get(), self.scale['value'])
+ self.assertEqual(self.scale.get(), self.scale['value'])
- self.failUnlessRaises(tkinter.TclError, self.scale.get, '', 0)
- self.failUnlessRaises(tkinter.TclError, self.scale.get, 0, '')
+ self.assertRaises(tkinter.TclError, self.scale.get, '', 0)
+ self.assertRaises(tkinter.TclError, self.scale.get, 0, '')
def test_set(self):
@@ -500,30 +500,30 @@ class ScaleTest(unittest.TestCase):
max = self.scale['to']
new_max = max + 10
self.scale.set(new_max)
- self.failUnlessEqual(self.scale.get(), max)
+ self.assertEqual(self.scale.get(), max)
min = self.scale['from']
self.scale.set(min - 1)
- self.failUnlessEqual(self.scale.get(), min)
+ self.assertEqual(self.scale.get(), min)
# changing directly the variable doesn't impose this limitation tho
var = tkinter.DoubleVar()
self.scale['variable'] = var
var.set(max + 5)
- self.failUnlessEqual(self.scale.get(), var.get())
- self.failUnlessEqual(self.scale.get(), max + 5)
+ self.assertEqual(self.scale.get(), var.get())
+ self.assertEqual(self.scale.get(), max + 5)
del var
# the same happens with the value option
self.scale['value'] = max + 10
- self.failUnlessEqual(self.scale.get(), max + 10)
- self.failUnlessEqual(self.scale.get(), self.scale['value'])
+ self.assertEqual(self.scale.get(), max + 10)
+ self.assertEqual(self.scale.get(), self.scale['value'])
# nevertheless, note that the max/min values we can get specifying
# x, y coords are the ones according to the current range
- self.failUnlessEqual(self.scale.get(0, 0), min)
- self.failUnlessEqual(self.scale.get(self.scale.winfo_width(), 0), max)
+ self.assertEqual(self.scale.get(0, 0), min)
+ self.assertEqual(self.scale.get(self.scale.winfo_width(), 0), max)
- self.failUnlessRaises(tkinter.TclError, self.scale.set, None)
+ self.assertRaises(tkinter.TclError, self.scale.set, None)
class NotebookTest(unittest.TestCase):
@@ -546,18 +546,18 @@ class NotebookTest(unittest.TestCase):
def test_tab_identifiers(self):
self.nb.forget(0)
self.nb.hide(self.child2)
- self.failUnlessRaises(tkinter.TclError, self.nb.tab, self.child1)
- self.failUnlessEqual(self.nb.index('end'), 1)
+ self.assertRaises(tkinter.TclError, self.nb.tab, self.child1)
+ self.assertEqual(self.nb.index('end'), 1)
self.nb.add(self.child2)
- self.failUnlessEqual(self.nb.index('end'), 1)
+ self.assertEqual(self.nb.index('end'), 1)
self.nb.select(self.child2)
- self.failUnless(self.nb.tab('current'))
+ self.assertTrue(self.nb.tab('current'))
self.nb.add(self.child1, text='a')
self.nb.pack()
self.nb.wait_visibility()
- self.failUnlessEqual(self.nb.tab('@5,5'), self.nb.tab('current'))
+ self.assertEqual(self.nb.tab('@5,5'), self.nb.tab('current'))
for i in range(5, 100, 5):
if self.nb.tab('@%d, 5' % i, text=None) == 'a':
@@ -567,17 +567,17 @@ class NotebookTest(unittest.TestCase):
def test_add_and_hidden(self):
- self.failUnlessRaises(tkinter.TclError, self.nb.hide, -1)
- self.failUnlessRaises(tkinter.TclError, self.nb.hide, 'hi')
- self.failUnlessRaises(tkinter.TclError, self.nb.hide, None)
- self.failUnlessRaises(tkinter.TclError, self.nb.add, None)
- self.failUnlessRaises(tkinter.TclError, self.nb.add, ttk.Label(),
+ self.assertRaises(tkinter.TclError, self.nb.hide, -1)
+ self.assertRaises(tkinter.TclError, self.nb.hide, 'hi')
+ self.assertRaises(tkinter.TclError, self.nb.hide, None)
+ self.assertRaises(tkinter.TclError, self.nb.add, None)
+ self.assertRaises(tkinter.TclError, self.nb.add, ttk.Label(),
unknown='option')
tabs = self.nb.tabs()
self.nb.hide(self.child1)
self.nb.add(self.child1)
- self.failUnlessEqual(self.nb.tabs(), tabs)
+ self.assertEqual(self.nb.tabs(), tabs)
child = ttk.Label()
self.nb.add(child, text='c')
@@ -588,70 +588,70 @@ class NotebookTest(unittest.TestCase):
child2_index = self.nb.index(self.child2)
self.nb.hide(self.child2)
self.nb.add(self.child2)
- self.failUnlessEqual(self.nb.tabs(), tabs)
- self.failUnlessEqual(self.nb.index(self.child2), child2_index)
- self.failUnless(str(self.child2) == self.nb.tabs()[child2_index])
+ self.assertEqual(self.nb.tabs(), tabs)
+ self.assertEqual(self.nb.index(self.child2), child2_index)
+ self.assertTrue(str(self.child2) == self.nb.tabs()[child2_index])
# but the tab next to it (not hidden) is the one selected now
- self.failUnlessEqual(self.nb.index('current'), curr + 1)
+ self.assertEqual(self.nb.index('current'), curr + 1)
def test_forget(self):
- self.failUnlessRaises(tkinter.TclError, self.nb.forget, -1)
- self.failUnlessRaises(tkinter.TclError, self.nb.forget, 'hi')
- self.failUnlessRaises(tkinter.TclError, self.nb.forget, None)
+ self.assertRaises(tkinter.TclError, self.nb.forget, -1)
+ self.assertRaises(tkinter.TclError, self.nb.forget, 'hi')
+ self.assertRaises(tkinter.TclError, self.nb.forget, None)
tabs = self.nb.tabs()
child1_index = self.nb.index(self.child1)
self.nb.forget(self.child1)
- self.failIf(str(self.child1) in self.nb.tabs())
- self.failUnlessEqual(len(tabs) - 1, len(self.nb.tabs()))
+ self.assertFalse(str(self.child1) in self.nb.tabs())
+ self.assertEqual(len(tabs) - 1, len(self.nb.tabs()))
self.nb.add(self.child1)
- self.failUnlessEqual(self.nb.index(self.child1), 1)
- self.failIf(child1_index == self.nb.index(self.child1))
+ self.assertEqual(self.nb.index(self.child1), 1)
+ self.assertFalse(child1_index == self.nb.index(self.child1))
def test_index(self):
- self.failUnlessRaises(tkinter.TclError, self.nb.index, -1)
- self.failUnlessRaises(tkinter.TclError, self.nb.index, None)
+ self.assertRaises(tkinter.TclError, self.nb.index, -1)
+ self.assertRaises(tkinter.TclError, self.nb.index, None)
- self.failUnless(isinstance(self.nb.index('end'), int))
- self.failUnlessEqual(self.nb.index(self.child1), 0)
- self.failUnlessEqual(self.nb.index(self.child2), 1)
- self.failUnlessEqual(self.nb.index('end'), 2)
+ self.assertTrue(isinstance(self.nb.index('end'), int))
+ self.assertEqual(self.nb.index(self.child1), 0)
+ self.assertEqual(self.nb.index(self.child2), 1)
+ self.assertEqual(self.nb.index('end'), 2)
def test_insert(self):
# moving tabs
tabs = self.nb.tabs()
self.nb.insert(1, tabs[0])
- self.failUnlessEqual(self.nb.tabs(), (tabs[1], tabs[0]))
+ self.assertEqual(self.nb.tabs(), (tabs[1], tabs[0]))
self.nb.insert(self.child1, self.child2)
- self.failUnlessEqual(self.nb.tabs(), tabs)
+ self.assertEqual(self.nb.tabs(), tabs)
self.nb.insert('end', self.child1)
- self.failUnlessEqual(self.nb.tabs(), (tabs[1], tabs[0]))
+ self.assertEqual(self.nb.tabs(), (tabs[1], tabs[0]))
self.nb.insert('end', 0)
- self.failUnlessEqual(self.nb.tabs(), tabs)
+ self.assertEqual(self.nb.tabs(), tabs)
# bad moves
- self.failUnlessRaises(tkinter.TclError, self.nb.insert, 2, tabs[0])
- self.failUnlessRaises(tkinter.TclError, self.nb.insert, -1, tabs[0])
+ self.assertRaises(tkinter.TclError, self.nb.insert, 2, tabs[0])
+ self.assertRaises(tkinter.TclError, self.nb.insert, -1, tabs[0])
# new tab
child3 = ttk.Label()
self.nb.insert(1, child3)
- self.failUnlessEqual(self.nb.tabs(), (tabs[0], str(child3), tabs[1]))
+ self.assertEqual(self.nb.tabs(), (tabs[0], str(child3), tabs[1]))
self.nb.forget(child3)
- self.failUnlessEqual(self.nb.tabs(), tabs)
+ self.assertEqual(self.nb.tabs(), tabs)
self.nb.insert(self.child1, child3)
- self.failUnlessEqual(self.nb.tabs(), (str(child3), ) + tabs)
+ self.assertEqual(self.nb.tabs(), (str(child3), ) + tabs)
self.nb.forget(child3)
- self.failUnlessRaises(tkinter.TclError, self.nb.insert, 2, child3)
- self.failUnlessRaises(tkinter.TclError, self.nb.insert, -1, child3)
+ self.assertRaises(tkinter.TclError, self.nb.insert, 2, child3)
+ self.assertRaises(tkinter.TclError, self.nb.insert, -1, child3)
# bad inserts
- self.failUnlessRaises(tkinter.TclError, self.nb.insert, 'end', None)
- self.failUnlessRaises(tkinter.TclError, self.nb.insert, None, 0)
- self.failUnlessRaises(tkinter.TclError, self.nb.insert, None, None)
+ self.assertRaises(tkinter.TclError, self.nb.insert, 'end', None)
+ self.assertRaises(tkinter.TclError, self.nb.insert, None, 0)
+ self.assertRaises(tkinter.TclError, self.nb.insert, None, None)
def test_select(self):
@@ -665,36 +665,36 @@ class NotebookTest(unittest.TestCase):
self.nb.bind('<<NotebookTabChanged>>',
lambda evt: tab_changed.append(True))
- self.failUnlessEqual(self.nb.select(), str(self.child1))
+ self.assertEqual(self.nb.select(), str(self.child1))
self.nb.select(self.child2)
- self.failUnless(success)
- self.failUnlessEqual(self.nb.select(), str(self.child2))
+ self.assertTrue(success)
+ self.assertEqual(self.nb.select(), str(self.child2))
self.nb.update()
- self.failUnless(tab_changed)
+ self.assertTrue(tab_changed)
def test_tab(self):
- self.failUnlessRaises(tkinter.TclError, self.nb.tab, -1)
- self.failUnlessRaises(tkinter.TclError, self.nb.tab, 'notab')
- self.failUnlessRaises(tkinter.TclError, self.nb.tab, None)
+ self.assertRaises(tkinter.TclError, self.nb.tab, -1)
+ self.assertRaises(tkinter.TclError, self.nb.tab, 'notab')
+ self.assertRaises(tkinter.TclError, self.nb.tab, None)
- self.failUnless(isinstance(self.nb.tab(self.child1), dict))
- self.failUnlessEqual(self.nb.tab(self.child1, text=None), 'a')
+ self.assertTrue(isinstance(self.nb.tab(self.child1), dict))
+ self.assertEqual(self.nb.tab(self.child1, text=None), 'a')
# newer form for querying a single option
- self.failUnlessEqual(self.nb.tab(self.child1, 'text'), 'a')
+ self.assertEqual(self.nb.tab(self.child1, 'text'), 'a')
self.nb.tab(self.child1, text='abc')
- self.failUnlessEqual(self.nb.tab(self.child1, text=None), 'abc')
- self.failUnlessEqual(self.nb.tab(self.child1, 'text'), 'abc')
+ self.assertEqual(self.nb.tab(self.child1, text=None), 'abc')
+ self.assertEqual(self.nb.tab(self.child1, 'text'), 'abc')
def test_tabs(self):
- self.failUnlessEqual(len(self.nb.tabs()), 2)
+ self.assertEqual(len(self.nb.tabs()), 2)
self.nb.forget(self.child1)
self.nb.forget(self.child2)
- self.failUnlessEqual(self.nb.tabs(), ())
+ self.assertEqual(self.nb.tabs(), ())
def test_traversal(self):
@@ -705,16 +705,16 @@ class NotebookTest(unittest.TestCase):
support.simulate_mouse_click(self.nb, 5, 5)
self.nb.event_generate('<Control-Tab>')
- self.failUnlessEqual(self.nb.select(), str(self.child2))
+ self.assertEqual(self.nb.select(), str(self.child2))
self.nb.event_generate('<Shift-Control-Tab>')
- self.failUnlessEqual(self.nb.select(), str(self.child1))
+ self.assertEqual(self.nb.select(), str(self.child1))
self.nb.event_generate('<Shift-Control-Tab>')
- self.failUnlessEqual(self.nb.select(), str(self.child2))
+ self.assertEqual(self.nb.select(), str(self.child2))
self.nb.tab(self.child1, text='a', underline=0)
self.nb.enable_traversal()
self.nb.event_generate('<Alt-a>')
- self.failUnlessEqual(self.nb.select(), str(self.child1))
+ self.assertEqual(self.nb.select(), str(self.child1))
class TreeviewTest(unittest.TestCase):
@@ -730,17 +730,17 @@ class TreeviewTest(unittest.TestCase):
def test_bbox(self):
self.tv.pack()
- self.failUnlessEqual(self.tv.bbox(''), '')
+ self.assertEqual(self.tv.bbox(''), '')
self.tv.wait_visibility()
self.tv.update()
item_id = self.tv.insert('', 'end')
children = self.tv.get_children()
- self.failUnless(children)
+ self.assertTrue(children)
bbox = self.tv.bbox(children[0])
- self.failUnlessEqual(len(bbox), 4)
- self.failUnless(isinstance(bbox, tuple))
+ self.assertEqual(len(bbox), 4)
+ self.assertTrue(isinstance(bbox, tuple))
for item in bbox:
if not isinstance(item, int):
self.fail("Invalid bounding box: %s" % bbox)
@@ -751,86 +751,86 @@ class TreeviewTest(unittest.TestCase):
self.tv.column('test', width=50)
bbox_column0 = self.tv.bbox(children[0], 0)
root_width = self.tv.column('#0', width=None)
- self.failUnlessEqual(bbox_column0[0], bbox[0] + root_width)
+ self.assertEqual(bbox_column0[0], bbox[0] + root_width)
# verify that bbox of a closed item is the empty string
child1 = self.tv.insert(item_id, 'end')
- self.failUnlessEqual(self.tv.bbox(child1), '')
+ self.assertEqual(self.tv.bbox(child1), '')
def test_children(self):
# no children yet, should get an empty tuple
- self.failUnlessEqual(self.tv.get_children(), ())
+ self.assertEqual(self.tv.get_children(), ())
item_id = self.tv.insert('', 'end')
- self.failUnless(isinstance(self.tv.get_children(), tuple))
- self.failUnlessEqual(self.tv.get_children()[0], item_id)
+ self.assertTrue(isinstance(self.tv.get_children(), tuple))
+ self.assertEqual(self.tv.get_children()[0], item_id)
# add item_id and child3 as children of child2
child2 = self.tv.insert('', 'end')
child3 = self.tv.insert('', 'end')
self.tv.set_children(child2, item_id, child3)
- self.failUnlessEqual(self.tv.get_children(child2), (item_id, child3))
+ self.assertEqual(self.tv.get_children(child2), (item_id, child3))
# child3 has child2 as parent, thus trying to set child2 as a children
# of child3 should result in an error
- self.failUnlessRaises(tkinter.TclError,
+ self.assertRaises(tkinter.TclError,
self.tv.set_children, child3, child2)
# remove child2 children
self.tv.set_children(child2)
- self.failUnlessEqual(self.tv.get_children(child2), ())
+ self.assertEqual(self.tv.get_children(child2), ())
# remove root's children
self.tv.set_children('')
- self.failUnlessEqual(self.tv.get_children(), ())
+ self.assertEqual(self.tv.get_children(), ())
def test_column(self):
# return a dict with all options/values
- self.failUnless(isinstance(self.tv.column('#0'), dict))
+ self.assertTrue(isinstance(self.tv.column('#0'), dict))
# return a single value of the given option
- self.failUnless(isinstance(self.tv.column('#0', width=None), int))
+ self.assertTrue(isinstance(self.tv.column('#0', width=None), int))
# set a new value for an option
self.tv.column('#0', width=10)
# testing new way to get option value
- self.failUnlessEqual(self.tv.column('#0', 'width'), 10)
- self.failUnlessEqual(self.tv.column('#0', width=None), 10)
+ self.assertEqual(self.tv.column('#0', 'width'), 10)
+ self.assertEqual(self.tv.column('#0', width=None), 10)
# check read-only option
- self.failUnlessRaises(tkinter.TclError, self.tv.column, '#0', id='X')
+ self.assertRaises(tkinter.TclError, self.tv.column, '#0', id='X')
- self.failUnlessRaises(tkinter.TclError, self.tv.column, 'invalid')
+ self.assertRaises(tkinter.TclError, self.tv.column, 'invalid')
invalid_kws = [
{'unknown_option': 'some value'}, {'stretch': 'wrong'},
{'anchor': 'wrong'}, {'width': 'wrong'}, {'minwidth': 'wrong'}
]
for kw in invalid_kws:
- self.failUnlessRaises(tkinter.TclError, self.tv.column, '#0',
+ self.assertRaises(tkinter.TclError, self.tv.column, '#0',
**kw)
def test_delete(self):
- self.failUnlessRaises(tkinter.TclError, self.tv.delete, '#0')
+ self.assertRaises(tkinter.TclError, self.tv.delete, '#0')
item_id = self.tv.insert('', 'end')
item2 = self.tv.insert(item_id, 'end')
- self.failUnlessEqual(self.tv.get_children(), (item_id, ))
- self.failUnlessEqual(self.tv.get_children(item_id), (item2, ))
+ self.assertEqual(self.tv.get_children(), (item_id, ))
+ self.assertEqual(self.tv.get_children(item_id), (item2, ))
self.tv.delete(item_id)
- self.failIf(self.tv.get_children())
+ self.assertFalse(self.tv.get_children())
# reattach should fail
- self.failUnlessRaises(tkinter.TclError,
+ self.assertRaises(tkinter.TclError,
self.tv.reattach, item_id, '', 'end')
# test multiple item delete
item1 = self.tv.insert('', 'end')
item2 = self.tv.insert('', 'end')
- self.failUnlessEqual(self.tv.get_children(), (item1, item2))
+ self.assertEqual(self.tv.get_children(), (item1, item2))
self.tv.delete(item1, item2)
- self.failIf(self.tv.get_children())
+ self.assertFalse(self.tv.get_children())
def test_detach_reattach(self):
@@ -840,81 +840,81 @@ class TreeviewTest(unittest.TestCase):
# calling detach without items is valid, although it does nothing
prev = self.tv.get_children()
self.tv.detach() # this should do nothing
- self.failUnlessEqual(prev, self.tv.get_children())
+ self.assertEqual(prev, self.tv.get_children())
- self.failUnlessEqual(self.tv.get_children(), (item_id, ))
- self.failUnlessEqual(self.tv.get_children(item_id), (item2, ))
+ self.assertEqual(self.tv.get_children(), (item_id, ))
+ self.assertEqual(self.tv.get_children(item_id), (item2, ))
# detach item with children
self.tv.detach(item_id)
- self.failIf(self.tv.get_children())
+ self.assertFalse(self.tv.get_children())
# reattach item with children
self.tv.reattach(item_id, '', 'end')
- self.failUnlessEqual(self.tv.get_children(), (item_id, ))
- self.failUnlessEqual(self.tv.get_children(item_id), (item2, ))
+ self.assertEqual(self.tv.get_children(), (item_id, ))
+ self.assertEqual(self.tv.get_children(item_id), (item2, ))
# move a children to the root
self.tv.move(item2, '', 'end')
- self.failUnlessEqual(self.tv.get_children(), (item_id, item2))
- self.failUnlessEqual(self.tv.get_children(item_id), ())
+ self.assertEqual(self.tv.get_children(), (item_id, item2))
+ self.assertEqual(self.tv.get_children(item_id), ())
# bad values
- self.failUnlessRaises(tkinter.TclError,
+ self.assertRaises(tkinter.TclError,
self.tv.reattach, 'nonexistent', '', 'end')
- self.failUnlessRaises(tkinter.TclError,
+ self.assertRaises(tkinter.TclError,
self.tv.detach, 'nonexistent')
- self.failUnlessRaises(tkinter.TclError,
+ self.assertRaises(tkinter.TclError,
self.tv.reattach, item2, 'otherparent', 'end')
- self.failUnlessRaises(tkinter.TclError,
+ self.assertRaises(tkinter.TclError,
self.tv.reattach, item2, '', 'invalid')
# multiple detach
self.tv.detach(item_id, item2)
- self.failUnlessEqual(self.tv.get_children(), ())
- self.failUnlessEqual(self.tv.get_children(item_id), ())
+ self.assertEqual(self.tv.get_children(), ())
+ self.assertEqual(self.tv.get_children(item_id), ())
def test_exists(self):
- self.failUnlessEqual(self.tv.exists('something'), False)
- self.failUnlessEqual(self.tv.exists(''), True)
- self.failUnlessEqual(self.tv.exists({}), False)
+ self.assertEqual(self.tv.exists('something'), False)
+ self.assertEqual(self.tv.exists(''), True)
+ self.assertEqual(self.tv.exists({}), False)
# the following will make a tk.call equivalent to
# tk.call(treeview, "exists") which should result in an error
# in the tcl interpreter since tk requires an item.
- self.failUnlessRaises(tkinter.TclError, self.tv.exists, None)
+ self.assertRaises(tkinter.TclError, self.tv.exists, None)
def test_focus(self):
# nothing is focused right now
- self.failUnlessEqual(self.tv.focus(), '')
+ self.assertEqual(self.tv.focus(), '')
item1 = self.tv.insert('', 'end')
self.tv.focus(item1)
- self.failUnlessEqual(self.tv.focus(), item1)
+ self.assertEqual(self.tv.focus(), item1)
self.tv.delete(item1)
- self.failUnlessEqual(self.tv.focus(), '')
+ self.assertEqual(self.tv.focus(), '')
# try focusing inexistent item
- self.failUnlessRaises(tkinter.TclError, self.tv.focus, 'hi')
+ self.assertRaises(tkinter.TclError, self.tv.focus, 'hi')
def test_heading(self):
# check a dict is returned
- self.failUnless(isinstance(self.tv.heading('#0'), dict))
+ self.assertTrue(isinstance(self.tv.heading('#0'), dict))
# check a value is returned
self.tv.heading('#0', text='hi')
- self.failUnlessEqual(self.tv.heading('#0', 'text'), 'hi')
- self.failUnlessEqual(self.tv.heading('#0', text=None), 'hi')
+ self.assertEqual(self.tv.heading('#0', 'text'), 'hi')
+ self.assertEqual(self.tv.heading('#0', text=None), 'hi')
# invalid option
- self.failUnlessRaises(tkinter.TclError, self.tv.heading, '#0',
+ self.assertRaises(tkinter.TclError, self.tv.heading, '#0',
background=None)
# invalid value
- self.failUnlessRaises(tkinter.TclError, self.tv.heading, '#0',
+ self.assertRaises(tkinter.TclError, self.tv.heading, '#0',
anchor=1)
@@ -940,7 +940,7 @@ class TreeviewTest(unittest.TestCase):
success = []
commands = self.tv.master._tclCommands
self.tv.heading('#0', command=str(self.tv.heading('#0', command=None)))
- self.failUnlessEqual(commands, self.tv.master._tclCommands)
+ self.assertEqual(commands, self.tv.master._tclCommands)
simulate_heading_click(5, 5)
if not success:
self.fail("The command associated to the treeview heading wasn't "
@@ -954,92 +954,92 @@ class TreeviewTest(unittest.TestCase):
def test_index(self):
# item 'what' doesn't exist
- self.failUnlessRaises(tkinter.TclError, self.tv.index, 'what')
+ self.assertRaises(tkinter.TclError, self.tv.index, 'what')
- self.failUnlessEqual(self.tv.index(''), 0)
+ self.assertEqual(self.tv.index(''), 0)
item1 = self.tv.insert('', 'end')
item2 = self.tv.insert('', 'end')
c1 = self.tv.insert(item1, 'end')
c2 = self.tv.insert(item1, 'end')
- self.failUnlessEqual(self.tv.index(item1), 0)
- self.failUnlessEqual(self.tv.index(c1), 0)
- self.failUnlessEqual(self.tv.index(c2), 1)
- self.failUnlessEqual(self.tv.index(item2), 1)
+ self.assertEqual(self.tv.index(item1), 0)
+ self.assertEqual(self.tv.index(c1), 0)
+ self.assertEqual(self.tv.index(c2), 1)
+ self.assertEqual(self.tv.index(item2), 1)
self.tv.move(item2, '', 0)
- self.failUnlessEqual(self.tv.index(item2), 0)
- self.failUnlessEqual(self.tv.index(item1), 1)
+ self.assertEqual(self.tv.index(item2), 0)
+ self.assertEqual(self.tv.index(item1), 1)
# check that index still works even after its parent and siblings
# have been detached
self.tv.detach(item1)
- self.failUnlessEqual(self.tv.index(c2), 1)
+ self.assertEqual(self.tv.index(c2), 1)
self.tv.detach(c1)
- self.failUnlessEqual(self.tv.index(c2), 0)
+ self.assertEqual(self.tv.index(c2), 0)
# but it fails after item has been deleted
self.tv.delete(item1)
- self.failUnlessRaises(tkinter.TclError, self.tv.index, c2)
+ self.assertRaises(tkinter.TclError, self.tv.index, c2)
def test_insert_item(self):
# parent 'none' doesn't exist
- self.failUnlessRaises(tkinter.TclError, self.tv.insert, 'none', 'end')
+ self.assertRaises(tkinter.TclError, self.tv.insert, 'none', 'end')
# open values
- self.failUnlessRaises(tkinter.TclError, self.tv.insert, '', 'end',
+ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end',
open='')
- self.failUnlessRaises(tkinter.TclError, self.tv.insert, '', 'end',
+ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end',
open='please')
- self.failIf(self.tv.delete(self.tv.insert('', 'end', open=True)))
- self.failIf(self.tv.delete(self.tv.insert('', 'end', open=False)))
+ self.assertFalse(self.tv.delete(self.tv.insert('', 'end', open=True)))
+ self.assertFalse(self.tv.delete(self.tv.insert('', 'end', open=False)))
# invalid index
- self.failUnlessRaises(tkinter.TclError, self.tv.insert, '', 'middle')
+ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'middle')
# trying to duplicate item id is invalid
itemid = self.tv.insert('', 'end', 'first-item')
- self.failUnlessEqual(itemid, 'first-item')
- self.failUnlessRaises(tkinter.TclError, self.tv.insert, '', 'end',
+ self.assertEqual(itemid, 'first-item')
+ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end',
'first-item')
- self.failUnlessRaises(tkinter.TclError, self.tv.insert, '', 'end',
+ self.assertRaises(tkinter.TclError, self.tv.insert, '', 'end',
MockTclObj('first-item'))
# unicode values
value = '\xe1ba'
item = self.tv.insert('', 'end', values=(value, ))
- self.failUnlessEqual(self.tv.item(item, 'values'), (value, ))
- self.failUnlessEqual(self.tv.item(item, values=None), (value, ))
+ self.assertEqual(self.tv.item(item, 'values'), (value, ))
+ self.assertEqual(self.tv.item(item, values=None), (value, ))
self.tv.item(item, values=list(self.tv.item(item, values=None)))
- self.failUnlessEqual(self.tv.item(item, values=None), (value, ))
+ self.assertEqual(self.tv.item(item, values=None), (value, ))
- self.failUnless(isinstance(self.tv.item(item), dict))
+ self.assertTrue(isinstance(self.tv.item(item), dict))
# erase item values
self.tv.item(item, values='')
- self.failIf(self.tv.item(item, values=None))
+ self.assertFalse(self.tv.item(item, values=None))
# item tags
item = self.tv.insert('', 'end', tags=[1, 2, value])
- self.failUnlessEqual(self.tv.item(item, tags=None), ('1', '2', value))
+ self.assertEqual(self.tv.item(item, tags=None), ('1', '2', value))
self.tv.item(item, tags=[])
- self.failIf(self.tv.item(item, tags=None))
+ self.assertFalse(self.tv.item(item, tags=None))
self.tv.item(item, tags=(1, 2))
- self.failUnlessEqual(self.tv.item(item, tags=None), ('1', '2'))
+ self.assertEqual(self.tv.item(item, tags=None), ('1', '2'))
# values with spaces
item = self.tv.insert('', 'end', values=('a b c',
'%s %s' % (value, value)))
- self.failUnlessEqual(self.tv.item(item, values=None),
+ self.assertEqual(self.tv.item(item, values=None),
('a b c', '%s %s' % (value, value)))
# text
- self.failUnlessEqual(self.tv.item(
+ self.assertEqual(self.tv.item(
self.tv.insert('', 'end', text="Label here"), text=None),
"Label here")
- self.failUnlessEqual(self.tv.item(
+ self.assertEqual(self.tv.item(
self.tv.insert('', 'end', text=value), text=None),
value)
@@ -1047,29 +1047,29 @@ class TreeviewTest(unittest.TestCase):
def test_set(self):
self.tv['columns'] = ['A', 'B']
item = self.tv.insert('', 'end', values=['a', 'b'])
- self.failUnlessEqual(self.tv.set(item), {'A': 'a', 'B': 'b'})
+ self.assertEqual(self.tv.set(item), {'A': 'a', 'B': 'b'})
self.tv.set(item, 'B', 'a')
- self.failUnlessEqual(self.tv.item(item, values=None), ('a', 'a'))
+ self.assertEqual(self.tv.item(item, values=None), ('a', 'a'))
self.tv['columns'] = ['B']
- self.failUnlessEqual(self.tv.set(item), {'B': 'a'})
+ self.assertEqual(self.tv.set(item), {'B': 'a'})
self.tv.set(item, 'B', 'b')
- self.failUnlessEqual(self.tv.set(item, column='B'), 'b')
- self.failUnlessEqual(self.tv.item(item, values=None), ('b', 'a'))
+ self.assertEqual(self.tv.set(item, column='B'), 'b')
+ self.assertEqual(self.tv.item(item, values=None), ('b', 'a'))
self.tv.set(item, 'B', 123)
- self.failUnlessEqual(self.tv.set(item, 'B'), 123)
- self.failUnlessEqual(self.tv.item(item, values=None), (123, 'a'))
- self.failUnlessEqual(self.tv.set(item), {'B': 123})
+ self.assertEqual(self.tv.set(item, 'B'), 123)
+ self.assertEqual(self.tv.item(item, values=None), (123, 'a'))
+ self.assertEqual(self.tv.set(item), {'B': 123})
# inexistent column
- self.failUnlessRaises(tkinter.TclError, self.tv.set, item, 'A')
- self.failUnlessRaises(tkinter.TclError, self.tv.set, item, 'A', 'b')
+ self.assertRaises(tkinter.TclError, self.tv.set, item, 'A')
+ self.assertRaises(tkinter.TclError, self.tv.set, item, 'A', 'b')
# inexistent item
- self.failUnlessRaises(tkinter.TclError, self.tv.set, 'notme')
+ self.assertRaises(tkinter.TclError, self.tv.set, 'notme')
def test_tag_bind(self):
@@ -1095,28 +1095,28 @@ class TreeviewTest(unittest.TestCase):
pos_y.add(i)
found.add(item_id)
- self.failUnlessEqual(len(pos_y), 2) # item1 and item2 y pos
+ self.assertEqual(len(pos_y), 2) # item1 and item2 y pos
for y in pos_y:
support.simulate_mouse_click(self.tv, 0, y)
# by now there should be 4 things in the events list, since each
# item had a bind for two events that were simulated above
- self.failUnlessEqual(len(events), 4)
+ self.assertEqual(len(events), 4)
for evt in zip(events[::2], events[1::2]):
- self.failUnlessEqual(evt, (1, 2))
+ self.assertEqual(evt, (1, 2))
def test_tag_configure(self):
# Just testing parameter passing for now
- self.failUnlessRaises(TypeError, self.tv.tag_configure)
- self.failUnlessRaises(tkinter.TclError, self.tv.tag_configure,
+ self.assertRaises(TypeError, self.tv.tag_configure)
+ self.assertRaises(tkinter.TclError, self.tv.tag_configure,
'test', sky='blue')
self.tv.tag_configure('test', foreground='blue')
- self.failUnlessEqual(self.tv.tag_configure('test', 'foreground'),
+ self.assertEqual(self.tv.tag_configure('test', 'foreground'),
'blue')
- self.failUnlessEqual(self.tv.tag_configure('test', foreground=None),
+ self.assertEqual(self.tv.tag_configure('test', foreground=None),
'blue')
- self.failUnless(isinstance(self.tv.tag_configure('test'), dict))
+ self.assertTrue(isinstance(self.tv.tag_configure('test'), dict))
tests_gui = (