[Python-checkins] cpython (2.7): Issue #19602: Use specific asserts in tkinter tests.
serhiy.storchaka
python-checkins at python.org
Sun Nov 17 11:58:29 CET 2013
http://hg.python.org/cpython/rev/0aed137d0d49
changeset: 87183:0aed137d0d49
branch: 2.7
parent: 87179:d004ccdd6a57
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Nov 17 00:43:03 2013 +0200
summary:
Issue #19602: Use specific asserts in tkinter tests.
files:
Lib/lib-tk/test/test_ttk/test_extensions.py | 12 ++-
Lib/lib-tk/test/test_ttk/test_style.py | 6 +-
Lib/lib-tk/test/test_ttk/test_widgets.py | 36 +++++-----
3 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/Lib/lib-tk/test/test_ttk/test_extensions.py b/Lib/lib-tk/test/test_ttk/test_extensions.py
--- a/Lib/lib-tk/test/test_ttk/test_extensions.py
+++ b/Lib/lib-tk/test/test_ttk/test_extensions.py
@@ -45,7 +45,11 @@
# it tries calling instance attributes not yet defined.
ttk.LabeledScale(variable=myvar)
if hasattr(sys, 'last_type'):
+<<<<<<<
self.assertFalse(sys.last_type == Tkinter.TclError)
+=======
+ self.assertNotEqual(sys.last_type, tkinter.TclError)
+>>>>>>>
def test_initialization(self):
@@ -120,14 +124,14 @@
# at the same time this shouldn't affect test outcome
lscale.update()
curr_xcoord = lscale.scale.coords()[0]
- self.assertTrue(prev_xcoord != curr_xcoord)
+ self.assertNotEqual(prev_xcoord, curr_xcoord)
# the label widget should have been repositioned too
linfo_2 = lscale.label.place_info()
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.assertTrue(prev_xcoord != curr_xcoord)
+ self.assertNotEqual(prev_xcoord, curr_xcoord)
self.assertEqual(prev_xcoord, int(linfo_1['x']))
lscale.destroy()
@@ -146,7 +150,7 @@
# at the same time this shouldn't affect test outcome
x.update()
self.assertEqual(x.label['text'], newval)
- self.assertTrue(x.scale.coords()[0] > curr_xcoord)
+ self.assertGreater(x.scale.coords()[0], curr_xcoord)
self.assertEqual(x.scale.coords()[0],
int(x.label.place_info()['x']))
@@ -238,7 +242,7 @@
if last == curr:
# no more menu entries
break
- self.assertFalse(curr == default)
+ self.assertNotEqual(curr, default)
i += 1
self.assertEqual(i, len(items))
diff --git a/Lib/lib-tk/test/test_ttk/test_style.py b/Lib/lib-tk/test/test_ttk/test_style.py
--- a/Lib/lib-tk/test/test_ttk/test_style.py
+++ b/Lib/lib-tk/test/test_ttk/test_style.py
@@ -18,7 +18,7 @@
style.configure('TButton', background='yellow')
self.assertEqual(style.configure('TButton', 'background'),
'yellow')
- self.assertTrue(isinstance(style.configure('TButton'), dict))
+ self.assertIsInstance(style.configure('TButton'), dict)
def test_map(self):
@@ -26,7 +26,7 @@
style.map('TButton', background=[('active', 'background', 'blue')])
self.assertEqual(style.map('TButton', 'background'),
[('active', 'background', 'blue')])
- self.assertTrue(isinstance(style.map('TButton'), dict))
+ self.assertIsInstance(style.map('TButton'), dict)
def test_lookup(self):
@@ -57,7 +57,7 @@
self.assertEqual(style.layout('Treeview'), tv_style)
# should return a list
- self.assertTrue(isinstance(style.layout('TButton'), list))
+ self.assertIsInstance(style.layout('TButton'), list)
# correct layout, but "option" doesn't exist as option
self.assertRaises(Tkinter.TclError, style.layout, 'Treeview',
diff --git a/Lib/lib-tk/test/test_ttk/test_widgets.py b/Lib/lib-tk/test/test_ttk/test_widgets.py
--- a/Lib/lib-tk/test/test_ttk/test_widgets.py
+++ b/Lib/lib-tk/test/test_ttk/test_widgets.py
@@ -274,7 +274,7 @@
cbtn['command'] = ''
res = cbtn.invoke()
self.assertFalse(str(res))
- self.assertFalse(len(success) > 1)
+ self.assertLessEqual(len(success), 1)
self.assertEqual(cbtn['offvalue'],
cbtn.tk.globalgetvar(cbtn['variable']))
@@ -455,7 +455,7 @@
def test_bbox(self):
self.assertEqual(len(self.entry.bbox(0)), 4)
for item in self.entry.bbox(0):
- self.assertTrue(isinstance(item, int))
+ self.assertIsInstance(item, int)
self.assertRaises(Tkinter.TclError, self.entry.bbox, 'noindex')
self.assertRaises(Tkinter.TclError, self.entry.bbox, None)
@@ -653,7 +653,7 @@
child = ttk.Label()
self.paned.add(child)
- self.assertTrue(isinstance(self.paned.pane(0), dict))
+ self.assertIsInstance(self.paned.pane(0), dict)
self.assertEqual(self.paned.pane(0, weight=None), 0)
# newer form for querying a single option
self.assertEqual(self.paned.pane(0, 'weight'), 0)
@@ -680,8 +680,8 @@
curr_pos = self.paned.sashpos(0)
self.paned.sashpos(0, 1000)
- self.assertTrue(curr_pos != self.paned.sashpos(0))
- self.assertTrue(isinstance(self.paned.sashpos(0), int))
+ self.assertNotEqual(curr_pos, self.paned.sashpos(0))
+ self.assertIsInstance(self.paned.sashpos(0), int)
@add_standard_options(StandardTtkOptionsTests)
@@ -721,7 +721,7 @@
cbtn2['command'] = ''
res = cbtn2.invoke()
self.assertEqual(str(res), '')
- self.assertFalse(len(success) > 1)
+ self.assertLessEqual(len(success), 1)
self.assertEqual(cbtn2['value'], myvar.get())
self.assertEqual(myvar.get(),
cbtn.tk.globalgetvar(cbtn['variable']))
@@ -983,7 +983,7 @@
self.nb.add(self.child2)
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])
+ self.assertEqual(str(self.child2), self.nb.tabs()[child2_index])
# but the tab next to it (not hidden) is the one selected now
self.assertEqual(self.nb.index('current'), curr + 1)
@@ -996,19 +996,19 @@
tabs = self.nb.tabs()
child1_index = self.nb.index(self.child1)
self.nb.forget(self.child1)
- self.assertFalse(str(self.child1) in self.nb.tabs())
+ self.assertNotIn(str(self.child1), self.nb.tabs())
self.assertEqual(len(tabs) - 1, len(self.nb.tabs()))
self.nb.add(self.child1)
self.assertEqual(self.nb.index(self.child1), 1)
- self.assertFalse(child1_index == self.nb.index(self.child1))
+ self.assertNotEqual(child1_index, self.nb.index(self.child1))
def test_index(self):
self.assertRaises(Tkinter.TclError, self.nb.index, -1)
self.assertRaises(Tkinter.TclError, self.nb.index, None)
- self.assertTrue(isinstance(self.nb.index('end'), int))
+ self.assertIsInstance(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)
@@ -1072,7 +1072,7 @@
self.assertRaises(Tkinter.TclError, self.nb.tab, 'notab')
self.assertRaises(Tkinter.TclError, self.nb.tab, None)
- self.assertTrue(isinstance(self.nb.tab(self.child1), dict))
+ self.assertIsInstance(self.nb.tab(self.child1), dict)
self.assertEqual(self.nb.tab(self.child1, text=None), 'a')
# newer form for querying a single option
self.assertEqual(self.nb.tab(self.child1, 'text'), 'a')
@@ -1193,7 +1193,7 @@
bbox = self.tv.bbox(children[0])
self.assertEqual(len(bbox), 4)
- self.assertTrue(isinstance(bbox, tuple))
+ self.assertIsInstance(bbox, tuple)
for item in bbox:
if not isinstance(item, int):
self.fail("Invalid bounding box: %s" % bbox)
@@ -1216,7 +1216,7 @@
self.assertEqual(self.tv.get_children(), ())
item_id = self.tv.insert('', 'end')
- self.assertTrue(isinstance(self.tv.get_children(), tuple))
+ self.assertIsInstance(self.tv.get_children(), tuple)
self.assertEqual(self.tv.get_children()[0], item_id)
# add item_id and child3 as children of child2
@@ -1241,9 +1241,9 @@
def test_column(self):
# return a dict with all options/values
- self.assertTrue(isinstance(self.tv.column('#0'), dict))
+ self.assertIsInstance(self.tv.column('#0'), dict)
# return a single value of the given option
- self.assertTrue(isinstance(self.tv.column('#0', width=None), int))
+ self.assertIsInstance(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
@@ -1356,7 +1356,7 @@
def test_heading(self):
# check a dict is returned
- self.assertTrue(isinstance(self.tv.heading('#0'), dict))
+ self.assertIsInstance(self.tv.heading('#0'), dict)
# check a value is returned
self.tv.heading('#0', text='hi')
@@ -1467,7 +1467,7 @@
self.tv.item(item, values=list(self.tv.item(item, values=None)))
self.assertEqual(self.tv.item(item, values=None), (value, ))
- self.assertTrue(isinstance(self.tv.item(item), dict))
+ self.assertIsInstance(self.tv.item(item), dict)
# erase item values
self.tv.item(item, values='')
@@ -1568,7 +1568,7 @@
'blue')
self.assertEqual(str(self.tv.tag_configure('test', foreground=None)),
'blue')
- self.assertTrue(isinstance(self.tv.tag_configure('test'), dict))
+ self.assertIsInstance(self.tv.tag_configure('test'), dict)
@add_standard_options(StandardTtkOptionsTests)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list