Skip to content

Commit 337b2c4

Browse files
TomAugspurgerPingviinituutti
authored andcommitted
TST: Unskip some Categorical Tests (pandas-dev#23613)
1 parent 29403dc commit 337b2c4

File tree

1 file changed

+40
-55
lines changed

1 file changed

+40
-55
lines changed

pandas/tests/extension/test_categorical.py

+40-55
Original file line numberDiff line numberDiff line change
@@ -72,80 +72,67 @@ class TestDtype(base.BaseDtypeTests):
7272

7373

7474
class TestInterface(base.BaseInterfaceTests):
75-
@pytest.mark.skip(reason="Memory usage doesn't match")
76-
def test_memory_usage(self):
75+
@pytest.mark.skip(reason="Memory usage doesn't match", strict=True)
76+
def test_memory_usage(self, data):
7777
# Is this deliberate?
78-
pass
78+
super(TestInterface, self).test_memory_usage(data)
7979

8080

8181
class TestConstructors(base.BaseConstructorsTests):
8282
pass
8383

8484

8585
class TestReshaping(base.BaseReshapingTests):
86-
@pytest.mark.skip(reason="Unobserved categories preseved in concat.")
87-
def test_concat_columns(self, data, na_value):
88-
pass
89-
90-
@pytest.mark.skip(reason="Unobserved categories preseved in concat.")
91-
def test_align(self, data, na_value):
92-
pass
93-
94-
@pytest.mark.skip(reason="Unobserved categories preseved in concat.")
95-
def test_align_frame(self, data, na_value):
96-
pass
97-
98-
@pytest.mark.skip(reason="Unobserved categories preseved in concat.")
99-
def test_merge(self, data, na_value):
100-
pass
86+
pass
10187

10288

10389
class TestGetitem(base.BaseGetitemTests):
104-
skip_take = pytest.mark.skip(reason="GH-20664.")
90+
skip_take = pytest.mark.skip(reason="GH-20664.", strict=True)
10591

106-
@pytest.mark.skip(reason="Backwards compatibility")
107-
def test_getitem_scalar(self):
92+
@pytest.mark.skip(reason="Backwards compatibility", strict=True)
93+
def test_getitem_scalar(self, data):
10894
# CategoricalDtype.type isn't "correct" since it should
10995
# be a parent of the elements (object). But don't want
11096
# to break things by changing.
111-
pass
97+
super(TestGetitem, self).test_getitem_scalar(data)
11298

11399
@skip_take
114-
def test_take(self):
100+
def test_take(self, data, na_value, na_cmp):
115101
# TODO remove this once Categorical.take is fixed
116-
pass
102+
super(TestGetitem, self).test_take(data, na_value, na_cmp)
117103

118104
@skip_take
119-
def test_take_negative(self):
120-
pass
105+
def test_take_negative(self, data):
106+
super().test_take_negative(data)
121107

122108
@skip_take
123-
def test_take_pandas_style_negative_raises(self):
124-
pass
109+
def test_take_pandas_style_negative_raises(self, data, na_value):
110+
super().test_take_pandas_style_negative_raises(data, na_value)
125111

126112
@skip_take
127-
def test_take_non_na_fill_value(self):
128-
pass
113+
def test_take_non_na_fill_value(self, data_missing):
114+
super().test_take_non_na_fill_value(data_missing)
129115

130116
@skip_take
131-
def test_take_out_of_bounds_raises(self):
132-
pass
117+
def test_take_out_of_bounds_raises(self, data, allow_fill):
118+
return super().test_take_out_of_bounds_raises(data, allow_fill)
133119

134-
@pytest.mark.skip(reason="GH-20747. Unobserved categories.")
135-
def test_take_series(self):
136-
pass
120+
@pytest.mark.skip(reason="GH-20747. Unobserved categories.", strict=True)
121+
def test_take_series(self, data):
122+
super().test_take_series(data)
137123

138124
@skip_take
139-
def test_reindex_non_na_fill_value(self):
140-
pass
125+
def test_reindex_non_na_fill_value(self, data_missing):
126+
super().test_reindex_non_na_fill_value(data_missing)
141127

142-
@pytest.mark.skip(reason="Categorical.take buggy")
143-
def test_take_empty(self):
144-
pass
128+
@pytest.mark.skip(reason="Categorical.take buggy", strict=True)
129+
def test_take_empty(self, data, na_value, na_cmp):
130+
super().test_take_empty(data, na_value, na_cmp)
145131

146-
@pytest.mark.skip(reason="test not written correctly for categorical")
147-
def test_reindex(self):
148-
pass
132+
@pytest.mark.skip(reason="test not written correctly for categorical",
133+
strict=True)
134+
def test_reindex(self, data, na_value):
135+
super().test_reindex(data, na_value)
149136

150137

151138
class TestSetitem(base.BaseSetitemTests):
@@ -154,25 +141,23 @@ class TestSetitem(base.BaseSetitemTests):
154141

155142
class TestMissing(base.BaseMissingTests):
156143

157-
@pytest.mark.skip(reason="Not implemented")
158-
def test_fillna_limit_pad(self):
159-
pass
144+
@pytest.mark.skip(reason="Not implemented", strict=True)
145+
def test_fillna_limit_pad(self, data_missing):
146+
super().test_fillna_limit_pad(data_missing)
160147

161-
@pytest.mark.skip(reason="Not implemented")
162-
def test_fillna_limit_backfill(self):
163-
pass
148+
@pytest.mark.skip(reason="Not implemented", strict=True)
149+
def test_fillna_limit_backfill(self, data_missing):
150+
super().test_fillna_limit_backfill(data_missing)
164151

165152

166153
class TestReduce(base.BaseNoReduceTests):
167154
pass
168155

169156

170157
class TestMethods(base.BaseMethodsTests):
171-
pass
172-
173-
@pytest.mark.skip(reason="Unobserved categories included")
158+
@pytest.mark.skip(reason="Unobserved categories included", strict=True)
174159
def test_value_counts(self, all_data, dropna):
175-
pass
160+
return super().test_value_counts(all_data, dropna)
176161

177162
def test_combine_add(self, data_repeated):
178163
# GH 20825
@@ -190,9 +175,9 @@ def test_combine_add(self, data_repeated):
190175
expected = pd.Series([a + val for a in list(orig_data1)])
191176
self.assert_series_equal(result, expected)
192177

193-
@pytest.mark.skip(reason="Not Applicable")
178+
@pytest.mark.skip(reason="Not Applicable", strict=True)
194179
def test_fillna_length_mismatch(self, data_missing):
195-
pass
180+
super().test_fillna_length_mismatch(data_missing)
196181

197182

198183
class TestCasting(base.BaseCastingTests):

0 commit comments

Comments
 (0)