Skip to content

Cleanup Series arithmetic tests #18974

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

Closed
wants to merge 4 commits into from
Closed

Cleanup Series arithmetic tests #18974

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2946a06
Move (most) remaining arithmetic tests to appropriate spots
jbrockmendel Dec 28, 2017
e0a8abb
break up some over-large tests, identify one test that is likely wrong
jbrockmendel Dec 28, 2017
8b4a574
parametrize more, add requested comments
jbrockmendel Dec 29, 2017
65b120d
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel Dec 29, 2017
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
44 changes: 32 additions & 12 deletions pandas/tests/indexes/timedeltas/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,60 @@ def freq(request):


class TestTimedeltaIndexArithmetic(object):
_holder = TimedeltaIndex

# TODO: Split by ops, better name
def test_numeric_compat(self):
idx = self._holder(np.arange(5, dtype='int64'))
didx = self._holder(np.arange(5, dtype='int64') ** 2)
def test_tdi_mul_int(self):
idx = TimedeltaIndex(np.arange(5, dtype='int64'))

result = idx * 1
tm.assert_index_equal(result, idx)

result = 1 * idx
tm.assert_index_equal(result, idx)

def test_tdi_div_int(self):
idx = TimedeltaIndex(np.arange(5, dtype='int64'))
result = idx / 1
tm.assert_index_equal(result, idx)

def test_tdi_floordiv_int(self):
idx = TimedeltaIndex(np.arange(5, dtype='int64'))
result = idx // 1
tm.assert_index_equal(result, idx)

def test_tdi_mul_intarray_0dim(self):
idx = TimedeltaIndex(np.arange(5, dtype='int64'))

result = idx * np.array(5, dtype='int64')
tm.assert_index_equal(result,
self._holder(np.arange(5, dtype='int64') * 5))
expected = TimedeltaIndex(np.arange(5, dtype='int64') * 5)
tm.assert_index_equal(result, expected)

def test_tdi_mul_intarray_1dim(self):
idx = TimedeltaIndex(np.arange(5, dtype='int64'))

result = idx * np.arange(5, dtype='int64')
tm.assert_index_equal(result, didx)
expected = TimedeltaIndex(np.arange(5, dtype='int64') ** 2)
tm.assert_index_equal(result, expected)

# FIXME: These ops should return Series, NOT indexes
Copy link
Contributor

Choose a reason for hiding this comment

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

TODO

def test_tdi_mul_intSeries(self):
idx = TimedeltaIndex(np.arange(5, dtype='int64'))
expected = TimedeltaIndex(np.arange(5, dtype='int64') ** 2)

result = idx * Series(np.arange(5, dtype='int64'))
tm.assert_index_equal(result, didx)
tm.assert_index_equal(result, expected)

result = idx * Series(np.arange(5, dtype='float64') + 0.1)
tm.assert_index_equal(result, self._holder(np.arange(
5, dtype='float64') * (np.arange(5, dtype='float64') + 0.1)))
expected = TimedeltaIndex([0.0, 1.1, 4.2, 9.3, 16.4])
tm.assert_index_equal(result, expected)

def test_tdi_mul_invalid(self):
idx = TimedeltaIndex(np.arange(5, dtype='int64'))

# invalid
pytest.raises(TypeError, lambda: idx * idx)
pytest.raises(ValueError, lambda: idx * self._holder(np.arange(3)))

# Cases with wrong length
pytest.raises(ValueError, lambda: idx * TimedeltaIndex(np.arange(3)))
pytest.raises(ValueError, lambda: idx * np.array([1, 2]))

def test_ufunc_coercions(self):
Expand Down Expand Up @@ -256,6 +275,7 @@ def test_subtraction_ops(self):
expected = DatetimeIndex(['20121231', pd.NaT, '20121230'], name='foo')
tm.assert_index_equal(result, expected)

# TODO: Belongs in DatetimeIndex tests
def test_subtraction_ops_with_tz(self):

# check that dt/dti subtraction ops with tz are validated
Expand Down
Loading