25
25
DatetimeIndexResampler )
26
26
from pandas .tseries .tdi import timedelta_range , TimedeltaIndex
27
27
from pandas .util .testing import (assert_series_equal , assert_almost_equal ,
28
- assert_frame_equal , assert_index_equal ,
29
- assertIsInstance )
28
+ assert_frame_equal , assert_index_equal )
30
29
from pandas ._period import IncompatibleFrequency
31
30
32
31
bday = BDay ()
@@ -761,7 +760,7 @@ def test_resample_empty_series(self):
761
760
assert_series_equal (result , expected , check_dtype = False ,
762
761
check_names = False )
763
762
# this assert will break when fixed
764
- self .assertTrue (result .name is None )
763
+ # self.assertTrue(result.name is None)
765
764
else :
766
765
assert_series_equal (result , expected , check_dtype = False )
767
766
@@ -772,15 +771,15 @@ def test_resample_empty_dataframe(self):
772
771
773
772
for freq in ['M' , 'D' , 'H' ]:
774
773
# count retains dimensions too
775
- methods = downsample_methods + [ 'count' ]
774
+ methods = downsample_methods + upsample_methods
776
775
for method in methods :
777
776
result = getattr (f .resample (freq ), method )()
778
777
779
- expected = f . copy ( )
778
+ expected = pd . Series ([] )
780
779
expected .index = f .index ._shallow_copy (freq = freq )
781
780
assert_index_equal (result .index , expected .index )
782
781
self .assertEqual (result .index .freq , expected .index .freq )
783
- assert_frame_equal (result , expected , check_dtype = False )
782
+ assert_series_equal (result , expected , check_dtype = False )
784
783
785
784
# test size for GH13212 (currently stays as df)
786
785
@@ -839,11 +838,13 @@ def test_resample_loffset_arg_type(self):
839
838
840
839
def test_resample_empty_dataframe_with_size (self ):
841
840
# GH 14962
842
- df1 = pd .DataFrame (dict (a = range (100 )),
843
- index = pd .date_range ('1/1/2000' , periods = 100 , freq = "M" ))
844
- df2 = df1 [df1 .a < 0 ]
845
- result = df2 .resample ("Q" ).size ()
846
- assertIsInstance (result , pd .Series )
841
+ index = pd .DatetimeIndex ([], freq = 'M' )
842
+ df = pd .DataFrame ([], index = index )
843
+
844
+ for freq in ['M' , 'D' , 'H' ]:
845
+ result = df .resample (freq ).size ()
846
+ expected = pd .Series ([], index = index , dtype = 'int64' )
847
+ assert_series_equal (result , expected )
847
848
848
849
849
850
class TestDatetimeIndex (Base , tm .TestCase ):
0 commit comments