Skip to content

Commit 1b9e6e4

Browse files
phoflcbpygit
authored andcommitted
Adjust dummies tests for new string option (pandas-dev#56527)
1 parent bfd46cc commit 1b9e6e4

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pandas/tests/reshape/test_from_dummies.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,13 @@ def test_no_prefix_string_cats_contains_get_dummies_NaN_column():
328328
),
329329
],
330330
)
331-
def test_no_prefix_string_cats_default_category(default_category, expected):
331+
def test_no_prefix_string_cats_default_category(
332+
default_category, expected, using_infer_string
333+
):
332334
dummies = DataFrame({"a": [1, 0, 0], "b": [0, 1, 0]})
333335
result = from_dummies(dummies, default_category=default_category)
336+
if using_infer_string:
337+
expected[""] = expected[""].astype("string[pyarrow_numpy]")
334338
tm.assert_frame_equal(result, expected)
335339

336340

pandas/tests/reshape/test_get_dummies.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def test_get_dummies_basic(self, sparse, dtype):
7979
result = get_dummies(s_series_index, sparse=sparse, dtype=dtype)
8080
tm.assert_frame_equal(result, expected)
8181

82-
def test_get_dummies_basic_types(self, sparse, dtype):
82+
def test_get_dummies_basic_types(self, sparse, dtype, using_infer_string):
8383
# GH 10531
8484
s_list = list("abc")
8585
s_series = Series(s_list)
@@ -120,7 +120,8 @@ def test_get_dummies_basic_types(self, sparse, dtype):
120120

121121
result = get_dummies(s_df, columns=["a"], sparse=sparse, dtype=dtype)
122122

123-
expected_counts = {"int64": 1, "object": 1}
123+
key = "string" if using_infer_string else "object"
124+
expected_counts = {"int64": 1, key: 1}
124125
expected_counts[dtype_name] = 3 + expected_counts.get(dtype_name, 0)
125126

126127
expected = Series(expected_counts, name="count").sort_index()
@@ -213,7 +214,7 @@ def test_dataframe_dummies_all_obj(self, df, sparse):
213214

214215
tm.assert_frame_equal(result, expected)
215216

216-
def test_dataframe_dummies_string_dtype(self, df):
217+
def test_dataframe_dummies_string_dtype(self, df, using_infer_string):
217218
# GH44965
218219
df = df[["A", "B"]]
219220
df = df.astype({"A": "object", "B": "string"})
@@ -227,7 +228,9 @@ def test_dataframe_dummies_string_dtype(self, df):
227228
},
228229
dtype=bool,
229230
)
230-
expected[["B_b", "B_c"]] = expected[["B_b", "B_c"]].astype("boolean")
231+
if not using_infer_string:
232+
# infer_string returns numpy bools
233+
expected[["B_b", "B_c"]] = expected[["B_b", "B_c"]].astype("boolean")
231234
tm.assert_frame_equal(result, expected)
232235

233236
def test_dataframe_dummies_mix_default(self, df, sparse, dtype):

0 commit comments

Comments
 (0)