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

Skip to content

Commit 870db90

Browse files
pitroupitrou
committed
Closes #20544: use specific asserts in operator tests.
Patch by Serhiy.
1 parent 0ccf208 commit 870db90

1 file changed

Lines changed: 25 additions & 25 deletions

File tree

‎Lib/test/test_operator.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -120,63 +120,63 @@ def test_add(self):
120120
operator = self.module
121121
self.assertRaises(TypeError, operator.add)
122122
self.assertRaises(TypeError, operator.add, None, None)
123-
self.assertTrue(operator.add(3, 4) == 7)
123+
self.assertEqual(operator.add(3, 4), 7)
124124

125125
def test_bitwise_and(self):
126126
operator = self.module
127127
self.assertRaises(TypeError, operator.and_)
128128
self.assertRaises(TypeError, operator.and_, None, None)
129-
self.assertTrue(operator.and_(0xf, 0xa) == 0xa)
129+
self.assertEqual(operator.and_(0xf, 0xa), 0xa)
130130

131131
def test_concat(self):
132132
operator = self.module
133133
self.assertRaises(TypeError, operator.concat)
134134
self.assertRaises(TypeError, operator.concat, None, None)
135-
self.assertTrue(operator.concat('py', 'thon') == 'python')
136-
self.assertTrue(operator.concat([1, 2], [3, 4]) == [1, 2, 3, 4])
137-
self.assertTrue(operator.concat(Seq1([5, 6]), Seq1([7])) == [5, 6, 7])
138-
self.assertTrue(operator.concat(Seq2([5, 6]), Seq2([7])) == [5, 6, 7])
135+
self.assertEqual(operator.concat('py', 'thon'), 'python')
136+
self.assertEqual(operator.concat([1, 2], [3, 4]), [1, 2, 3, 4])
137+
self.assertEqual(operator.concat(Seq1([5, 6]), Seq1([7])), [5, 6, 7])
138+
self.assertEqual(operator.concat(Seq2([5, 6]), Seq2([7])), [5, 6, 7])
139139
self.assertRaises(TypeError, operator.concat, 13, 29)
140140

141141
def test_countOf(self):
142142
operator = self.module
143143
self.assertRaises(TypeError, operator.countOf)
144144
self.assertRaises(TypeError, operator.countOf, None, None)
145-
self.assertTrue(operator.countOf([1, 2, 1, 3, 1, 4], 3) == 1)
146-
self.assertTrue(operator.countOf([1, 2, 1, 3, 1, 4], 5) == 0)
145+
self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 3), 1)
146+
self.assertEqual(operator.countOf([1, 2, 1, 3, 1, 4], 5), 0)
147147

148148
def test_delitem(self):
149149
operator = self.module
150150
a = [4, 3, 2, 1]
151151
self.assertRaises(TypeError, operator.delitem, a)
152152
self.assertRaises(TypeError, operator.delitem, a, None)
153-
self.assertTrue(operator.delitem(a, 1) is None)
154-
self.assertTrue(a == [4, 2, 1])
153+
self.assertIsNone(operator.delitem(a, 1))
154+
self.assertEqual(a, [4, 2, 1])
155155

156156
def test_floordiv(self):
157157
operator = self.module
158158
self.assertRaises(TypeError, operator.floordiv, 5)
159159
self.assertRaises(TypeError, operator.floordiv, None, None)
160-
self.assertTrue(operator.floordiv(5, 2) == 2)
160+
self.assertEqual(operator.floordiv(5, 2), 2)
161161

162162
def test_truediv(self):
163163
operator = self.module
164164
self.assertRaises(TypeError, operator.truediv, 5)
165165
self.assertRaises(TypeError, operator.truediv, None, None)
166-
self.assertTrue(operator.truediv(5, 2) == 2.5)
166+
self.assertEqual(operator.truediv(5, 2), 2.5)
167167

168168
def test_getitem(self):
169169
operator = self.module
170170
a = range(10)
171171
self.assertRaises(TypeError, operator.getitem)
172172
self.assertRaises(TypeError, operator.getitem, a, None)
173-
self.assertTrue(operator.getitem(a, 2) == 2)
173+
self.assertEqual(operator.getitem(a, 2), 2)
174174

