Skip to content

Commit ebd3d5d

Browse files
committed
collect test_between
1 parent bd475c2 commit ebd3d5d

File tree

3 files changed

+35
-21
lines changed

3 files changed

+35
-21
lines changed

pandas/tests/series/test_between.py

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import numpy as np
2+
3+
from pandas import Series, bdate_range, date_range, period_range
4+
import pandas._testing as tm
5+
6+
7+
class TestBetween:
8+
9+
# TODO: redundant with test_between_datetime_values?
10+
def test_between(self):
11+
series = Series(date_range("1/1/2000", periods=10))
12+
left, right = series[[2, 7]]
13+
14+
result = series.between(left, right)
15+
expected = (series >= left) & (series <= right)
16+
tm.assert_series_equal(result, expected)
17+
18+
def test_between_datetime_values(self):
19+
ser = Series(bdate_range("1/1/2000", periods=20).astype(object))
20+
ser[::2] = np.nan
21+
22+
result = ser[ser.between(ser[3], ser[17])]
23+
expected = ser[3:18].dropna()
24+
tm.assert_series_equal(result, expected)
25+
26+
result = ser[ser.between(ser[3], ser[17], inclusive=False)]
27+
expected = ser[5:16].dropna()
28+
tm.assert_series_equal(result, expected)
29+
30+
def test_between_period_values(self):
31+
ser = Series(period_range("2000-01-01", periods=10, freq="D"))
32+
left, right = ser[[2, 7]]
33+
result = ser.between(left, right)
34+
expected = (ser >= left) & (ser <= right)
35+
tm.assert_series_equal(result, expected)

pandas/tests/series/test_datetime_values.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
PeriodIndex,
2020
Series,
2121
TimedeltaIndex,
22-
bdate_range,
2322
date_range,
2423
period_range,
2524
timedelta_range,
@@ -622,18 +621,6 @@ def test_dt_accessor_updates_on_inplace(self):
622621
result = s.dt.date
623622
assert result[0] == result[2]
624623

625-
def test_between(self):
626-
s = Series(bdate_range("1/1/2000", periods=20).astype(object))
627-
s[::2] = np.nan
628-
629-
result = s[s.between(s[3], s[17])]
630-
expected = s[3:18].dropna()
631-
tm.assert_series_equal(result, expected)
632-
633-
result = s[s.between(s[3], s[17], inclusive=False)]
634-
expected = s[5:16].dropna()
635-
tm.assert_series_equal(result, expected)
636-
637624
def test_date_tz(self):
638625
# GH11757
639626
rng = pd.DatetimeIndex(

pandas/tests/series/test_timeseries.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -430,14 +430,6 @@ def test_at_time_raises(self):
430430
with pytest.raises(TypeError, match=msg):
431431
ser.at_time("00:00")
432432

433-
def test_between(self):
434-
series = Series(date_range("1/1/2000", periods=10))
435-
left, right = series[[2, 7]]
436-
437-
result = series.between(left, right)
438-
expected = (series >= left) & (series <= right)
439-
tm.assert_series_equal(result, expected)
440-
441433
def test_between_time(self):
442434
rng = date_range("1/1/2000", "1/5/2000", freq="5min")
443435
ts = Series(np.random.randn(len(rng)), index=rng)

0 commit comments

Comments
 (0)