Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e3eb3ec

Browse files
serhiy-storchakaserhiy-storchaka
committed
Issue #19602: Use specific asserts in tkinter tests.
2 parents d4b75bf + e3b5a76 commit e3eb3ec

3 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎Lib/tkinter/test/test_ttk/test_extensions.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_widget_destroy(self):
4545
# it tries calling instance attributes not yet defined.
4646
ttk.LabeledScale(variable=myvar)
4747
if hasattr(sys, 'last_type'):
48-
self.assertFalse(sys.last_type == tkinter.TclError)
48+
self.assertNotEqual(sys.last_type, tkinter.TclError)
4949

5050

5151
def test_initialization(self):
@@ -120,14 +120,14 @@ def test_horizontal_range(self):
120120
# at the same time this shouldn't affect test outcome
121121
lscale.update()
122122
curr_xcoord = lscale.scale.coords()[0]
123-
self.assertTrue(prev_xcoord != curr_xcoord)
123+
self.assertNotEqual(prev_xcoord, curr_xcoord)
124124
# the label widget should have been repositioned too
125125
linfo_2 = lscale.label.place_info()
126126
self.assertEqual(lscale.label['text'], 0)
127127
self.assertEqual(curr_xcoord, int(linfo_2['x']))
128128
# change the range back
129129
lscale.scale.configure(from_=0, to=10)
130-
self.assertTrue(prev_xcoord != curr_xcoord)
130+
self.assertNotEqual(prev_xcoord, curr_xcoord)
131131
self.assertEqual(prev_xcoord, int(linfo_1['x']))
132132

133133
lscale.destroy()
@@ -146,7 +146,7 @@ def test_variable_change(self):
146146
# at the same time this shouldn't affect test outcome
147147
x.update()
148148
self.assertEqual(x.label['text'], newval)
149-
self.assertTrue(x.scale.coords()[0] > curr_xcoord)
149+
self.assertGreater(x.scale.coords()[0], curr_xcoord)
150150
self.assertEqual(x.scale.coords()[0],
151151
int(x.label.place_info()['x']))
152152

@@ -238,7 +238,7 @@ def test_menu(self):
238238
if last == curr:
239239
# no more menu entries
240240
break
241-
self.assertFalse(curr == default)
241+
self.assertNotEqual(curr, default)
242242
i += 1
243243
self.assertEqual(i, len(items))
244244

‎Lib/tkinter/test/test_ttk/test_style.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ def test_configure(self):
1818
style.configure('TButton', background='yellow')
1919
self.assertEqual(style.configure('TButton', 'background'),
2020
'yellow')
21-
self.assertTrue(isinstance(style.configure('TButton'), dict))
21+
self.assertIsInstance(style.configure('TButton'), dict)
2222

2323

2424
def test_map(self):
2525
style = self.style
2626
style.map('TButton', background=[('active', 'background', 'blue')])
2727
self.assertEqual(style.map('TButton', 'background'),
2828
[('active', 'background', 'blue')])
29-
self.assertTrue(isinstance(style.map('TButton'), dict))
29+
self.assertIsInstance(style.map('TButton'), dict)
3030

3131

3232
def test_lookup(self):
@@ -57,7 +57,7 @@ def test_layout(self):
5757
self.assertEqual(style.layout('Treeview'), tv_style)
5858

5959
# should return a list
60-
self.assertTrue(isinstance(style.layout('TButton'), list))
60+
self.assertIsInstance(style.layout('TButton'), list)
6161

