Skip to content

Commit 8879e84

Browse files
gfyoungjreback
authored andcommitted
MAINT: Remove self.assertTrue from testing (#16158)
1 parent a16fc8d commit 8879e84

File tree

149 files changed

+2204
-2340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+2204
-2340
lines changed

pandas/tests/computation/test_eval.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -662,17 +662,17 @@ def test_identical(self):
662662
x = 1
663663
result = pd.eval('x', engine=self.engine, parser=self.parser)
664664
self.assertEqual(result, 1)
665-
self.assertTrue(is_scalar(result))
665+
assert is_scalar(result)
666666

667667
x = 1.5
668668
result = pd.eval('x', engine=self.engine, parser=self.parser)
669669
self.assertEqual(result, 1.5)
670-
self.assertTrue(is_scalar(result))
670+
assert is_scalar(result)
671671

672672
x = False
673673
result = pd.eval('x', engine=self.engine, parser=self.parser)
674674
self.assertEqual(result, False)
675-
self.assertTrue(is_scalar(result))
675+
assert is_scalar(result)
676676

677677
x = np.array([1])
678678
result = pd.eval('x', engine=self.engine, parser=self.parser)
@@ -708,7 +708,7 @@ def test_float_truncation(self):
708708
1000000000.0015]})
709709
cutoff = 1000000000.0006
710710
result = df.query("A < %.4f" % cutoff)
711-
self.assertTrue(result.empty)
711+
assert result.empty
712712

713713
cutoff = 1000000000.0010
714714
result = df.query("A > %.4f" % cutoff)
@@ -1281,7 +1281,7 @@ def f():
12811281
df.eval('a = a + b', inplace=True)
12821282
result = old_a + df.b
12831283
assert_series_equal(result, df.a, check_names=False)
1284-
self.assertTrue(result.name is None)
1284+
assert result.name is None
12851285

12861286
f()
12871287

@@ -1435,43 +1435,43 @@ def test_simple_in_ops(self):
14351435
if self.parser != 'python':
14361436
res = pd.eval('1 in [1, 2]', engine=self.engine,
14371437
parser=self.parser)
1438-
self.assertTrue(res)
1438+
assert res
14391439

14401440
res = pd.eval('2 in (1, 2)', engine=self.engine,
14411441
parser=self.parser)
1442-
self.assertTrue(res)
1442+
assert res
14431443

14441444
res = pd.eval('3 in (1, 2)', engine=self.engine,
14451445
parser=self.parser)
14461446
assert not res
14471447

14481448
res = pd.eval('3 not in (1, 2)', engine=self.engine,
14491449
parser=self.parser)
1450-
self.assertTrue(res)
1450+
assert res
14511451

14521452
res = pd.eval('[3] not in (1, 2)', engine=self.engine,
14531453
parser=self.parser)
1454-
self.assertTrue(res)
1454+
assert res
14551455

14561456
res = pd.eval('[3] in ([3], 2)', engine=self.engine,
14571457
parser=self.parser)
1458-
self.assertTrue(res)
1458+
assert res
14591459

14601460
res = pd.eval('[[3]] in [[[3]], 2]', engine=self.engine,
14611461
parser=self.parser)
1462-
self.assertTrue(res)
1462+
assert res
14631463

14641464
res = pd.eval('(3,) in [(3,), 2]', engine=self.engine,
14651465
parser=self.parser)
1466-
self.assertTrue(res)
1466+
assert res
14671467

14681468
res = pd.eval('(3,) not in [(3,), 2]', engine=self.engine,
14691469
parser=self.parser)
14701470
assert not res
14711471

14721472
res = pd.eval('[(3,)] in [[(3,)], 2]', engine=self.engine,
14731473
parser=self.parser)
1474-
self.assertTrue(res)
1474+
assert res
14751475
else:
14761476
with pytest.raises(NotImplementedError):
14771477
pd.eval('1 in [1, 2]', engine=self.engine, parser=self.parser)

pandas/tests/dtypes/test_cast.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -161,27 +161,27 @@ class TestMaybe(tm.TestCase):
161161
def test_maybe_convert_string_to_array(self):
162162
result = maybe_convert_string_to_object('x')
163163
tm.assert_numpy_array_equal(result, np.array(['x'], dtype=object))
164-
self.assertTrue(result.dtype == object)
164+
assert result.dtype == object
165165

166166
result = maybe_convert_string_to_object(1)
167167
self.assertEqual(result, 1)
168168

169169
arr = np.array(['x', 'y'], dtype=str)
170170
result = maybe_convert_string_to_object(arr)
171171
tm.assert_numpy_array_equal(result, np.array(['x', 'y'], dtype=object))
172-
self.assertTrue(result.dtype == object)
172+
assert result.dtype == object
173173

174174
# unicode
175175
arr = np.array(['x', 'y']).astype('U')
176176
result = maybe_convert_string_to_object(arr)
177177
tm.assert_numpy_array_equal(result, np.array(['x', 'y'], dtype=object))
178-
self.assertTrue(result.dtype == object)
178+
assert result.dtype == object
179179

180180
# object
181181
arr = np.array(['x', 2], dtype=object)
182182
result = maybe_convert_string_to_object(arr)
183183
tm.assert_numpy_array_equal(result, np.array(['x', 2], dtype=object))
184-
self.assertTrue(result.dtype == object)
184+
assert result.dtype == object
185185

186186
def test_maybe_convert_scalar(self):
187187

@@ -220,17 +220,17 @@ def test_maybe_convert_objects_copy(self):
220220
values = np.array([1, 2])
221221

222222
out = maybe_convert_objects(values, copy=False)
223-
self.assertTrue(values is out)
223+
assert values is out
224224

225225
out = maybe_convert_objects(values, copy=True)
226-
self.assertTrue(values is not out)
226+
assert values is not out
227227

228228
values = np.array(['apply', 'banana'])
229229
out = maybe_convert_objects(values, copy=False)
230-
self.assertTrue(values is out)
230+
assert values is out
231231

232232
out = maybe_convert_objects(values, copy=True)
233-
self.assertTrue(values is not out)
233+
assert values is not out
234234

235235

236236
class TestCommonTypes(tm.TestCase):

0 commit comments

Comments
 (0)