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 ()
@@ -731,7 +730,7 @@ def test_resample_empty_series(self):
731
730
assert_series_equal (result , expected , check_dtype = False ,
732
731
check_names = False )
733
732
# this assert will break when fixed
734
- self .assertTrue (result .name is None )
733
+ # self.assertTrue(result.name is None)
735
734
else :
736
735
assert_series_equal (result , expected , check_dtype = False )
737
736
@@ -742,15 +741,15 @@ def test_resample_empty_dataframe(self):
742
741
743
742
for freq in ['M' , 'D' , 'H' ]:
744
743
# count retains dimensions too
745
- methods = downsample_methods + [ 'count' ]
744
+ methods = downsample_methods + upsample_methods
746
745
for method in methods :
747
746
result = getattr (f .resample (freq ), method )()
748
747
749
- expected = f . copy ( )
748
+ expected = pd . Series ([] )
750
749
expected .index = f .index ._shallow_copy (freq = freq )
751
750
assert_index_equal (result .index , expected .index )
752
751
self .assertEqual (result .index .freq , expected .index .freq )
753
- assert_frame_equal (result , expected , check_dtype = False )
752
+ assert_series_equal (result , expected , check_dtype = False )
754
753
755
754
# test size for GH13212 (currently stays as df)
756
755
@@ -809,11 +808,13 @@ def test_resample_loffset_arg_type(self):
809
808
810
809
def test_resample_empty_dataframe_with_size (self ):
811
810
# GH 14962
812
- df1 = pd .DataFrame (dict (a = range (100 )),
813
- index = pd .date_range ('1/1/2000' , periods = 100 , freq = "M" ))
814
- df2 = df1 [df1 .a < 0 ]
815
- result = df2 .resample ("Q" ).size ()
816
- assertIsInstance (result , pd .Series )
811
+ index = pd .DatetimeIndex ([], freq = 'M' )
812
+ df = pd .DataFrame ([], index = index )
813
+
814
+ for freq in ['M' , 'D' , 'H' ]:
815
+ result = df .resample (freq ).size ()
816
+ expected = pd .Series ([], index = index , dtype = 'int64' )
817
+ assert_series_equal (result , expected )
817
818
818
819
819
820
class TestDatetimeIndex (Base , tm .TestCase ):
0 commit comments