Skip to content

gh-71339: Add additional assertion methods for unittest #128707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 7 commits into from
Jan 14, 2025
Merged

gh-71339: Add additional assertion methods for unittest #128707

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9c998f
gh-71339: Add additional assertion methods for unittest
serhiy-storchaka Jan 10, 2025
b825e23
Fix references: "with" instead of "With".
serhiy-storchaka Jan 10, 2025
a54e693
Spell "With" instead of "with".
serhiy-storchaka Jan 11, 2025
85509f6
Apply suggestions from code review
serhiy-storchaka Jan 11, 2025
bfe98aa
Remove variable r.
serhiy-storchaka Jan 13, 2025
89b1577
Use f-strings.
serhiy-storchaka Jan 13, 2025
c703dc9
Double empty lines.
serhiy-storchaka Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove variable r.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Jan 13, 2025
commit bfe98aa3583f91cd87b08578714be11b8437df81
116 changes: 58 additions & 58 deletions Lib/unittest/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,35 +1340,35 @@ def assertNotIsInstance(self, obj, cls, msg=None):

def assertIsSubclass(self, cls, superclass, msg=None):
try:
r = issubclass(cls, superclass)
if issubclass(cls, superclass):
return
except TypeError:
if not isinstance(cls, type):
self.fail(self._formatMessage(msg,
'%r is not a class' % (cls,)))
raise
if not r:
if isinstance(superclass, tuple):
standardMsg = '%r is not a subclass of any of %r' % (cls, superclass)
else:
standardMsg = '%r is not a subclass of %r' % (cls, superclass)
self.fail(self._formatMessage(msg, standardMsg))
if isinstance(superclass, tuple):
standardMsg = '%r is not a subclass of any of %r' % (cls, superclass)
else:
standardMsg = '%r is not a subclass of %r' % (cls, superclass)
self.fail(self._formatMessage(msg, standardMsg))

def assertNotIsSubclass(self, cls, superclass, msg=None):
try:
r = issubclass(cls, superclass)
if not issubclass(cls, superclass):
return
except TypeError:
if not isinstance(cls, type):
self.fail(self._formatMessage(msg,
'%r is not a class' % (cls,)))
raise
if r:
if isinstance(superclass, tuple):
for x in superclass:
if issubclass(cls, x):
superclass = x
break
self.fail(self._formatMessage(msg,
'%r is a subclass of %r' % (cls, superclass)))
if isinstance(superclass, tuple):
for x in superclass:
if issubclass(cls, x):
superclass = x
break
self.fail(self._formatMessage(msg,
'%r is a subclass of %r' % (cls, superclass)))

def assertHasAttr(self, obj, name, msg=None):
if not hasattr(obj, name):
Expand Down Expand Up @@ -1468,69 +1468,69 @@ def _tail_type_check(self, s, tails, msg):

def assertStartsWith(self, s, prefix, msg=None):
try:
r = s.startswith(prefix)
if s.startswith(prefix):
return
except (AttributeError, TypeError):
self._tail_type_check(s, prefix, msg)
raise
if not r:
a = safe_repr(s, short=True)
b = safe_repr(prefix)
if isinstance(prefix, tuple):
self.fail(self._formatMessage(msg,
"%s doesn't start with any of %s" % (a, b)))
else:
self.fail(self._formatMessage(msg,
"%s doesn't start with %s" % (a, b)))
a = safe_repr(s, short=True)
b = safe_repr(prefix)
if isinstance(prefix, tuple):
self.fail(self._formatMessage(msg,
"%s doesn't start with any of %s" % (a, b)))
else:
self.fail(self._formatMessage(msg,
"%s doesn't start with %s" % (a, b)))

def assertNotStartsWith(self, s, prefix, msg=None):
try:
r = s.startswith(prefix)
if not s.startswith(prefix):
return
except (AttributeError, TypeError):
self._tail_type_check(s, prefix, msg)
raise
if r:
if isinstance(prefix, tuple):
for x in prefix:
if s.startswith(x):
prefix = x
break
a = safe_repr(s, short=True)
b = safe_repr(prefix)
self.fail(self._formatMessage(msg,
"%s starts with %s" % (a, b)))
if isinstance(prefix, tuple):
for x in prefix:
if s.startswith(x):
prefix = x
break
a = safe_repr(s, short=True)
b = safe_repr(prefix)
self.fail(self._formatMessage(msg,
"%s starts with %s" % (a, b)))

def assertEndsWith(self, s, suffix, msg=None):
try:
r = s.endswith(suffix)
if s.endswith(suffix):
return
except (AttributeError, TypeError):
self._tail_type_check(s, suffix, msg)
raise
if not r:
a = safe_repr(s, short=True)
b = safe_repr(suffix)
if isinstance(suffix, tuple):
self.fail(self._formatMessage(msg,
"%s doesn't end with any of %s" % (a, b)))
else:
self.fail(self._formatMessage(msg,
"%s doesn't end with %s" % (a, b)))
a = safe_repr(s, short=True)
b = safe_repr(suffix)
if isinstance(suffix, tuple):
self.fail(self._formatMessage(msg,
"%s doesn't end with any of %s" % (a, b)))
else:
self.fail(self._formatMessage(msg,
"%s doesn't end with %s" % (a, b)))

def assertNotEndsWith(self, s, suffix, msg=None):
try:
r = s.endswith(suffix)
if not s.endswith(suffix):
return
except (AttributeError, TypeError):
self._tail_type_check(s, suffix, msg)
raise
if r:
if isinstance(suffix, tuple):
for x in suffix:
if s.endswith(x):
suffix = x
break
a = safe_repr(s, short=True)
b = safe_repr(suffix)
self.fail(self._formatMessage(msg,
"%s ends with %s" % (a, b)))
if isinstance(suffix, tuple):
for x in suffix:
if s.endswith(x):
suffix = x
break
a = safe_repr(s, short=True)
b = safe_repr(suffix)
self.fail(self._formatMessage(msg,
"%s ends with %s" % (a, b)))


class FunctionTestCase(TestCase):
Expand Down