6262
# correct layout, but "option" doesn't exist as option
6363
self.assertRaises(tkinter.TclError, style.layout, 'Treeview',

‎Lib/tkinter/test/test_ttk/test_widgets.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def cb_test():
273273
cbtn['command'] = ''
274274
res = cbtn.invoke()
275275
self.assertFalse(str(res))
276-
self.assertFalse(len(success) > 1)
276+
self.assertLessEqual(len(success), 1)
277277
self.assertEqual(cbtn['offvalue'],
278278
cbtn.tk.globalgetvar(cbtn['variable']))
279279

@@ -454,7 +454,7 @@ def test_validatecommand(self):
454454
def test_bbox(self):
455455
self.assertEqual(len(self.entry.bbox(0)), 4)
456456
for item in self.entry.bbox(0):
457-
self.assertTrue(isinstance(item, int))
457+
self.assertIsInstance(item, int)
458458

459459
self.assertRaises(tkinter.TclError, self.entry.bbox, 'noindex')
460460
self.assertRaises(tkinter.TclError, self.entry.bbox, None)
@@ -652,7 +652,7 @@ def test_pane(self):
652652

653653
child = ttk.Label()
654654
self.paned.add(child)
655-
self.assertTrue(isinstance(self.paned.pane(0), dict))
655+
self.assertIsInstance(self.paned.pane(0), dict)
656656
self.assertEqual(self.paned.pane(0, weight=None), 0)
657657
# newer form for querying a single option
658658
self.assertEqual(self.paned.pane(0, 'weight'), 0)
@@ -679,8 +679,8 @@ def test_sashpos(self):
679679

680680
curr_pos = self.paned.sashpos(0)
681681
self.paned.sashpos(0, 1000)
682-
self.assertTrue(curr_pos != self.paned.sashpos(0))
683-
self.assertTrue(isinstance(self.paned.sashpos(0), int))
682+
self.assertNotEqual(curr_pos, self.paned.sashpos(0))
683+
self.assertIsInstance(self.paned.sashpos(0), int)
684684

685685

686686
@add_standard_options(StandardTtkOptionsTests)
@@ -720,7 +720,7 @@ def cb_test():
720720
cbtn2['command'] = ''
721721
res = cbtn2.invoke()
722722
self.assertEqual(str(res), '')
723-
self.assertFalse(len(success) > 1)
723+
self.assertLessEqual(len(success), 1)
724724
self.assertEqual(cbtn2['value'], myvar.get())
725725
self.assertEqual(myvar.get(),
726726
cbtn.tk.globalgetvar(cbtn['variable']))
@@ -982,7 +982,7 @@ def test_add_and_hidden(self):
982982
self.nb.add(self.child2)
983983
self.assertEqual(self.nb.tabs(), tabs)
984984
self.assertEqual(self.nb.index(self.child2), child2_index)
985-
self.assertTrue(str(self.child2) == self.nb.tabs()[child2_index])
985+
self.assertEqual(str(self.child2), self.nb.tabs()[child2_index])
986986
# but the tab next to it (not hidden) is the one selected now
987987
self.assertEqual(self.nb.index('current'), curr + 1)
988988

@@ -995,19 +995,19 @@ def test_forget(self):
995995
tabs = self.nb.tabs()
996996
child1_index = self.nb.index(self.child1)
997997
self.nb.forget(self.child1)
998-
self.assertFalse(str(self.child1) in self.nb.tabs())
998+
self.assertNotIn(str(self.child1), self.nb.tabs())
999999
self.assertEqual(len(tabs) - 1, len(self.nb.tabs()))
10001000

10011001
self.nb.add(self.child1)
10021002
self.assertEqual(self.nb.index(self.child1), 1)
1003-
self.assertFalse(child1_index == self.nb.index(self.child1))
1003+
self.assertNotEqual(child1_index, self.nb.index(self.child1))
10041004

10051005

10061006
def test_index(self):
10071007
self.assertRaises(tkinter.TclError, self.nb.index, -1)
10081008
self.assertRaises(tkinter.TclError, self.nb.index, None)
10091009

1010-
self.assertTrue(isinstance(self.nb.index('end'), int))
1010+
self.assertIsInstance(self.nb.index('end'), int)
10111011
self.assertEqual(self.nb.index(self.child1), 0)
10121012
self.assertEqual(self.nb.index(self.child2), 1)
10131013
self.assertEqual(self.nb.index('end'), 2)
@@ -1071,7 +1071,7 @@ def test_tab(self):
10711071
self.assertRaises(tkinter.TclError, self.nb.tab, 'notab')
10721072
self.assertRaises(tkinter.TclError, self.nb.tab, None)
10731073

1074-
self.assertTrue(isinstance(self.nb.tab(self.child1), dict))
1074+
self.assertIsInstance(self.nb.tab(self.child1), dict)
10751075
self.assertEqual(self.nb.tab(self.child1, text=None), 'a')
10761076
# newer form for querying a single option
10771077
self.assertEqual(self.nb.tab(self.child1, 'text'), 'a')
@@ -1192,7 +1192,7 @@ def test_bbox(self):
11921192

11931193
bbox = self.tv.bbox(children[0])
11941194
self.assertEqual(len(bbox), 4)
1195-
self.assertTrue(isinstance(bbox, tuple))
1195+
self.assertIsInstance(bbox, tuple)
11961196
for item in bbox:
11971197
if not isinstance(item, int):
11981198
self.fail("Invalid bounding box: %s" % bbox)
@@ -1215,7 +1215,7 @@ def test_children(self):
12151215
self.assertEqual(self.tv.get_children(), ())
12161216

12171217
item_id = self.tv.insert('', 'end')
1218-
self.assertTrue(isinstance(self.tv.get_children(), tuple))
1218+
self.assertIsInstance(self.tv.get_children(), tuple)
12191219
self.assertEqual(self.tv.get_children()[0], item_id)
12201220

12211221
# add item_id and child3 as children of child2
@@ -1240,9 +1240,9 @@ def test_children(self):
12401240

12411241
def test_column(self):
12421242
# return a dict with all options/values
1243-
self.assertTrue(isinstance(self.tv.column('#0'), dict))
1243+
self.assertIsInstance(self.tv.column('#0'), dict)
12441244
# return a single value of the given option
1245-
self.assertTrue(isinstance(self.tv.column('#0', width=None), int))
1245+
self.assertIsInstance(self.tv.column('#0', width=None), int)
12461246
# set a new value for an option
12471247
self.tv.column('#0', width=10)
12481248
# testing new way to get option value
@@ -1355,7 +1355,7 @@ def test_focus(self):
13551355

13561356
def test_heading(self):
13571357
# check a dict is returned
1358-
self.assertTrue(isinstance(self.tv.heading('#0'), dict))
1358+
self.assertIsInstance(self.tv.heading('#0'), dict)
13591359

13601360
# check a value is returned
13611361
self.tv.heading('#0', text='hi')
@@ -1466,7 +1466,7 @@ def test_insert_item(self):
14661466
self.tv.item(item, values=list(self.tv.item(item, values=None)))
14671467
self.assertEqual(self.tv.item(item, values=None), (value, ))
14681468

1469-
self.assertTrue(isinstance(self.tv.item(item), dict))
1469+
self.assertIsInstance(self.tv.item(item), dict)
14701470

14711471
# erase item values
14721472
self.tv.item(item, values='')
@@ -1567,7 +1567,7 @@ def test_tag_configure(self):
15671567
'blue')
15681568
self.assertEqual(str(self.tv.tag_configure('test', foreground=None)),
15691569
'blue')
1570-
self.assertTrue(isinstance(self.tv.tag_configure('test'), dict))
1570+
self.assertIsInstance(self.tv.tag_configure('test'), dict)
15711571

15721572

15731573
@add_standard_options(StandardTtkOptionsTests)

0 commit comments

Comments
 (0)