Skip to content

Commit dbb25ce

Browse files
authored
gh-71339: Use new assertion methods in test_idle (#129213)
Revise 10 tests in 7 files, with 1 test split into 2.
1 parent c05a851 commit dbb25ce

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Lib/idlelib/idle_test/test_configdialog.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ def test_click_help(self):
9898
dialog.buttons['Help'].invoke()
9999
title, contents = view.kwds['title'], view.kwds['contents']
100100
self.assertEqual(title, 'Help for IDLE preferences')
101-
self.assertTrue(contents.startswith('When you click') and
102-
contents.endswith('a different name.\n'))
101+
self.assertStartsWith(contents, 'When you click')
102+
self.assertEndsWith(contents,'a different name.\n')
103103

104104

105105
class FontPageTest(unittest.TestCase):

Lib/idlelib/idle_test/test_debugger.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def test_init(self):
256256
flist = None
257257
master_window = self.root
258258
sv = debugger.StackViewer(master_window, flist, gui)
259-
self.assertTrue(hasattr(sv, 'stack'))
259+
self.assertHasAttr(sv, 'stack')
260260

261261
def test_load_stack(self):
262262
# Test the .load_stack() method against a fixed test stack.

Lib/idlelib/idle_test/test_grep.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def test_found(self):
143143
self.assertIn(pat, lines[0])
144144
self.assertIn('py: 1:', lines[1]) # line number 1
145145
self.assertIn('2', lines[3]) # hits found 2
146-
self.assertTrue(lines[4].startswith('(Hint:'))
146+
self.assertStartsWith(lines[4], '(Hint:')
147147

148148

149149
class Default_commandTest(unittest.TestCase):

Lib/idlelib/idle_test/test_multicall.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def tearDownClass(cls):
2727
def test_creator(self):
2828
mc = self.mc
2929
self.assertIs(multicall._multicall_dict[Text], mc)
30-
self.assertTrue(issubclass(mc, Text))
30+
self.assertIsSubclass(mc, Text)
3131
mc2 = multicall.MultiCallCreator(Text)
3232
self.assertIs(mc, mc2)
3333

Lib/idlelib/idle_test/test_query.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ def test_c_source_name(self):
134134

135135
def test_good_module_name(self):
136136
dialog = self.Dummy_ModuleName('idlelib')
137-
self.assertTrue(dialog.entry_ok().endswith('__init__.py'))
137+
self.assertEndsWith(dialog.entry_ok(), '__init__.py')
138138
self.assertEqual(dialog.entry_error['text'], '')
139139
dialog = self.Dummy_ModuleName('idlelib.idle')
140-
self.assertTrue(dialog.entry_ok().endswith('idle.py'))
140+
self.assertEndsWith(dialog.entry_ok(), 'idle.py')
141141
self.assertEqual(dialog.entry_error['text'], '')
142142

143143

@@ -389,7 +389,7 @@ def test_click_module_name(self):
389389
self.assertEqual(dialog.text0, 'idlelib')
390390
self.assertEqual(dialog.entry.get(), 'idlelib')
391391
dialog.button_ok.invoke()
392-
self.assertTrue(dialog.result.endswith('__init__.py'))
392+
self.assertEndsWith(dialog.result, '__init__.py')
393393
root.destroy()
394394

395395

Lib/idlelib/idle_test/test_redirector.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def test_close(self):
3434
redir.register('insert', Func)
3535
redir.close()
3636
self.assertEqual(redir._operations, {})
37-
self.assertFalse(hasattr(self.text, 'widget'))
37+
self.assertNotHasAttr(self.text, 'widget')
3838

3939

4040
class WidgetRedirectorTest(unittest.TestCase):

Lib/idlelib/idle_test/test_sidebar.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ def test_copy(self):
725725

726726
text.tag_add('sel', f'{first_line}.0', 'end-1c')
727727
selected_text = text.get('sel.first', 'sel.last')
728-
self.assertTrue(selected_text.startswith('if True:\n'))
728+
self.assertStartsWith(selected_text, 'if True:\n')
729729
self.assertIn('\n1\n', selected_text)
730730

731731
text.event_generate('<<copy>>')
@@ -749,7 +749,7 @@ def test_copy_with_prompts(self):
749749

750750
text.tag_add('sel', f'{first_line}.3', 'end-1c')
751751
selected_text = text.get('sel.first', 'sel.last')
752-
self.assertTrue(selected_text.startswith('True:\n'))
752+
self.assertStartsWith(selected_text, 'True:\n')
753753

754754
selected_lines_text = text.get('sel.first linestart', 'sel.last')
755755
selected_lines = selected_lines_text.split('\n')

0 commit comments

Comments
 (0)