Skip to content

improve test for timestamp addition/subtraction #27192

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
merged 3 commits into from
Jul 3, 2019
Merged

improve test for timestamp addition/subtraction #27192

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e07130
improve test for timestamp addition/subtraction
lostella Jul 2, 2019
e269b3c
fix bug in test
lostella Jul 2, 2019
192eee6
add test cases
lostella Jul 3, 2019
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
23 changes: 17 additions & 6 deletions pandas/tests/scalar/timestamp/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,31 @@ def test_addition_subtraction_types(self):
assert type(ts + td64) == Timestamp
assert type(ts - td64) == Timestamp

def test_addition_subtraction_preserve_frequency(self):
ts = Timestamp('2014-03-05', freq='D')
td = timedelta(days=1)
@pytest.mark.parametrize('freq, td, td64', [
('S', timedelta(seconds=1), np.timedelta64(1, 's')),
('min', timedelta(minutes=1), np.timedelta64(1, 'm')),
('H', timedelta(hours=1), np.timedelta64(1, 'h')),
('D', timedelta(days=1), np.timedelta64(1, 'D')),
('W', timedelta(weeks=1), np.timedelta64(1, 'W')),
('M', None, np.timedelta64(1, 'M'))
])
def test_addition_subtraction_preserve_frequency(self, freq, td, td64):
ts = Timestamp('2014-03-05 00:00:00', freq=freq)
original_freq = ts.freq

with tm.assert_produces_warning(FutureWarning):
# GH#22535 add/sub with integers is deprecated
assert (ts + 1).freq == original_freq
assert (ts - 1).freq == original_freq

assert (ts + td).freq == original_freq
assert (ts - td).freq == original_freq
assert (ts + 1 * original_freq).freq == original_freq
assert (ts - 1 * original_freq).freq == original_freq

if td is not None:
# timedelta does not support months as unit
assert (ts + td).freq == original_freq
assert (ts - td).freq == original_freq

td64 = np.timedelta64(1, 'D')
assert (ts + td64).freq == original_freq
assert (ts - td64).freq == original_freq

Expand Down