26
26
DatetimeIndexResampler )
27
27
from pandas .tseries .tdi import timedelta_range , TimedeltaIndex
28
28
from pandas .util .testing import (assert_series_equal , assert_almost_equal ,
29
- assert_frame_equal , assert_index_equal ,
30
- assertIsInstance )
29
+ assert_frame_equal , assert_index_equal )
31
30
from pandas ._period import IncompatibleFrequency
32
31
33
32
bday = BDay ()
@@ -749,7 +748,7 @@ def test_resample_empty_series(self):
749
748
assert_series_equal (result , expected , check_dtype = False ,
750
749
check_names = False )
751
750
# this assert will break when fixed
752
- self .assertTrue (result .name is None )
751
+ # self.assertTrue(result.name is None)
753
752
else :
754
753
assert_series_equal (result , expected , check_dtype = False )
755
754
@@ -760,15 +759,15 @@ def test_resample_empty_dataframe(self):
760
759
761
760
for freq in ['M' , 'D' , 'H' ]:
762
761
# count retains dimensions too
763
- methods = downsample_methods + [ 'count' ]
762
+ methods = downsample_methods + upsample_methods
764
763
for method in methods :
765
764
result = getattr (f .resample (freq ), method )()
766
765
767
- expected = f . copy ( )
766
+ expected = pd . Series ([] )
768
767
expected .index = f .index ._shallow_copy (freq = freq )
769
768
assert_index_equal (result .index , expected .index )
770
769
self .assertEqual (result .index .freq , expected .index .freq )
771
- assert_frame_equal (result , expected , check_dtype = False )
770
+ assert_series_equal (result , expected , check_dtype = False )
772
771
773
772
# test size for GH13212 (currently stays as df)
774
773
@@ -827,11 +826,13 @@ def test_resample_loffset_arg_type(self):
827
826
828
827
def test_resample_empty_dataframe_with_size (self ):
829
828
# GH 14962
830
- df1 = pd .DataFrame (dict (a = range (100 )),
831
- index = pd .date_range ('1/1/2000' , periods = 100 , freq = "M" ))
832
- df2 = df1 [df1 .a < 0 ]
833
- result = df2 .resample ("Q" ).size ()
834
- assertIsInstance (result , pd .Series )
829
+ index = pd .DatetimeIndex ([], freq = 'M' )
830
+ df = pd .DataFrame ([], index = index )
831
+
832
+ for freq in ['M' , 'D' , 'H' ]:
833
+ result = df .resample (freq ).size ()
834
+ expected = pd .Series ([], index = index , dtype = 'int64' )
835
+ assert_series_equal (result , expected )
835
836
836
837
837
838
class TestDatetimeIndex (Base , tm .TestCase ):
0 commit comments