@@ -118,7 +118,7 @@ def datetime_frame(self):
118
118
# since that doesn't round-trip, see GH#33711
119
119
df = DataFrame (
120
120
np .random .default_rng (2 ).standard_normal ((30 , 4 )),
121
- columns = Index (list ("ABCD" ), dtype = object ),
121
+ columns = Index (list ("ABCD" )),
122
122
index = date_range ("2000-01-01" , periods = 30 , freq = "B" ),
123
123
)
124
124
df .index = df .index ._with_freq (None )
@@ -203,7 +203,6 @@ def test_roundtrip_simple(self, orient, convert_axes, dtype, float_frame):
203
203
204
204
assert_json_roundtrip_equal (result , expected , orient )
205
205
206
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
207
206
@pytest .mark .parametrize ("dtype" , [False , np .int64 ])
208
207
@pytest .mark .parametrize ("convert_axes" , [True , False ])
209
208
def test_roundtrip_intframe (self , orient , convert_axes , dtype , int_frame ):
@@ -281,7 +280,6 @@ def test_roundtrip_empty(self, orient, convert_axes):
281
280
282
281
tm .assert_frame_equal (result , expected )
283
282
284
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
285
283
@pytest .mark .parametrize ("convert_axes" , [True , False ])
286
284
def test_roundtrip_timestamp (self , orient , convert_axes , datetime_frame ):
287
285
# TODO: improve coverage with date_format parameter
@@ -709,7 +707,6 @@ def test_series_roundtrip_simple(self, orient, string_series, using_infer_string
709
707
710
708
tm .assert_series_equal (result , expected )
711
709
712
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
713
710
@pytest .mark .parametrize ("dtype" , [False , None ])
714
711
def test_series_roundtrip_object (self , orient , dtype , object_series ):
715
712
data = StringIO (object_series .to_json (orient = orient ))
@@ -721,6 +718,9 @@ def test_series_roundtrip_object(self, orient, dtype, object_series):
721
718
if orient != "split" :
722
719
expected .name = None
723
720
721
+ if using_string_dtype ():
722
+ expected = expected .astype ("str" )
723
+
724
724
tm .assert_series_equal (result , expected )
725
725
726
726
def test_series_roundtrip_empty (self , orient ):
@@ -814,7 +814,6 @@ def test_path(self, float_frame, int_frame, datetime_frame):
814
814
df .to_json (path )
815
815
read_json (path )
816
816
817
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
818
817
def test_axis_dates (self , datetime_series , datetime_frame ):
819
818
# frame
820
819
json = StringIO (datetime_frame .to_json ())
@@ -827,7 +826,6 @@ def test_axis_dates(self, datetime_series, datetime_frame):
827
826
tm .assert_series_equal (result , datetime_series , check_names = False )
828
827
assert result .name is None
829
828
830
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
831
829
def test_convert_dates (self , datetime_series , datetime_frame ):
832
830
# frame
833
831
df = datetime_frame
@@ -898,7 +896,6 @@ def test_convert_dates_infer(self, infer_word):
898
896
result = read_json (StringIO (ujson_dumps (data )))[["id" , infer_word ]]
899
897
tm .assert_frame_equal (result , expected )
900
898
901
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
902
899
@pytest .mark .parametrize (
903
900
"date,date_unit" ,
904
901
[
@@ -959,7 +956,6 @@ def test_date_format_series_raises(self, datetime_series):
959
956
with pytest .raises (ValueError , match = msg ):
960
957
ts .to_json (date_format = "iso" , date_unit = "foo" )
961
958
962
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" )
963
959
@pytest .mark .parametrize ("unit" , ["s" , "ms" , "us" , "ns" ])
964
960
def test_date_unit (self , unit , datetime_frame ):
965
961
df = datetime_frame
@@ -1065,7 +1061,6 @@ def test_round_trip_exception(self, datapath):
1065
1061
res = res .fillna (np .nan , downcast = False )
1066
1062
tm .assert_frame_equal (res , df )
1067
1063
1068
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
1069
1064
@pytest .mark .network
1070
1065
@pytest .mark .single_cpu
1071
1066
@pytest .mark .parametrize (
@@ -1474,7 +1469,6 @@ def test_data_frame_size_after_to_json(self):
1474
1469
1475
1470
assert size_before == size_after
1476
1471
1477
- @pytest .mark .xfail (using_string_dtype (), reason = "TODO(infer_string)" , strict = False )
1478
1472
@pytest .mark .parametrize (
1479
1473
"index" , [None , [1 , 2 ], [1.0 , 2.0 ], ["a" , "b" ], ["1" , "2" ], ["1." , "2." ]]
1480
1474
)
0 commit comments