@@ -757,8 +757,15 @@ def test_resample_empty_series(self):
757
757
freq in ['M' , 'D' ]):
758
758
# GH12871 - TODO: name should propagate, but currently
759
759
# doesn't on lower / same frequency with PeriodIndex
760
+ < << << << HEAD
760
761
assert_series_equal (result , expected , check_dtype = False )
761
762
763
+ == == == =
764
+ assert_series_equal (result , expected , check_dtype = False ,
765
+ check_names = False )
766
+ # this assert will break when fixed
767
+ # self.assertTrue(result.name is None)
768
+ >> >> >> > BUG : added series type to wrap_result for empty DataFrame
762
769
else :
763
770
assert_series_equal (result , expected , check_dtype = False )
764
771
@@ -769,15 +776,15 @@ def test_resample_empty_dataframe(self):
769
776
770
777
for freq in ['M' , 'D' , 'H' ]:
771
778
# count retains dimensions too
772
- methods = downsample_methods + [ 'count' ]
779
+ methods = downsample_methods + upsample_methods
773
780
for method in methods :
774
781
result = getattr (f .resample (freq ), method )()
775
782
776
- expected = f . copy ( )
783
+ expected = pd . Series ([] )
777
784
expected .index = f .index ._shallow_copy (freq = freq )
778
785
assert_index_equal (result .index , expected .index )
779
786
self .assertEqual (result .index .freq , expected .index .freq )
780
- assert_frame_equal (result , expected , check_dtype = False )
787
+ assert_series_equal (result , expected , check_dtype = False )
781
788
782
789
# test size for GH13212 (currently stays as df)
783
790
@@ -836,11 +843,13 @@ def test_resample_loffset_arg_type(self):
836
843
837
844
def test_resample_empty_dataframe_with_size (self ):
838
845
# GH 14962
839
- df1 = pd .DataFrame (dict (a = range (100 )),
840
- index = pd .date_range ('1/1/2000' , periods = 100 , freq = "M" ))
841
- df2 = df1 [df1 .a < 0 ]
842
- result = df2 .resample ("Q" ).size ()
843
- assertIsInstance (result , pd .Series )
846
+ index = pd .DatetimeIndex ([], freq = 'M' )
847
+ df = pd .DataFrame ([], index = index )
848
+
849
+ for freq in ['M' , 'D' , 'H' ]:
850
+ result = df .resample (freq ).size ()
851
+ expected = pd .Series ([], index = index , dtype = 'int64' )
852
+ assert_series_equal (result , expected )
844
853
845
854
846
855
class TestDatetimeIndex (Base , tm .TestCase ):
0 commit comments