|
19 | 19 | "method",
|
20 | 20 | [
|
21 | 21 | lambda ser: ser.values,
|
| 22 | + lambda ser: np.asarray(ser.array), |
22 | 23 | lambda ser: np.asarray(ser),
|
23 | 24 | lambda ser: np.array(ser, copy=False),
|
24 | 25 | ],
|
25 |
| - ids=["values", "asarray", "array"], |
| 26 | + ids=["values", "array", "np.asarray", "np.array"], |
26 | 27 | )
|
27 | 28 | def test_series_values(method):
|
28 | 29 | ser = Series([1, 2, 3], name="name")
|
@@ -105,24 +106,38 @@ def test_series_to_numpy():
|
105 | 106 | assert arr.flags.writeable is True
|
106 | 107 |
|
107 | 108 |
|
108 |
| -def test_series_array_ea_dtypes(): |
| 109 | +@pytest.mark.parametrize( |
| 110 | + "method", |
| 111 | + [ |
| 112 | + lambda ser: np.asarray(ser.array), |
| 113 | + lambda ser: np.asarray(ser), |
| 114 | + lambda ser: np.asarray(ser, dtype="int64"), |
| 115 | + lambda ser: np.array(ser, copy=False), |
| 116 | + ], |
| 117 | + ids=["array", "np.asarray", "np.asarray-dtype", "np.array"], |
| 118 | +) |
| 119 | +def test_series_values_ea_dtypes(method): |
109 | 120 | ser = Series([1, 2, 3], dtype="Int64")
|
110 |
| - arr = np.asarray(ser, dtype="int64") |
111 |
| - assert np.shares_memory(arr, get_array(ser)) |
112 |
| - assert arr.flags.writeable is False |
| 121 | + arr = method(ser) |
113 | 122 |
|
114 |
| - arr = np.asarray(ser) |
115 | 123 | assert np.shares_memory(arr, get_array(ser))
|
116 | 124 | assert arr.flags.writeable is False
|
117 | 125 |
|
118 | 126 |
|
119 |
| -def test_dataframe_array_ea_dtypes(): |
| 127 | +@pytest.mark.parametrize( |
| 128 | + "method", |
| 129 | + [ |
| 130 | + lambda df: df.values, |
| 131 | + lambda df: np.asarray(df), |
| 132 | + lambda df: np.asarray(df, dtype="int64"), |
| 133 | + lambda df: np.array(df, copy=False), |
| 134 | + ], |
| 135 | + ids=["values", "np.asarray", "np.asarray-dtype", "np.array"], |
| 136 | +) |
| 137 | +def test_dataframe_array_ea_dtypes(method): |
120 | 138 | df = DataFrame({"a": [1, 2, 3]}, dtype="Int64")
|
121 |
| - arr = np.asarray(df, dtype="int64") |
122 |
| - assert np.shares_memory(arr, get_array(df, "a")) |
123 |
| - assert arr.flags.writeable is False |
| 139 | + arr = method(df) |
124 | 140 |
|
125 |
| - arr = np.asarray(df) |
126 | 141 | assert np.shares_memory(arr, get_array(df, "a"))
|
127 | 142 | assert arr.flags.writeable is False
|
128 | 143 |
|
|
0 commit comments