Skip to content

Commit d88c131

Browse files
committed
tests for dicts and result_type='infer'
1 parent 9392073 commit d88c131

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

pandas/tests/frame/test_apply.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,14 +509,16 @@ def test_infer_row_shape(self):
509509

510510
def test_with_dictlike_columns(self):
511511
# gh 17602
512-
513512
df = DataFrame([[1, 2], [1, 2]], columns=['a', 'b'])
514-
result = df.apply(lambda x: {'s': x['a'] + x['b']}, 1)
513+
result = df.apply(lambda x: {'s': x['a'] + x['b']},
514+
axis=1)
515515
expected = Series([{'s': 3} for t in df.itertuples()])
516516
assert_series_equal(result, expected)
517517

518518
df['tm'] = [pd.Timestamp('2017-05-01 00:00:00'),
519519
pd.Timestamp('2017-05-02 00:00:00')]
520+
result = df.apply(lambda x: {'s': x['a'] + x['b']},
521+
axis=1)
520522
assert_series_equal(result, expected)
521523

522524
# compose a series
@@ -535,6 +537,20 @@ def test_with_dictlike_columns(self):
535537
expected = Series([{}, {}, {}])
536538
assert_series_equal(result, expected)
537539

540+
def test_with_dictlike_columns_with_infer(self):
541+
# gh 17602
542+
df = DataFrame([[1, 2], [1, 2]], columns=['a', 'b'])
543+
result = df.apply(lambda x: {'s': x['a'] + x['b']},
544+
axis=1, result_type='infer')
545+
expected = DataFrame({'s': [3, 3]})
546+
assert_frame_equal(result, expected)
547+
548+
df['tm'] = [pd.Timestamp('2017-05-01 00:00:00'),
549+
pd.Timestamp('2017-05-02 00:00:00')]
550+
result = df.apply(lambda x: {'s': x['a'] + x['b']},
551+
axis=1, result_type='infer')
552+
assert_frame_equal(result, expected)
553+
538554
def test_with_listlike_columns(self):
539555
# gh-17348
540556
df = DataFrame({'a': Series(np.random.randn(4)),

0 commit comments

Comments
 (0)