mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-16 07:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#10573: use actual/expected consistently in unittest methods. The order of the args of assertCountEqual is also changed.

Browse source
This commit is contained in:
Ezio Melotti 2010-12-18 20:00:04 +00:00
parent 63563cdf9d
commit addc6f5a21
3 changed files with 54 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/unittest/case.py
View file

@ -904,17 +904,17 @@ class TestCase(object):
standardMsg = self._truncateMessage(standardMsg, diff)
self.fail(self._formatMessage(msg, standardMsg))
def assertDictContainsSubset(self, expected, actual, msg=None):
"""Checks whether actual is a superset of expected."""
def assertDictContainsSubset(self, subset, dictionary, msg=None):
"""Checks whether dictionary is a superset of subset."""
missing = []
mismatched = []
for key, value in expected.items():
if key not in actual:
for key, value in subset.items():
if key not in dictionary:
missing.append(key)
elif value != actual[key]:
elif value != dictionary[key]:
mismatched.append('%s, expected: %s, actual: %s' %
(safe_repr(key), safe_repr(value),
safe_repr(actual[key])))
safe_repr(dictionary[key])))
if not (missing or mismatched):
return
@ -973,13 +973,13 @@ class TestCase(object):
self.fail(self._formatMessage(msg, standardMsg))
def assertCountEqual(self, expected_seq, actual_seq, msg=None):
def assertCountEqual(self, actual_seq, expected_seq, msg=None):
"""An unordered sequence specific comparison. It asserts that
expected_seq and actual_seq have the same element counts.
actual_seq and expected_seq have the same element counts.
Equivalent to::
self.assertEqual(Counter(iter(expected_seq)),
Counter(iter(actual_seq)))
self.assertEqual(Counter(iter(actual_seq)),
Counter(iter(expected_seq)))
Asserts that each element has the same count in both sequences.
Example:
@ -987,15 +987,15 @@ class TestCase(object):
- [0, 0, 1] and [0, 1] compare unequal.
"""
try:
expected = collections.Counter(iter(expected_seq))
actual = collections.Counter(iter(actual_seq))
expected = collections.Counter(iter(expected_seq))
except TypeError:
# Unsortable items (example: set(), complex(), ...)
expected = list(expected_seq)
actual = list(actual_seq)
expected = list(expected_seq)
missing, unexpected = unorderable_list_difference(expected, actual)
else:
if expected == actual:
if actual == expected:
return
missing = list(expected - actual)
unexpected = list(actual - expected)