Skip to content

Commit b3938f3

Browse files
gfyoungpcluo
authored andcommitted
MAINT: Remove self.assertFalse from testing (pandas-dev#16151)
1 parent 41f7b80 commit b3938f3

Some content is hidden

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

85 files changed

+704
-723
lines changed

pandas/tests/computation/test_eval.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,7 @@ def test_simple_in_ops(self):
14431443

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

14481448
res = pd.eval('3 not in (1, 2)', engine=self.engine,
14491449
parser=self.parser)
@@ -1467,7 +1467,7 @@ def test_simple_in_ops(self):
14671467

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

14721472
res = pd.eval('[(3,)] in [[(3,)], 2]', engine=self.engine,
14731473
parser=self.parser)

pandas/tests/dtypes/test_dtypes.py

+59-61
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def test_hash_vs_equality(self):
5959
def test_equality(self):
6060
self.assertTrue(is_dtype_equal(self.dtype, 'category'))
6161
self.assertTrue(is_dtype_equal(self.dtype, CategoricalDtype()))
62-
self.assertFalse(is_dtype_equal(self.dtype, 'foo'))
62+
assert not is_dtype_equal(self.dtype, 'foo')
6363

6464
def test_construction_from_string(self):
6565
result = CategoricalDtype.construct_from_string('category')
@@ -71,8 +71,8 @@ def test_is_dtype(self):
7171
self.assertTrue(CategoricalDtype.is_dtype(self.dtype))
7272
self.assertTrue(CategoricalDtype.is_dtype('category'))
7373
self.assertTrue(CategoricalDtype.is_dtype(CategoricalDtype()))
74-
self.assertFalse(CategoricalDtype.is_dtype('foo'))
75-
self.assertFalse(CategoricalDtype.is_dtype(np.float64))
74+
assert not CategoricalDtype.is_dtype('foo')
75+
assert not CategoricalDtype.is_dtype(np.float64)
7676

7777
def test_basic(self):
7878

@@ -85,12 +85,12 @@ def test_basic(self):
8585
# dtypes
8686
self.assertTrue(is_categorical_dtype(s.dtype))
8787
self.assertTrue(is_categorical_dtype(s))
88-
self.assertFalse(is_categorical_dtype(np.dtype('float64')))
88+
assert not is_categorical_dtype(np.dtype('float64'))
8989

9090
self.assertTrue(is_categorical(s.dtype))
9191
self.assertTrue(is_categorical(s))
92-
self.assertFalse(is_categorical(np.dtype('float64')))
93-
self.assertFalse(is_categorical(1.0))
92+
assert not is_categorical(np.dtype('float64'))
93+
assert not is_categorical(1.0)
9494

9595

9696
class TestDatetimeTZDtype(Base, tm.TestCase):
@@ -136,8 +136,8 @@ def test_compat(self):
136136
self.assertTrue(is_datetime64_any_dtype('datetime64[ns, US/Eastern]'))
137137
self.assertTrue(is_datetime64_ns_dtype(self.dtype))
138138
self.assertTrue(is_datetime64_ns_dtype('datetime64[ns, US/Eastern]'))
139-
self.assertFalse(is_datetime64_dtype(self.dtype))
140-
self.assertFalse(is_datetime64_dtype('datetime64[ns, US/Eastern]'))
139+
assert not is_datetime64_dtype(self.dtype)
140+
assert not is_datetime64_dtype('datetime64[ns, US/Eastern]')
141141

142142
def test_construction_from_string(self):
143143
result = DatetimeTZDtype('datetime64[ns, US/Eastern]')
@@ -149,25 +149,23 @@ def test_construction_from_string(self):
149149
lambda: DatetimeTZDtype.construct_from_string('foo'))
150150

151151
def test_is_dtype(self):
152-
self.assertFalse(DatetimeTZDtype.is_dtype(None))
152+
assert not DatetimeTZDtype.is_dtype(None)
153153
self.assertTrue(DatetimeTZDtype.is_dtype(self.dtype))
154154
self.assertTrue(DatetimeTZDtype.is_dtype('datetime64[ns, US/Eastern]'))
155-
self.assertFalse(DatetimeTZDtype.is_dtype('foo'))
155+
assert not DatetimeTZDtype.is_dtype('foo')
156156
self.assertTrue(DatetimeTZDtype.is_dtype(DatetimeTZDtype(
157157
'ns', 'US/Pacific')))
158-
self.assertFalse(DatetimeTZDtype.is_dtype(np.float64))
158+
assert not DatetimeTZDtype.is_dtype(np.float64)
159159