175175
def test_indexOf(self):
176176
operator = self.module
177177
self.assertRaises(TypeError, operator.indexOf)
178178
self.assertRaises(TypeError, operator.indexOf, None, None)
179-
self.assertTrue(operator.indexOf([4, 3, 2, 1], 3) == 1)
179+
self.assertEqual(operator.indexOf([4, 3, 2, 1], 3), 1)
180180
self.assertRaises(ValueError, operator.indexOf, [4, 3, 2, 1], 0)
181181

182182
def test_invert(self):
@@ -189,21 +189,21 @@ def test_lshift(self):
189189
operator = self.module
190190
self.assertRaises(TypeError, operator.lshift)
191191
self.assertRaises(TypeError, operator.lshift, None, 42)
192-
self.assertTrue(operator.lshift(5, 1) == 10)
193-
self.assertTrue(operator.lshift(5, 0) == 5)
192+
self.assertEqual(operator.lshift(5, 1), 10)
193+
self.assertEqual(operator.lshift(5, 0), 5)
194194
self.assertRaises(ValueError, operator.lshift, 2, -1)
195195

196196
def test_mod(self):
197197
operator = self.module
198198
self.assertRaises(TypeError, operator.mod)
199199
self.assertRaises(TypeError, operator.mod, None, 42)
200-
self.assertTrue(operator.mod(5, 2) == 1)
200+
self.assertEqual(operator.mod(5, 2), 1)
201201

202202
def test_mul(self):
203203
operator = self.module
204204
self.assertRaises(TypeError, operator.mul)
205205
self.assertRaises(TypeError, operator.mul, None, None)
206-
self.assertTrue(operator.mul(5, 2) == 10)
206+
self.assertEqual(operator.mul(5, 2), 10)
207207

208208
def test_matmul(self):
209209
operator = self.module
@@ -227,7 +227,7 @@ def test_bitwise_or(self):
227227
operator = self.module
228228
self.assertRaises(TypeError, operator.or_)
229229
self.assertRaises(TypeError, operator.or_, None, None)
230-
self.assertTrue(operator.or_(0xa, 0x5) == 0xf)
230+
self.assertEqual(operator.or_(0xa, 0x5), 0xf)
231231

232232
def test_pos(self):
233233
operator = self.module
@@ -250,8 +250,8 @@ def test_rshift(self):
250250
operator = self.module
251251
self.assertRaises(TypeError, operator.rshift)
252252
self.assertRaises(TypeError, operator.rshift, None, 42)
253-
self.assertTrue(operator.rshift(5, 1) == 2)
254-
self.assertTrue(operator.rshift(5, 0) == 5)
253+
self.assertEqual(operator.rshift(5, 1), 2)
254+
self.assertEqual(operator.rshift(5, 0), 5)
255255
self.assertRaises(ValueError, operator.rshift, 2, -1)
256256

257257
def test_contains(self):
@@ -266,15 +266,15 @@ def test_setitem(self):
266266
a = list(range(3))
267267
self.assertRaises(TypeError, operator.setitem, a)
268268
self.assertRaises(TypeError, operator.setitem, a, None, None)
269-
self.assertTrue(operator.setitem(a, 0, 2) is None)
270-
self.assertTrue(a == [2, 1, 2])
269+
self.assertIsNone(operator.setitem(a, 0, 2))
270+
self.assertEqual(a, [2, 1, 2])
271271
self.assertRaises(IndexError, operator.setitem, a, 4, 2)
272272

273273
def test_sub(self):
274274
operator = self.module
275275
self.assertRaises(TypeError, operator.sub)
276276
self.assertRaises(TypeError, operator.sub, None, None)
277-
self.assertTrue(operator.sub(5, 2) == 3)
277+
self.assertEqual(operator.sub(5, 2), 3)
278278

279279
def test_truth(self):
280280
operator = self.module
@@ -292,7 +292,7 @@ def test_bitwise_xor(self):
292292
operator = self.module
293293
self.assertRaises(TypeError, operator.xor)
294294
self.assertRaises(TypeError, operator.xor, None, None)
295-
self.assertTrue(operator.xor(0xb, 0xc) == 0x7)
295+
self.assertEqual(operator.xor(0xb, 0xc), 0x7)
296296

297297
def test_is(self):
298298
operator = self.module

0 commit comments

Comments
 (0)