@@ -84,7 +84,7 @@ def datetime_frame(self):
84
84
# since that doesn't round-trip, see GH#33711
85
85
df = DataFrame (
86
86
np .random .default_rng (2 ).standard_normal ((30 , 4 )),
87
- columns = Index (list ("ABCD" ), dtype = object ),
87
+ columns = Index (list ("ABCD" )),
88
88
index = date_range ("2000-01-01" , periods = 30 , freq = "B" ),
89
89
)
90
90
df .index = df .index ._with_freq (None )
@@ -184,7 +184,6 @@ def test_roundtrip_simple(self, orient, convert_axes, dtype, float_frame):
184
184
185
185
assert_json_roundtrip_equal (result , expected , orient )
186
186
187
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
188
187
@pytest .mark .parametrize ("dtype" , [False , np .int64 ])
189
188
@pytest .mark .parametrize ("convert_axes" , [True , False ])
190
189
def test_roundtrip_intframe (self , orient , convert_axes , dtype , int_frame ):
@@ -270,7 +269,6 @@ def test_roundtrip_empty(self, orient, convert_axes):
270
269
271
270
tm .assert_frame_equal (result , expected )
272
271
273
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
274
272
@pytest .mark .parametrize ("convert_axes" , [True , False ])
275
273
def test_roundtrip_timestamp (self , orient , convert_axes , datetime_frame ):
276
274
# TODO: improve coverage with date_format parameter
@@ -698,7 +696,6 @@ def test_series_roundtrip_simple(self, orient, string_series, using_infer_string
698
696
699
697
tm .assert_series_equal (result , expected )
700
698
701
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
702
699
@pytest .mark .parametrize ("dtype" , [False , None ])
703
700
def test_series_roundtrip_object (self , orient , dtype , object_series ):
704
701
data = StringIO (object_series .to_json (orient = orient ))
@@ -710,6 +707,9 @@ def test_series_roundtrip_object(self, orient, dtype, object_series):
710
707
if orient != "split" :
711
708
expected .name = None
712
709
710
+ if using_string_dtype ():
711
+ expected = expected .astype ("str" )
712
+
713
713
tm .assert_series_equal (result , expected )
714
714
715
715
def test_series_roundtrip_empty (self , orient ):
@@ -808,7 +808,6 @@ def test_path(self, float_frame, int_frame, datetime_frame):
808
808
df .to_json (path )
809
809
read_json (path )
810
810
811
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
812
811
def test_axis_dates (self , datetime_series , datetime_frame ):
813
812
# frame
814
813
json = StringIO (datetime_frame .to_json ())
@@ -821,7 +820,6 @@ def test_axis_dates(self, datetime_series, datetime_frame):
821
820
tm .assert_series_equal (result , datetime_series , check_names = False )
822
821
assert result .name is None
823
822
824
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
825
823
def test_convert_dates (self , datetime_series , datetime_frame ):
826
824
# frame
827
825
df = datetime_frame
@@ -912,7 +910,6 @@ def test_convert_dates_infer(self, infer_word):
912
910
result = read_json (StringIO (ujson_dumps (data )))[["id" , infer_word ]]
913
911
tm .assert_frame_equal (result , expected )
914
912
915
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
916
913
@pytest .mark .parametrize (
917
914
"date,date_unit" ,
918
915
[
@@ -973,7 +970,6 @@ def test_date_format_series_raises(self, datetime_series):
973
970
with pytest .raises (ValueError , match = msg ):
974
971
ts .to_json (date_format = "iso" , date_unit = "foo" )
975
972
976
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
977
973
def test_date_unit (self , unit , datetime_frame ):
978
974
df = datetime_frame
979
975
df ["date" ] = Timestamp ("20130101 20:43:42" ).as_unit ("ns" )
@@ -1114,7 +1110,6 @@ def test_round_trip_exception(self, datapath):
1114
1110
res = res .fillna (np .nan )
1115
1111
tm .assert_frame_equal (res , df )
1116
1112
1117
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
1118
1113
@pytest .mark .network
1119
1114
@pytest .mark .single_cpu
1120
1115
@pytest .mark .parametrize (
@@ -1555,7 +1550,6 @@ def test_data_frame_size_after_to_json(self):
1555
1550
1556
1551
assert size_before == size_after
1557
1552
1558
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
1559
1553
@pytest .mark .parametrize (
1560
1554
"index" , [None , [1 , 2 ], [1.0 , 2.0 ], ["a" , "b" ], ["1" , "2" ], ["1." , "2." ]]
1561
1555
)
0 commit comments