160160
def test_equality(self):
161161
self.assertTrue(is_dtype_equal(self.dtype,
162162
'datetime64[ns, US/Eastern]'))
163163
self.assertTrue(is_dtype_equal(self.dtype, DatetimeTZDtype(
164164
'ns', 'US/Eastern')))
165-
self.assertFalse(is_dtype_equal(self.dtype, 'foo'))
166-
self.assertFalse(is_dtype_equal(self.dtype, DatetimeTZDtype('ns',
167-
'CET')))
168-
self.assertFalse(is_dtype_equal(
169-
DatetimeTZDtype('ns', 'US/Eastern'), DatetimeTZDtype(
170-
'ns', 'US/Pacific')))
165+
assert not is_dtype_equal(self.dtype, 'foo')
166+
assert not is_dtype_equal(self.dtype, DatetimeTZDtype('ns', 'CET'))
167+
assert not is_dtype_equal(DatetimeTZDtype('ns', 'US/Eastern'),
168+
DatetimeTZDtype('ns', 'US/Pacific'))
171169

172170
# numpy compat
173171
self.assertTrue(is_dtype_equal(np.dtype("M8[ns]"), "datetime64[ns]"))
@@ -182,13 +180,13 @@ def test_basic(self):
182180
# dtypes
183181
self.assertTrue(is_datetime64tz_dtype(s.dtype))
184182
self.assertTrue(is_datetime64tz_dtype(s))
185-
self.assertFalse(is_datetime64tz_dtype(np.dtype('float64')))
186-
self.assertFalse(is_datetime64tz_dtype(1.0))
183+
assert not is_datetime64tz_dtype(np.dtype('float64'))
184+
assert not is_datetime64tz_dtype(1.0)
187185

188186
self.assertTrue(is_datetimetz(s))
189187
self.assertTrue(is_datetimetz(s.dtype))
190-
self.assertFalse(is_datetimetz(np.dtype('float64')))
191-
self.assertFalse(is_datetimetz(1.0))
188+
assert not is_datetimetz(np.dtype('float64'))
189+
assert not is_datetimetz(1.0)
192190

193191
def test_dst(self):
194192

@@ -265,10 +263,10 @@ def test_coerce_to_dtype(self):
265263
PeriodDtype('period[3M]'))
266264

267265
def test_compat(self):
268-
self.assertFalse(is_datetime64_ns_dtype(self.dtype))
269-
self.assertFalse(is_datetime64_ns_dtype('period[D]'))
270-
self.assertFalse(is_datetime64_dtype(self.dtype))
271-
self.assertFalse(is_datetime64_dtype('period[D]'))
266+
assert not is_datetime64_ns_dtype(self.dtype)
267+
assert not is_datetime64_ns_dtype('period[D]')
268+
assert not is_datetime64_dtype(self.dtype)
269+
assert not is_datetime64_dtype('period[D]')
272270

273271
def test_construction_from_string(self):
274272
result = PeriodDtype('period[D]')
@@ -297,23 +295,23 @@ def test_is_dtype(self):
297295
self.assertTrue(PeriodDtype.is_dtype(PeriodDtype('U')))
298296
self.assertTrue(PeriodDtype.is_dtype(PeriodDtype('S')))
299297

300-
self.assertFalse(PeriodDtype.is_dtype('D'))
301-
self.assertFalse(PeriodDtype.is_dtype('3D'))
302-
self.assertFalse(PeriodDtype.is_dtype('U'))
303-
self.assertFalse(PeriodDtype.is_dtype('S'))
304-
self.assertFalse(PeriodDtype.is_dtype('foo'))
305-
self.assertFalse(PeriodDtype.is_dtype(np.object_))
306-
self.assertFalse(PeriodDtype.is_dtype(np.int64))
307-
self.assertFalse(PeriodDtype.is_dtype(np.float64))
298+
assert not PeriodDtype.is_dtype('D')
299+
assert not PeriodDtype.is_dtype('3D')
300+
assert not PeriodDtype.is_dtype('U')
301+
assert not PeriodDtype.is_dtype('S')
302+
assert not PeriodDtype.is_dtype('foo')
303+
assert not PeriodDtype.is_dtype(np.object_)
304+
assert not PeriodDtype.is_dtype(np.int64)
305+
assert not PeriodDtype.is_dtype(np.float64)
308306

309307
def test_equality(self):
310308
self.assertTrue(is_dtype_equal(self.dtype, 'period[D]'))
311309
self.assertTrue(is_dtype_equal(self.dtype, PeriodDtype('D')))
312310
self.assertTrue(is_dtype_equal(self.dtype, PeriodDtype('D')))
313311
self.assertTrue(is_dtype_equal(PeriodDtype('D'), PeriodDtype('D')))
314312

315-
self.assertFalse(is_dtype_equal(self.dtype, 'D'))
316-
self.assertFalse(is_dtype_equal(PeriodDtype('D'), PeriodDtype('2D')))
313+
assert not is_dtype_equal(self.dtype, 'D')
314+
assert not is_dtype_equal(PeriodDtype('D'), PeriodDtype('2D'))
317315

