https://github.com/python/cpython/commit/dbb25ce037a8eddc85a9f6ba541aec8b3fa931fa
commit: dbb25ce037a8eddc85a9f6ba541aec8b3fa931fa
branch: main
author: Terry Jan Reedy <[email protected]>
committer: terryjreedy <[email protected]>
date: 2025-01-23T13:25:14-05:00
summary:
gh-71339: Use new assertion methods in test_idle (#129213)
Revise 10 tests in 7 files, with 1 test split into 2.
files:
M Lib/idlelib/idle_test/test_configdialog.py
M Lib/idlelib/idle_test/test_debugger.py
M Lib/idlelib/idle_test/test_grep.py
M Lib/idlelib/idle_test/test_multicall.py
M Lib/idlelib/idle_test/test_query.py
M Lib/idlelib/idle_test/test_redirector.py
M Lib/idlelib/idle_test/test_sidebar.py
diff --git a/Lib/idlelib/idle_test/test_configdialog.py
b/Lib/idlelib/idle_test/test_configdialog.py
index 5099d093382445..2773ed7ce614b5 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -98,8 +98,8 @@ def test_click_help(self):
dialog.buttons['Help'].invoke()
title, contents = view.kwds['title'], view.kwds['contents']
self.assertEqual(title, 'Help for IDLE preferences')
- self.assertTrue(contents.startswith('When you click') and
- contents.endswith('a different name.\n'))
+ self.assertStartsWith(contents, 'When you click')
+ self.assertEndsWith(contents,'a different name.\n')
class FontPageTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_debugger.py
b/Lib/idlelib/idle_test/test_debugger.py
index d1c9638dd5d711..9ca3b332648b31 100644
--- a/Lib/idlelib/idle_test/test_debugger.py
+++ b/Lib/idlelib/idle_test/test_debugger.py
@@ -256,7 +256,7 @@ def test_init(self):
flist = None
master_window = self.root
sv = debugger.StackViewer(master_window, flist, gui)
- self.assertTrue(hasattr(sv, 'stack'))
+ self.assertHasAttr(sv, 'stack')
def test_load_stack(self):
# Test the .load_stack() method against a fixed test stack.
diff --git a/Lib/idlelib/idle_test/test_grep.py
b/Lib/idlelib/idle_test/test_grep.py
index a0b5b69171879c..d67dba76911fcf 100644
--- a/Lib/idlelib/idle_test/test_grep.py
+++ b/Lib/idlelib/idle_test/test_grep.py
@@ -143,7 +143,7 @@ def test_found(self):
self.assertIn(pat, lines[0])
self.assertIn('py: 1:', lines[1]) # line number 1
self.assertIn('2', lines[3]) # hits found 2
- self.assertTrue(lines[4].startswith('(Hint:'))
+ self.assertStartsWith(lines[4], '(Hint:')
class Default_commandTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_multicall.py
b/Lib/idlelib/idle_test/test_multicall.py
index b3a3bfb88f9c31..67f28db6b0875c 100644
--- a/Lib/idlelib/idle_test/test_multicall.py
+++ b/Lib/idlelib/idle_test/test_multicall.py
@@ -27,7 +27,7 @@ def tearDownClass(cls):
def test_creator(self):
mc = self.mc
self.assertIs(multicall._multicall_dict[Text], mc)
- self.assertTrue(issubclass(mc, Text))
+ self.assertIsSubclass(mc, Text)
mc2 = multicall.MultiCallCreator(Text)
self.assertIs(mc, mc2)
diff --git a/Lib/idlelib/idle_test/test_query.py
b/Lib/idlelib/idle_test/test_query.py
index bb12b2b08652d5..a6ef858a8c954a 100644
--- a/Lib/idlelib/idle_test/test_query.py
+++ b/Lib/idlelib/idle_test/test_query.py
@@ -134,10 +134,10 @@ def test_c_source_name(self):
def test_good_module_name(self):
dialog = self.Dummy_ModuleName('idlelib')
- self.assertTrue(dialog.entry_ok().endswith('__init__.py'))
+ self.assertEndsWith(dialog.entry_ok(), '__init__.py')
self.assertEqual(dialog.entry_error['text'], '')
dialog = self.Dummy_ModuleName('idlelib.idle')
- self.assertTrue(dialog.entry_ok().endswith('idle.py'))
+ self.assertEndsWith(dialog.entry_ok(), 'idle.py')
self.assertEqual(dialog.entry_error['text'], '')
@@ -389,7 +389,7 @@ def test_click_module_name(self):
self.assertEqual(dialog.text0, 'idlelib')
self.assertEqual(dialog.entry.get(), 'idlelib')
dialog.button_ok.invoke()
- self.assertTrue(dialog.result.endswith('__init__.py'))
+ self.assertEndsWith(dialog.result, '__init__.py')
root.destroy()
diff --git a/Lib/idlelib/idle_test/test_redirector.py
b/Lib/idlelib/idle_test/test_redirector.py
index a97b3002afcf12..bd486d7da66010 100644
--- a/Lib/idlelib/idle_test/test_redirector.py
+++ b/Lib/idlelib/idle_test/test_redirector.py
@@ -34,7 +34,7 @@ def test_close(self):
redir.register('insert', Func)
redir.close()
self.assertEqual(redir._operations, {})
- self.assertFalse(hasattr(self.text, 'widget'))
+ self.assertNotHasAttr(self.text, 'widget')
class WidgetRedirectorTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_sidebar.py
b/Lib/idlelib/idle_test/test_sidebar.py
index 605e7a892570d7..4157a4b4dcdd2a 100644
--- a/Lib/idlelib/idle_test/test_sidebar.py
+++ b/Lib/idlelib/idle_test/test_sidebar.py
@@ -725,7 +725,7 @@ def test_copy(self):
text.tag_add('sel', f'{first_line}.0', 'end-1c')
selected_text = text.get('sel.first', 'sel.last')
- self.assertTrue(selected_text.startswith('if True:\n'))
+ self.assertStartsWith(selected_text, 'if True:\n')
self.assertIn('\n1\n', selected_text)
text.event_generate('<<copy>>')
@@ -749,7 +749,7 @@ def test_copy_with_prompts(self):
text.tag_add('sel', f'{first_line}.3', 'end-1c')
selected_text = text.get('sel.first', 'sel.last')
- self.assertTrue(selected_text.startswith('True:\n'))
+ self.assertStartsWith(selected_text, 'True:\n')
selected_lines_text = text.get('sel.first linestart', 'sel.last')
selected_lines = selected_lines_text.split('\n')
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
