Skip to content

Commit 6d95b3a

Browse files
committed
Refactor tests and move to correct file
1 parent 8e802dc commit 6d95b3a

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

pandas/tests/frame/test_timeseries.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -325,19 +325,12 @@ def test_asfreq_datetimeindex(self):
325325

326326
def test_asfreq_datetimeindex_empty_series(self):
327327
# GH 14340
328-
329-
# DatetimeIndex
330-
expected = Series(index=pd.DatetimeIndex(["2016-09-29 11:00"])).asfreq('H')
328+
expected = Series(index=pd.DatetimeIndex(
329+
["2016-09-29 11:00"])).asfreq('H')
331330
result = Series(index=pd.DatetimeIndex(["2016-09-29 11:00"]),
332331
data=[3]).asfreq('H')
333332
self.assert_index_equal(expected.index, result.index)
334333

335-
# PeriodIndex
336-
expected = Series(index=pd.PeriodIndex(['2011-1', '2011-2', '2011-3'], freq='M')).asfreq('M')
337-
result = Series(index=pd.PeriodIndex(['2011-1', '2011-2', '2011-3'], freq='M'),
338-
data=[3]).asfreq('M')
339-
self.assert_index_equal(expected.index, result.index)
340-
341334
def test_first_last_valid(self):
342335
N = len(self.frame.index)
343336
mat = randn(N)

pandas/tseries/tests/test_period.py

+8
Original file line numberDiff line numberDiff line change
@@ -1596,6 +1596,14 @@ def test_asfreq_mult(self):
15961596
self.assertEqual(result.ordinal, expected.ordinal)
15971597
self.assertEqual(result.freq, expected.freq)
15981598

1599+
def test_asfreq_period_empty_series(self):
1600+
# GH 14340
1601+
expected = Series(index=pd.PeriodIndex(['2011-1', '2011-2', '2011-3'],
1602+
freq='M')).asfreq('M')
1603+
result = Series(index=pd.PeriodIndex(['2011-1', '2011-2', '2011-3'],
1604+
freq='M'), data=[3]).asfreq('M')
1605+
self.assert_index_equal(expected.index, result.index)
1606+
15991607
def test_asfreq_combined(self):
16001608
# normal freq to combined freq
16011609
p = Period('2007', freq='H')

0 commit comments

Comments
 (0)