318316
def test_basic(self):
319317
self.assertTrue(is_period_dtype(self.dtype))
@@ -328,14 +326,14 @@ def test_basic(self):
328326
# dtypes
329327
# series results in object dtype currently,
330328
# is_period checks period_arraylike
331-
self.assertFalse(is_period_dtype(s.dtype))
332-
self.assertFalse(is_period_dtype(s))
329+
assert not is_period_dtype(s.dtype)
330+
assert not is_period_dtype(s)
333331
self.assertTrue(is_period(s))
334332

335-
self.assertFalse(is_period_dtype(np.dtype('float64')))
336-
self.assertFalse(is_period_dtype(1.0))
337-
self.assertFalse(is_period(np.dtype('float64')))
338-
self.assertFalse(is_period(1.0))
333+
assert not is_period_dtype(np.dtype('float64'))
334+
assert not is_period_dtype(1.0)
335+
assert not is_period(np.dtype('float64'))
336+
assert not is_period(1.0)
339337

340338
def test_empty(self):
341339
dt = PeriodDtype()
@@ -344,7 +342,7 @@ def test_empty(self):
344342

345343
def test_not_string(self):
346344
# though PeriodDtype has object kind, it cannot be string
347-
self.assertFalse(is_string_dtype(PeriodDtype('D')))
345+
assert not is_string_dtype(PeriodDtype('D'))
348346

349347

350348
class TestIntervalDtype(Base, tm.TestCase):
@@ -388,14 +386,14 @@ def test_is_dtype(self):
388386
self.assertTrue(IntervalDtype.is_dtype(IntervalDtype('int64')))
389387
self.assertTrue(IntervalDtype.is_dtype(IntervalDtype(np.int64)))
390388

391-
self.assertFalse(IntervalDtype.is_dtype('D'))
392-
self.assertFalse(IntervalDtype.is_dtype('3D'))
393-
self.assertFalse(IntervalDtype.is_dtype('U'))
394-
self.assertFalse(IntervalDtype.is_dtype('S'))
395-
self.assertFalse(IntervalDtype.is_dtype('foo'))
396-
self.assertFalse(IntervalDtype.is_dtype(np.object_))
397-
self.assertFalse(IntervalDtype.is_dtype(np.int64))
398-
self.assertFalse(IntervalDtype.is_dtype(np.float64))
389+
assert not IntervalDtype.is_dtype('D')
390+
assert not IntervalDtype.is_dtype('3D')
391+
assert not IntervalDtype.is_dtype('U')
392+
assert not IntervalDtype.is_dtype('S')
393+
assert not IntervalDtype.is_dtype('foo')
394+
assert not IntervalDtype.is_dtype(np.object_)
395+
assert not IntervalDtype.is_dtype(np.int64)
396+
assert not IntervalDtype.is_dtype(np.float64)
399397

400398
def test_identity(self):
401399
self.assertEqual(IntervalDtype('interval[int64]'),
@@ -424,9 +422,9 @@ def test_equality(self):
424422
self.assertTrue(is_dtype_equal(IntervalDtype('int64'),
425423
IntervalDtype('int64')))
426424

427-
self.assertFalse(is_dtype_equal(self.dtype, 'int64'))
428-
self.assertFalse(is_dtype_equal(IntervalDtype('int64'),
429-
IntervalDtype('float64')))
425+
assert not is_dtype_equal(self.dtype, 'int64')
426+
assert not is_dtype_equal(IntervalDtype('int64'),
427+
IntervalDtype('float64'))
430428

431429
def test_basic(self):
432430
self.assertTrue(is_interval_dtype(self.dtype))
@@ -440,8 +438,8 @@ def test_basic(self):
440438

441439
# dtypes
442440
# series results in object dtype currently,
443-
self.assertFalse(is_interval_dtype(s.dtype))
444-
self.assertFalse(is_interval_dtype(s))
441+
assert not is_interval_dtype(s.dtype)
442+
assert not is_interval_dtype(s)
445443

446444
def test_basic_dtype(self):
447445
self.assertTrue(is_interval_dtype('interval[int64]'))
@@ -450,9 +448,9 @@ def test_basic_dtype(self):
450448
(IntervalIndex.from_breaks(np.arange(4))))
451449
self.assertTrue(is_interval_dtype(
452450
IntervalIndex.from_breaks(date_range('20130101', periods=3))))
453-
self.assertFalse(is_interval_dtype('U'))
454-
self.assertFalse(is_interval_dtype('S'))
455-
self.assertFalse(is_interval_dtype('foo'))
456-
self.assertFalse(is_interval_dtype(np.object_))
457-
self.assertFalse(is_interval_dtype(np.int64))
458-
self.assertFalse(is_interval_dtype(np.float64))
451+
assert not is_interval_dtype('U')
452+
assert not is_interval_dtype('S')
453+
assert not is_interval_dtype('foo')
454+
assert not is_interval_dtype(np.object_)
455+
assert not is_interval_dtype(np.int64)
456+
assert not is_interval_dtype(np.float64)

0 commit comments

Comments
 (0)