Skip to content

Commit ba79d37

Browse files
replaced test_data fixture with more granular fixtures in pandas/tests/series/indexing/test_loc.py
1 parent 45b82e4 commit ba79d37

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

pandas/tests/series/indexing/test_loc.py

+32-32
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@ def test_loc_uint64(val, expected):
1313
assert s.loc[val] == expected
1414

1515

16-
def test_loc_getitem(test_data):
17-
inds = test_data.series.index[[3, 4, 7]]
18-
assert_series_equal(test_data.series.loc[inds], test_data.series.reindex(inds))
19-
assert_series_equal(test_data.series.iloc[5::2], test_data.series[5::2])
16+
def test_loc_getitem(string_series, datetime_series):
17+
inds = string_series.index[[3, 4, 7]]
18+
assert_series_equal(string_series.loc[inds], string_series.reindex(inds))
19+
assert_series_equal(string_series.iloc[5::2], string_series[5::2])
2020

2121
# slice with indices
22-
d1, d2 = test_data.ts.index[[5, 15]]
23-
result = test_data.ts.loc[d1:d2]
24-
expected = test_data.ts.truncate(d1, d2)
22+
d1, d2 = datetime_series.index[[5, 15]]
23+
result = datetime_series.loc[d1:d2]
24+
expected = datetime_series.truncate(d1, d2)
2525
assert_series_equal(result, expected)
2626

2727
# boolean
28-
mask = test_data.series > test_data.series.median()
29-
assert_series_equal(test_data.series.loc[mask], test_data.series[mask])
28+
mask = string_series > string_series.median()
29+
assert_series_equal(string_series.loc[mask], string_series[mask])
3030

3131
# ask for index value
32-
assert test_data.ts.loc[d1] == test_data.ts[d1]
33-
assert test_data.ts.loc[d2] == test_data.ts[d2]
32+
assert datetime_series.loc[d1] == datetime_series[d1]
33+
assert datetime_series.loc[d2] == datetime_series[d2]
3434

3535

36-
def test_loc_getitem_not_monotonic(test_data):
37-
d1, d2 = test_data.ts.index[[5, 15]]
36+
def test_loc_getitem_not_monotonic(datetime_series):
37+
d1, d2 = datetime_series.index[[5, 15]]
3838

39-
ts2 = test_data.ts[::2][[1, 2, 0]]
39+
ts2 = datetime_series[::2][[1, 2, 0]]
4040

4141
msg = r"Timestamp\('2000-01-10 00:00:00'\)"
4242
with pytest.raises(KeyError, match=msg):
@@ -73,41 +73,41 @@ def test_loc_getitem_setitem_integer_slice_keyerrors():
7373
s2.loc[3:11] = 0
7474

7575

76-
def test_loc_getitem_iterator(test_data):
77-
idx = iter(test_data.series.index[:10])
78-
result = test_data.series.loc[idx]
79-
assert_series_equal(result, test_data.series[:10])
76+
def test_loc_getitem_iterator(string_series):
77+
idx = iter(string_series.index[:10])
78+
result = string_series.loc[idx]
79+
assert_series_equal(result, string_series[:10])
8080

8181

82-
def test_loc_setitem_boolean(test_data):
83-
mask = test_data.series > test_data.series.median()
82+
def test_loc_setitem_boolean(string_series):
83+
mask = string_series > string_series.median()
8484

85-
result = test_data.series.copy()
85+
result = string_series.copy()
8686
result.loc[mask] = 0
87-
expected = test_data.series
87+
expected = string_series
8888
expected[mask] = 0
8989
assert_series_equal(result, expected)
9090

9191

92-
def test_loc_setitem_corner(test_data):
93-
inds = list(test_data.series.index[[5, 8, 12]])
94-
test_data.series.loc[inds] = 5
92+
def test_loc_setitem_corner(string_series):
93+
inds = list(string_series.index[[5, 8, 12]])
94+
string_series.loc[inds] = 5
9595
msg = r"\['foo'\] not in index"
9696
with pytest.raises(KeyError, match=msg):
97-
test_data.series.loc[inds + ["foo"]] = 5
97+
string_series.loc[inds + ["foo"]] = 5
9898

9999

100-
def test_basic_setitem_with_labels(test_data):
101-
indices = test_data.ts.index[[5, 10, 15]]
100+
def test_basic_setitem_with_labels(datetime_series):
101+
indices = datetime_series.index[[5, 10, 15]]
102102

103-
cp = test_data.ts.copy()
104-
exp = test_data.ts.copy()
103+
cp = datetime_series.copy()
104+
exp = datetime_series.copy()
105105
cp[indices] = 0
106106
exp.loc[indices] = 0
107107
assert_series_equal(cp, exp)
108108

109-
cp = test_data.ts.copy()
110-
exp = test_data.ts.copy()
109+
cp = datetime_series.copy()
110+
exp = datetime_series.copy()
111111
cp[indices[0] : indices[2]] = 0
112112
exp.loc[indices[0] : indices[2]] = 0
113113
assert_series_equal(cp, exp)

0 commit comments

Comments
 (0)