Skip to content

Commit 0df329c

Browse files
committed
separate tests for dataframe/series slices
1 parent e1cafd4 commit 0df329c

File tree

1 file changed

+24
-16
lines changed

1 file changed

+24
-16
lines changed

pandas/tests/groupby/test_groupby_dropna.py

+24-16
Original file line numberDiff line numberDiff line change
@@ -163,32 +163,40 @@ def test_groupby_dropna_series_by(dropna, expected):
163163

164164

165165
@pytest.mark.parametrize(
166-
"dropna,df_expected,s_expected",
166+
"dropna,expected",
167167
[
168-
(True, pd.DataFrame({"B": [2, 2, 1]}), pd.Series(data=[2, 2, 1], name="B"),),
169-
(
170-
False,
171-
pd.DataFrame({"B": [2, 2, 1, 1]}),
172-
pd.Series(data=[2, 2, 1, 1], name="B"),
173-
),
168+
(True, pd.DataFrame({"B": [2, 2, 1]})),
169+
(False, pd.DataFrame({"B": [2, 2, 1, 1]})),
174170
],
175171
)
176-
def test_slice_groupby_then_transform(dropna, df_expected, s_expected):
172+
def test_groupby_dataframe_slice_then_transform(dropna, expected):
177173
# GH35014 & GH35612
178174

179175
df = pd.DataFrame({"A": [0, 0, 1, None], "B": [1, 2, 3, None]})
180176
gb = df.groupby("A", dropna=dropna)
181177

182-
res = gb.transform(len)
183-
tm.assert_frame_equal(res, df_expected)
178+
result = gb.transform(len)
179+
tm.assert_frame_equal(result, expected)
180+
181+
result = gb[["B"]].transform(len)
182+
tm.assert_frame_equal(result, expected)
183+
184+
185+
@pytest.mark.parametrize(
186+
"dropna,expected",
187+
[
188+
(True, pd.Series(data=[2, 2, 1], name="B")),
189+
(False, pd.Series(data=[2, 2, 1, 1], name="B")),
190+
],
191+
)
192+
def test_groupby_series_slice_then_transform_(dropna, expected):
193+
# GH35014 & GH35612
184194

185-
gb_slice = gb[["B"]]
186-
res = gb_slice.transform(len)
187-
tm.assert_frame_equal(res, df_expected)
195+
df = pd.DataFrame({"A": [0, 0, 1, None], "B": [1, 2, 3, None]})
196+
gb = df.groupby("A", dropna=dropna)
188197

189-
gb_slice = gb["B"]
190-
res = gb["B"].transform(len)
191-
tm.assert_series_equal(res, s_expected)
198+
result = gb["B"].transform(len)
199+
tm.assert_series_equal(result, expected)
192200

193201

194202
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)