Skip to content

Commit 00181c9

Browse files
committed
Compare resulting DataFrame in tests
1 parent 579d8e2 commit 00181c9

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

pandas/tests/extension/base/groupby.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,18 @@ def test_groupby_extension_agg(self, as_index, data_for_grouping):
3636
def test_groupby_agg_extension(self, data_for_grouping):
3737
# GH#38980 groupby agg on extension type fails for non-numeric types
3838
df = pd.DataFrame({"A": [1, 1, 2, 2, 3, 3, 1, 4], "B": data_for_grouping})
39-
result = df.groupby("A").agg({"B": "first"}).B.array
4039

41-
expected = df["B"].iloc[[0, 2, 4, 7]].array
40+
expected = df.iloc[[0, 2, 4, 7]]
41+
expected = expected.set_index("A")
4242

43-
self.assert_extension_array_equal(result, expected)
43+
result = df.groupby("A").agg({"B": "first"})
44+
self.assert_frame_equal(result, expected)
45+
46+
result = df.groupby("A").agg("first")
47+
self.assert_frame_equal(result, expected)
48+
49+
result = df.groupby("A").first()
50+
self.assert_frame_equal(result, expected)
4451

4552
def test_groupby_extension_no_sort(self, data_for_grouping):
4653
df = pd.DataFrame({"A": [1, 1, 2, 2, 3, 3, 1, 4], "B": data_for_grouping})

pandas/tests/extension/test_boolean.py

+10-3
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,18 @@ def test_groupby_extension_agg(self, as_index, data_for_grouping):
294294
def test_groupby_agg_extension(self, data_for_grouping):
295295
# GH#38980 groupby agg on extension type fails for non-numeric types
296296
df = pd.DataFrame({"A": [1, 1, 2, 2, 3, 3, 1], "B": data_for_grouping})
297-
result = df.groupby("A").agg({"B": "first"}).B.array
298297

299-
expected = df["B"].iloc[[0, 2, 4]].array
298+
expected = df.iloc[[0, 2, 4]]
299+
expected = expected.set_index("A")
300300

301-
self.assert_extension_array_equal(result, expected)
301+
result = df.groupby("A").agg({"B": "first"})
302+
self.assert_frame_equal(result, expected)
303+
304+
result = df.groupby("A").agg("first")
305+
self.assert_frame_equal(result, expected)
306+
307+
result = df.groupby("A").first()
308+
self.assert_frame_equal(result, expected)
302309

303310
def test_groupby_extension_no_sort(self, data_for_grouping):
304311
df = pd.DataFrame({"A": [1, 1, 2, 2, 3, 3, 1], "B": data_for_grouping})

0 commit comments

Comments
 (0)