diff options
author | Raymond Hettinger <python@rcn.com> | 2010-12-24 21:51:48 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2010-12-24 21:51:48 (GMT) |
commit | 57bd00a15bc06d90a1d8540706b3a66ee8c69039 (patch) | |
tree | e0c90291ae66b73398d2b729b603d19c55830ddf /Lib | |
parent | 1397ce1821d4888a3637bd9490cc9c930f3c7b98 (diff) | |
download | cpython-57bd00a15bc06d90a1d8540706b3a66ee8c69039.zip cpython-57bd00a15bc06d90a1d8540706b3a66ee8c69039.tar.gz cpython-57bd00a15bc06d90a1d8540706b3a66ee8c69039.tar.bz2 |
Adopt symmetric names for arguments (actual/expected --> first/second).
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/unittest/case.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py index 82b139f..004a9f5 100644 --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -1004,20 +1004,20 @@ class TestCase(object): self.fail(self._formatMessage(msg, standardMsg)) - def assertCountEqual(self, actual, expected, msg=None): - """An unordered sequence specific comparison. It asserts that - actual and expected have the same element counts. - Equivalent to:: + def assertCountEqual(self, first, second, msg=None): + """An unordered sequence comparison asserting that the same elements, + regardless of order. If the same element occurs more than once, + it verifies that the elements occur the same number of times. - self.assertEqual(Counter(list(actual)), - Counter(list(expected))) + self.assertEqual(Counter(list(first)), + Counter(list(second))) - Asserts that each element has the same count in both sequences. - Example: + Example: - [0, 1, 1] and [1, 0, 1] compare equal. - [0, 0, 1] and [0, 1] compare unequal. + """ - actual_seq, expected_seq = list(actual), list(expected) + actual_seq, expected_seq = list(first), list(second) try: actual = collections.Counter(actual_seq) expected = collections.Counter(expected_seq) @@ -1031,7 +1031,7 @@ class TestCase(object): if differences: standardMsg = 'Element counts were not equal:\n' - lines = ['Got %d, expected %d: %r' % diff for diff in differences] + lines = ['First has %d, Second has %d: %r' % diff for diff in differences] diffMsg = '\n'.join(lines) standardMsg = self._truncateMessage(standardMsg, diffMsg) msg = self._formatMessage(msg, standardMsg) |