Skip to content

Commit 6f4c3cd

Browse files
bwignally-p
authored and
y-p
committed
CLN: test_resample, specialize assert_
GH6175: replacing "assert_" with specialized forms of assert. WIP: calls with assert_( (...).all() ) have not been changed.
1 parent bf3bef6 commit 6f4c3cd

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

pandas/tseries/tests/test_resample.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def test_resample_basic(self):
9090
expected = Series([s[0], s[1:6].mean(), s[6:11].mean(), s[11:].mean()],
9191
index=date_range('1/1/2000', periods=4, freq='5min'))
9292
assert_series_equal(result, expected)
93-
self.assert_(result.index.name == 'index')
93+
self.assertEqual(result.index.name, 'index')
9494

9595
result = s.resample('5min', how='mean', closed='left', label='right')
9696
expected = Series([s[:5].mean(), s[5:10].mean(), s[10:].mean()],
@@ -158,7 +158,7 @@ def test_resample_basic_from_daily(self):
158158
self.assertEquals(result.irow(0), s['1/2/2005'])
159159
self.assertEquals(result.irow(1), s['1/3/2005'])
160160
self.assertEquals(result.irow(5), s['1/9/2005'])
161-
self.assert_(result.index.name == 'index')
161+
self.assertEqual(result.index.name, 'index')
162162

163163
def test_resample_frame_basic(self):
164164
df = tm.makeTimeDataFrame()
@@ -201,7 +201,7 @@ def test_resample_loffset(self):
201201
loffset=Minute(1))
202202
assert_series_equal(result, expected)
203203

204-
self.assert_(result.index.freq == Minute(5))
204+
self.assertEqual(result.index.freq, Minute(5))
205205

206206
# from daily
207207
dti = DatetimeIndex(
@@ -228,7 +228,7 @@ def test_resample_upsample(self):
228228
self.assertEquals(result[0], s[0])
229229
self.assertEquals(result[-1], s[-1])
230230

231-
self.assert_(result.index.name == 'index')
231+
self.assertEqual(result.index.name, 'index')
232232

233233
def test_upsample_with_limit(self):
234234
rng = date_range('1/1/2000', periods=3, freq='5t')
@@ -305,7 +305,7 @@ def test_resample_reresample(self):
305305
result = bs.resample('8H')
306306
self.assertEquals(len(result), 22)
307307
tm.assert_isinstance(result.index.freq, offsets.DateOffset)
308-
self.assert_(result.index.freq == offsets.Hour(8))
308+
self.assertEqual(result.index.freq, offsets.Hour(8))
309309

310310
def test_resample_timestamp_to_period(self):
311311
ts = _simple_ts('1/1/1990', '1/1/2000')
@@ -491,12 +491,12 @@ def test_resample_empty(self):
491491
ts = _simple_ts('1/1/2000', '2/1/2000')[:0]
492492

493493
result = ts.resample('A')
494-
self.assert_(len(result) == 0)
495-
self.assert_(result.index.freqstr == 'A-DEC')
494+
self.assertEqual(len(result), 0)
495+
self.assertEqual(result.index.freqstr, 'A-DEC')
496496

497497
result = ts.resample('A', kind='period')
498-
self.assert_(len(result) == 0)
499-
self.assert_(result.index.freqstr == 'A-DEC')
498+
self.assertEqual(len(result), 0)
499+
self.assertEqual(result.index.freqstr, 'A-DEC')
500500

501501
xp = DataFrame()
502502
rs = xp.resample('A')
@@ -549,7 +549,7 @@ def test_resample_anchored_intraday(self):
549549

550550
ts = _simple_ts('2012-04-29 23:00', '2012-04-30 5:00', freq='h')
551551
resampled = ts.resample('M')
552-
self.assert_(len(resampled) == 1)
552+
self.assertEqual(len(resampled), 1)
553553

554554
def test_resample_anchored_monthstart(self):
555555
ts = _simple_ts('1/1/2000', '12/31/2002')
@@ -572,13 +572,13 @@ def test_corner_cases(self):
572572
len0pts = _simple_pts('2007-01', '2010-05', freq='M')[:0]
573573
# it works
574574
result = len0pts.resample('A-DEC')
575-
self.assert_(len(result) == 0)
575+
self.assertEqual(len(result), 0)
576576

577577
# resample to periods
578578
ts = _simple_ts('2000-04-28', '2000-04-30 11:00', freq='h')
579579
result = ts.resample('M', kind='period')
580-
self.assert_(len(result) == 1)
581-
self.assert_(result.index[0] == Period('2000-04', freq='M'))
580+
self.assertEqual(len(result), 1)
581+
self.assertEqual(result.index[0], Period('2000-04', freq='M'))
582582

583583
def test_anchored_lowercase_buglet(self):
584584
dates = date_range('4/16/2012 20:00', periods=50000, freq='s')
@@ -889,7 +889,7 @@ def test_resample_empty(self):
889889
ts = _simple_pts('1/1/2000', '2/1/2000')[:0]
890890

891891
result = ts.resample('A')
892-
self.assert_(len(result) == 0)
892+
self.assertEqual(len(result), 0)
893893

894894
def test_resample_irregular_sparse(self):
895895
dr = date_range(start='1/1/2012', freq='5min', periods=1000)

0 commit comments

Comments
 (0)