Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e61fd5b

Browse files
gvanrossumgvanrossum
committed
Patch by Christian Heimes to change self.assert_(x == y) into
self.assertEqual(x, y). (Christian used self.failUnlessEqual(), but the double negative makes it hard to grok, so I changed it.)
1 parent c9b9de1 commit e61fd5b

23 files changed

Lines changed: 294 additions & 294 deletions

‎Lib/test/test_bigmem.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ def test_zfill(self, size):
409409
def test_format(self, size):
410410
s = '-' * size
411411
sf = '%s' % (s,)
412-
self.failUnless(s == sf)
412+
self.assertEqual(s, sf)
413413
del sf
414414
sf = '..%s..' % (s,)
415415
self.assertEquals(len(sf), len(s) + 4)
@@ -527,7 +527,7 @@ def test_contains(self, size):
527527
def test_compare(self, size):
528528
s1 = '-' * size
529529
s2 = '-' * size
530-
self.failUnless(s1 == s2)
530+
self.assertEqual(s1, s2)
531531
del s2
532532
s2 = s1 + 'a'
533533
self.failIf(s1 == s2)
@@ -564,7 +564,7 @@ class TupleTest(unittest.TestCase):
564564
def test_compare(self, size):
565565
t1 = ('',) * size
566566
t2 = ('',) * size
567-
self.failUnless(t1 == t2)
567+
self.assertEqual(t1, t2)
568568
del t2
569569
t2 = ('',) * (size + 1)
570570
self.failIf(t1 == t2)
@@ -669,7 +669,7 @@ class ListTest(unittest.TestCase):
669669
def test_compare(self, size):
670670
l1 = [''] * size
671671
l2 = [''] * size
672-
self.failUnless(l1 == l2)
672+
self.assertEqual(l1, l2)
673673
del l2
674674
l2 = [''] * (size + 1)
675675
self.failIf(l1 == l2)

‎Lib/test/test_bytes.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def test_compare(self):
8484
b2 = bytes([1, 2, 3])
8585
b3 = bytes([1, 3])
8686

87-
self.failUnless(b1 == b2)
87+
self.assertEqual(b1, b2)
8888
self.failUnless(b2 != b3)
8989
self.failUnless(b1 <= b2)
9090
self.failUnless(b1 <= b3)

‎Lib/test/test_datetime.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ def test_pickling(self):
316316
def test_compare(self):
317317
t1 = timedelta(2, 3, 4)
318318
t2 = timedelta(2, 3, 4)
319-
self.failUnless(t1 == t2)
319+
self.assertEqual(t1, t2)
320320
self.failUnless(t1 <= t2)
321321
self.failUnless(t1 >= t2)
322322
self.failUnless(not t1 != t2)
@@ -913,7 +913,7 @@ def test_pickling(self):
913913
def test_compare(self):
914914
t1 = self.theclass(2, 3, 4)
915915
t2 = self.theclass(2, 3, 4)
916-
self.failUnless(t1 == t2)
916+
self.assertEqual(t1, t2)
917917
self.failUnless(t1 <= t2)
918918
self.failUnless(t1 >= t2)
919919
self.failUnless(not t1 != t2)
@@ -1375,7 +1375,7 @@ def test_more_compare(self):
13751375
args = [2000, 11, 29, 20, 58, 16, 999998]
13761376
t1 = self.theclass(*args)
13771377
t2 = self.theclass(*args)
1378-
self.failUnless(t1 == t2)
1378+
self.assertEqual(t1, t2)
13791379
self.failUnless(t1 <= t2)
13801380
self.failUnless(t1 >= t2)
13811381
self.failUnless(not t1 != t2)
@@ -1662,7 +1662,7 @@ def test_comparing(self):
16621662
args = [1, 2, 3, 4]
16631663
t1 = self.theclass(*args)
16641664
t2 = self.theclass(*args)
1665-
self.failUnless(t1 == t2)
1665+
self.assertEqual(t1, t2)
16661666
self.failUnless(t1 <= t2)
16671667
self.failUnless(t1 >= t2)
16681668
self.failUnless(not t1 != t2)
@@ -2343,8 +2343,8 @@ def test_even_more_compare(self):
23432343
self.failUnless(t1 != t2)
23442344
self.failUnless(t2 > t1)
23452345

2346-
self.failUnless(t1 == t1)
2347-
self.failUnless(t2 == t2)
2346+
self.assertEqual(t1, t1)
2347+
self.assertEqual(t2, t2)
23482348

23492349
# Equal afer adjustment.
23502350
t1 = self.theclass(1, 12, 31, 23, 59, tzinfo=FixedOffset(1, ""))

