Skip to content

Commit 522a0ac

Browse files
committed
Moved test case into proper file
1 parent c60a6ed commit 522a0ac

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

pandas/tests/test_tseries.py

-9
Original file line numberDiff line numberDiff line change
@@ -423,15 +423,6 @@ def test_series_bin_grouper():
423423
exp_counts = np.array([3, 3, 4], dtype=np.int64)
424424
assert_almost_equal(counts, exp_counts)
425425

426-
def test_resample_with_timedeltaindex():
427-
from pandas import DataFrame
428-
from pandas import timedelta_range
429-
430-
df = DataFrame(np.random.normal(size = (100, 4)))
431-
df.index = timedelta_range(start='0s', periods=100, freq='s')
432-
resample = df.resample('10s', base = 5)
433-
assert_almost_equal(resample.index[0].seconds, 5)
434-
435426
class TestBinGroupers(tm.TestCase):
436427
_multiprocess_can_split_ = True
437428

pandas/tseries/tests/test_resample.py

+15
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from pandas.core.groupby import DataError
1313
from pandas.tseries.index import date_range
14+
from pandas.tseries.tdi import timedelta_range
1415
from pandas.tseries.offsets import Minute, BDay
1516
from pandas.tseries.period import period_range, PeriodIndex, Period
1617
from pandas.tseries.resample import DatetimeIndex, TimeGrouper
@@ -625,8 +626,22 @@ def test_resample_base(self):
625626
resampled = ts.resample('5min', base=2)
626627
exp_rng = date_range('12/31/1999 23:57:00', '1/1/2000 01:57',
627628
freq='5min')
629+
628630
self.assertTrue(resampled.index.equals(exp_rng))
629631

632+
def test_resample_base_with_timedeltaindex(self):
633+
rng = timedelta_range(start = '0s', periods = 25, freq = 's')
634+
ts = Series(np.random.randn(len(rng)), index = rng)
635+
636+
with_base = ts.resample('10s', base = 5)
637+
without_base = ts.resample('10s')
638+
639+
exp_without_base = timedelta_range(start = '5s', end = '25s', freq = '10s')
640+
exp_with_base = timedelta_range(start = '5s', end = '25s', freq = '10s')
641+
642+
self.assertTrue(with_base.index.equals(exp_with_base))
643+
self.assertTrue(without_base.index.equal(exp_without_base))
644+
630645
def test_resample_daily_anchored(self):
631646
rng = date_range('1/1/2000 0:00:00', periods=10000, freq='T')
632647
ts = Series(np.random.randn(len(rng)), index=rng)

0 commit comments

Comments
 (0)