from idlelib import configdialog
from test.support import requires
requires('gui')
+from test.support.testcase import ExtraAssertions
import unittest
from unittest import mock
from idlelib.idle_test.mock_idle import Func
pass
-class ButtonTest(unittest.TestCase):
+class ButtonTest(unittest.TestCase, ExtraAssertions):
def test_click_ok(self):
d = dialog
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):
from tkinter import Tk
from test.support import requires
+from test.support.testcase import ExtraAssertions
import unittest
from unittest import mock
from unittest.mock import Mock, patch
self.idb.get_stack.assert_called_once_with(test_frame, None)
-class StackViewerTest(unittest.TestCase):
+class StackViewerTest(unittest.TestCase, ExtraAssertions):
@classmethod
def setUpClass(cls):
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.
from idlelib import grep
import unittest
from test.support import captured_stdout
+from test.support.testcase import ExtraAssertions
from idlelib.idle_test.mock_tk import Var
import os
import re
self.assertIn(self.realpath, filelist)
-class Grep_itTest(unittest.TestCase):
+class Grep_itTest(unittest.TestCase, ExtraAssertions):
# Test captured reports with 0 and some hits.
# Should test file names, but Windows reports have mixed / and \ separators
# from incomplete replacement, so 'later'.
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):
from idlelib import multicall
import unittest
from test.support import requires
+from test.support.testcase import ExtraAssertions
from tkinter import Tk, Text
-class MultiCallTest(unittest.TestCase):
+class MultiCallTest(unittest.TestCase, ExtraAssertions):
@classmethod
def setUpClass(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)
from idlelib import query
import unittest
from test.support import requires
+from test.support.testcase import ExtraAssertions
from tkinter import Tk, END
import sys
self.assertEqual(dialog.entry_error['text'], '')
-class ModuleNameTest(unittest.TestCase):
+class ModuleNameTest(unittest.TestCase, ExtraAssertions):
"Test ModuleName subclass of Query."
class Dummy_ModuleName:
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'], '')
root.destroy()
-class ModulenameGuiTest(unittest.TestCase):
+class ModulenameGuiTest(unittest.TestCase, ExtraAssertions):
@classmethod
def setUpClass(cls):
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()
from idlelib.redirector import WidgetRedirector
import unittest
from test.support import requires
+from test.support.testcase import ExtraAssertions
from tkinter import Tk, Text, TclError
from idlelib.idle_test.mock_idle import Func
-class InitCloseTest(unittest.TestCase):
+class InitCloseTest(unittest.TestCase, ExtraAssertions):
@classmethod
def setUpClass(cls):
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):
from itertools import chain
import unittest
import unittest.mock
-from test.support import requires, swap_attr
-from test import support
+from test.support import adjust_int_max_str_digits, requires, swap_attr
+from test.support.testcase import ExtraAssertions
import tkinter as tk
from idlelib.idle_test.tkinter_testing_utils import run_in_tk_mainloop
assert_colors_are_equal(orig_colors)
-class ShellSidebarTest(unittest.TestCase):
+class ShellSidebarTest(unittest.TestCase, ExtraAssertions):
root: tk.Tk = None
shell: PyShell = None
@run_in_tk_mainloop()
def test_very_long_wrapped_line(self):
- with support.adjust_int_max_str_digits(11_111), \
+ with adjust_int_max_str_digits(11_111), \
swap_attr(self.shell, 'squeezer', None):
self.do_input('x = ' + '1'*10_000 + '\n')
yield
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>>')
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')