Skip to content

TST: Test for bug fixed during #22534 discussion #22694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jreback merged 2 commits into from
Sep 15, 2018
Merged

TST: Test for bug fixed during #22534 discussion #22694

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
230f191
TST: test for correct broadcasting in column-wise op
jbrockmendel Sep 13, 2018
f31407c
fixup typos
jbrockmendel Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pandas/tests/frame/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,18 @@ def test_df_flex_cmp_constant_return_types_empty(self, opname):
# Arithmetic

class TestFrameFlexArithmetic(object):
def test_df_add_td64_columnwise(self):
# GH#22534 Check that column-wise addition broadcasts correctly
dti = pd.date_range('2016-01-01', periods=10)
tdi = pd.timedelta_range('1', periods=10)
tser = pd.Series(tdi)
df = pd.DataFrame({0: dti, 1: tdi})

result = df.add(tser, axis=0)
expected = pd.DataFrame({0: dti + tdi,
1: tdi + tdi})
Copy link
Member

@gfyoung gfyoung Sep 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I generally prefer that the expected be as explicit as possible i.e., write out the actual result of those "sums" instead of the expression. You can add a comment if needed to describe that we expected dti + tdi and tdi + tdi.

Copy link
Contributor

@jreback jreback Sep 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with you generally, but these types of tests its ok.

tm.assert_frame_equal(result, expected)

def test_df_add_flex_filled_mixed_dtypes(self):
# GH#19611
dti = pd.date_range('2016-01-01', periods=3)
Expand Down