Skip to content

Commit 3ffe101

Browse files
committed
move test to test time grouper
1 parent 0f963bb commit 3ffe101

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

pandas/tests/groupby/test_timegrouper.py

+17
Original file line numberDiff line numberDiff line change
@@ -621,3 +621,20 @@ def test_nunique_with_timegrouper_and_nat(self):
621621
result = test.groupby(grouper)['data'].nunique()
622622
expected = test[test.time.notnull()].groupby(grouper)['data'].nunique()
623623
tm.assert_series_equal(result, expected)
624+
625+
def test_scalar_call_versus_list_call(self):
626+
# Issue: 17530
627+
data_frame = {
628+
'location': ['shanghai', 'beijing', 'shanghai'],
629+
'time': pd.Series(['2017-08-09 13:32:23', '2017-08-11 23:23:15',
630+
'2017-08-11 22:23:15'],
631+
dtype='datetime64[ns]'),
632+
'value': [1, 2, 3]
633+
}
634+
data_frame = pd.DataFrame(data_frame).set_index('time')
635+
grouper = pd.TimeGrouper('D')
636+
grouped = data_frame.groupby(grouper)
637+
data1 = grouped.count()
638+
grouped = data_frame.groupby([grouper])
639+
data2 = grouped.count()
640+
assert_frame_equal(data1, data2)

pandas/tests/test_resample.py

-17
Original file line numberDiff line numberDiff line change
@@ -3300,20 +3300,3 @@ def test_aggregate_with_nat(self):
33003300

33013301
# if NaT is included, 'var', 'std', 'mean', 'first','last'
33023302
# and 'nth' doesn't work yet
3303-
3304-
# Issue: 17530
3305-
def test_scalar_call_versus_list_call(self):
3306-
data_frame = {
3307-
'location': ['shanghai', 'beijing', 'shanghai'],
3308-
'time': pd.Series(['2017-08-09 13:32:23', '2017-08-11 23:23:15',
3309-
'2017-08-11 22:23:15'],
3310-
dtype='datetime64[ns]'),
3311-
'value': [1, 2, 3]
3312-
}
3313-
data_frame = pd.DataFrame(data_frame).set_index('time')
3314-
grouper = TimeGrouper('D')
3315-
grouped = data_frame.groupby(grouper)
3316-
data1 = grouped.count()
3317-
grouped = data_frame.groupby([grouper])
3318-
data2 = grouped.count()
3319-
assert_frame_equal(data1, data2)

0 commit comments

Comments
 (0)