Skip to content

Commit 0057158

Browse files
explicitly test pd.array() behaviour (remove xfail)
1 parent 0bee1ac commit 0057158

File tree

1 file changed

+30
-4
lines changed

1 file changed

+30
-4
lines changed

pandas/tests/arrays/test_array.py

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import numpy as np
66
import pytest
77

8-
from pandas._config import using_string_dtype
9-
108
import pandas as pd
119
import pandas._testing as tm
1210
from pandas.api.extensions import register_extension_dtype
@@ -215,21 +213,43 @@ def test_dt64_array(dtype_unit):
215213
.construct_array_type()
216214
._from_sequence(["a", None], dtype=pd.StringDtype()),
217215
),
216+
(
217+
["a", None],
218+
"str",
219+
pd.StringDtype(na_value=np.nan)
220+
.construct_array_type()
221+
._from_sequence(["a", None], dtype=pd.StringDtype(na_value=np.nan)),
222+
),
218223
(
219224
["a", None],
220225
pd.StringDtype(),
221226
pd.StringDtype()
222227
.construct_array_type()
223228
._from_sequence(["a", None], dtype=pd.StringDtype()),
224229
),
230+
(
231+
["a", None],
232+
pd.StringDtype(na_value=np.nan),
233+
pd.StringDtype(na_value=np.nan)
234+
.construct_array_type()
235+
._from_sequence(["a", None], dtype=pd.StringDtype(na_value=np.nan)),
236+
),
225237
(
226238
# numpy array with string dtype
227239
np.array(["a", "b"], dtype=str),
228-
None,
240+
pd.StringDtype(),
229241
pd.StringDtype()
230242
.construct_array_type()
231243
._from_sequence(["a", "b"], dtype=pd.StringDtype()),
232244
),
245+
(
246+
# numpy array with string dtype
247+
np.array(["a", "b"], dtype=str),
248+
pd.StringDtype(na_value=np.nan),
249+
pd.StringDtype(na_value=np.nan)
250+
.construct_array_type()
251+
._from_sequence(["a", "b"], dtype=pd.StringDtype(na_value=np.nan)),
252+
),
233253
# Boolean
234254
(
235255
[True, None],
@@ -287,7 +307,6 @@ def test_array_copy():
287307
assert tm.shares_memory(a, b)
288308

289309

290-
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)", strict=False)
291310
@pytest.mark.parametrize(
292311
"data, expected",
293312
[
@@ -387,6 +406,13 @@ def test_array_copy():
387406
.construct_array_type()
388407
._from_sequence(["a", None], dtype=pd.StringDtype()),
389408
),
409+
(
410+
# numpy array with string dtype
411+
np.array(["a", "b"], dtype=str),
412+
pd.StringDtype()
413+
.construct_array_type()
414+
._from_sequence(["a", "b"], dtype=pd.StringDtype()),
415+
),
390416
# Boolean
391417
([True, False], BooleanArray._from_sequence([True, False], dtype="boolean")),
392418
([True, None], BooleanArray._from_sequence([True, None], dtype="boolean")),

0 commit comments

Comments
 (0)