‎Lib/test/test_decimal.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ def test_comparison_operators(self):
819819
self.failUnless(dc >= da)
820820
self.failUnless(da < dc)
821821
self.failUnless(da <= dc)
822-
self.failUnless(da == db)
822+
self.assertEqual(da, db)
823823
self.failUnless(da != dc)
824824
self.failUnless(da <= db)
825825
self.failUnless(da >= db)
@@ -830,7 +830,7 @@ def test_comparison_operators(self):
830830
#a Decimal and an int
831831
self.failUnless(dc > 23)
832832
self.failUnless(23 < dc)
833-
self.failUnless(dc == 45)
833+
self.assertEqual(dc, 45)
834834
self.assertEqual(cmp(dc,23), 1)
835835
self.assertEqual(cmp(23,dc), -1)
836836
self.assertEqual(cmp(dc,45), 0)

‎Lib/test/test_filecmp.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,28 +103,28 @@ def test_dircmp(self):
103103
self.assertEqual([d.left_list, d.right_list],[['file'], ['FiLe']])
104104
else:
105105
self.assertEqual([d.left_list, d.right_list],[['file'], ['file']])
106-
self.failUnless(d.common == ['file'])
106+
self.assertEqual(d.common, ['file'])
107107
self.failUnless(d.left_only == d.right_only == [])
108-
self.failUnless(d.same_files == ['file'])
109-
self.failUnless(d.diff_files == [])
108+
self.assertEqual(d.same_files, ['file'])
109+
self.assertEqual(d.diff_files, [])
110110

111111
# Check attributes for comparison of two different directories
112112
d = filecmp.dircmp(self.dir, self.dir_diff)
113-
self.failUnless(d.left_list == ['file'])
113+
self.assertEqual(d.left_list, ['file'])
114114
self.failUnless(d.right_list == ['file', 'file2'])
115-
self.failUnless(d.common == ['file'])
116-
self.failUnless(d.left_only == [])
117-
self.failUnless(d.right_only == ['file2'])
118-
self.failUnless(d.same_files == ['file'])
119-
self.failUnless(d.diff_files == [])
115+
self.assertEqual(d.common, ['file'])
116+
self.assertEqual(d.left_only, [])
117+
self.assertEqual(d.right_only, ['file2'])
118+
self.assertEqual(d.same_files, ['file'])
119+
self.assertEqual(d.diff_files, [])
120120

121121
# Add different file2
122122
output = open(os.path.join(self.dir, 'file2'), 'w')
123123
output.write('Different contents.\n')
124124
output.close()
125125
d = filecmp.dircmp(self.dir, self.dir_diff)
126-
self.failUnless(d.same_files == ['file'])
127-
self.failUnless(d.diff_files == ['file2'])
126+
self.assertEqual(d.same_files, ['file'])
127+
self.assertEqual(d.diff_files, ['file2'])
128128

129129

130130
def test_main():

‎Lib/test/test_hmac.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def test_default_is_md5(self):
108108
# NOTE: this whitebox test depends on the hmac class internals
109109
import hashlib
110110
h = hmac.HMAC("key")
111-
self.failUnless(h.digest_cons == hashlib.md5)
111+
self.assertEqual(h.digest_cons, hashlib.md5)
112112

113113
def test_exercise_all_methods(self):
114114
# Exercising all methods once.
@@ -130,9 +130,9 @@ def test_attributes(self):
130130
h2 = h1.copy()
131131
self.failUnless(h1.digest_cons == h2.digest_cons,
132132
"digest constructors don't match.")
133-
self.failUnless(type(h1.inner) == type(h2.inner),
133+
self.assertEqual(type(h1.inner), type(h2.inner),
134134
"Types of inner don't match.")
135-
self.failUnless(type(h1.outer) == type(h2.outer),
135+
self.assertEqual(type(h1.outer), type(h2.outer),
136136
"Types of outer don't match.")
137137

138138
def test_realcopy(self):
@@ -151,9 +151,9 @@ def test_equality(self):
151151
h1 = hmac.HMAC("key")
152152
h1.update("some random text")
153153
h2 = h1.copy()
154-
self.failUnless(h1.digest() == h2.digest(),
154+
self.assertEqual(h1.digest(), h2.digest(),
155155
"Digest of copy doesn't match original digest.")
156-
self.failUnless(h1.hexdigest() == h2.hexdigest(),
156+
self.assertEqual(h1.hexdigest(), h2.hexdigest(),
157157
"Hexdigest of copy doesn't match original hexdigest.")
158158

159159
def test_main():

‎Lib/test/test_hotshot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def f(p):
7777
log = self.get_logreader()
7878
info = log._info
7979
list(log)
80-
self.failUnless(info["test-key"] == ["test-value"])
80+
self.assertEqual(info["test-key"], ["test-value"])
8181

8282
def test_line_numbers(self):
8383
def f():

‎Lib/test/test_macpath.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
class MacPathTestCase(unittest.TestCase):
77

88
def test_abspath(self):
9-
self.assert_(macpath.abspath("xx:yy") == "xx:yy")
9+
self.assertEqual(macpath.abspath("xx:yy"), "xx:yy")
1010

1111
def test_isabs(self):
1212
isabs = macpath.isabs

0 commit comments

Comments
 (0)