Add more tests

Author: Matt Roeschke

pandas/tests/indexes/datetimes/test_date_range.py

@@ -781,7 +781,7 @@ def test_cdaterange_weekmask_and_holidays(self):
 
     @pytest.mark.parametrize('freq', [freq for freq in prefix_mapping
                                       if freq.startswith('C')
-                                      and freq != 'CD'])
+                                      and freq != 'CD'])  # CalendarDay
     def test_all_custom_freq(self, freq):
         # should not raise
         bdate_range(START, END, freq=freq, weekmask='Mon Wed Fri',

pandas/tests/indexes/timedeltas/test_timedelta_range.py

@@ -48,6 +48,10 @@ def test_timedelta_range(self):
         result = df.loc['0s':, :]
         tm.assert_frame_equal(expected, result)
 
+        with pytest.raises(ValueError):
+            # GH 22274: CalendarDay is a relative time measurement
+            timedelta_range('1day', freq='CD', periods=2)
+
     @pytest.mark.parametrize('periods, freq', [
         (3, '2D'), (5, 'D'), (6, '19H12T'), (7, '16H'), (9, '12H')])
     def test_linspace_behavior(self, periods, freq):

pandas/tests/tseries/offsets/test_offsets.py

@@ -11,12 +11,14 @@
 from pandas.compat.numpy import np_datetime64_compat
 
 from pandas.core.series import Series
+from pandas.core.frame import DataFrame
 from pandas._libs.tslibs import conversion
 from pandas._libs.tslibs.frequencies import (get_freq_code, get_freq_str,
                                              INVALID_FREQ_ERR_MSG)
 from pandas.tseries.frequencies import _offset_map, get_offset
 from pandas.core.indexes.datetimes import (
     _to_m8, DatetimeIndex, _daterange_cache)
+from pandas.core.indexes.timedeltas import TimedeltaIndex
 import pandas._libs.tslibs.offsets as liboffsets
 from pandas._libs.tslibs.offsets import CacheableOffset
 from pandas.tseries.offsets import (BDay, CDay, BQuarterEnd, BMonthEnd,
@@ -3180,16 +3182,28 @@ def test_last_week_of_month_on_offset():
     fast = offset.onOffset(ts)
     assert fast == slow
 
-
-def test_CalendarDay_with_timezone():
+@pytest.mark.parametrize('box, assert_func', [
+    [None, None],
+    [DatetimeIndex, 'assert_index_equal'],
+    [Series, 'assert_series_equal']])
+def test_CalendarDay_with_timezone(box, assert_func):
     # GH 22274
     ts = Timestamp('2016-10-30 00:00:00+0300', tz='Europe/Helsinki')
-    result = ts + CalendarDay(1)
     expected = Timestamp('2016-10-31 00:00:00+0200', tz='Europe/Helsinki')
-    assert result == expected
+    if box is not None:
+        ts = box(([ts]))
+        expected = box(([expected]))
+    result = ts + CalendarDay(1)
+    if assert_func:
+        getattr(tm, assert_func)(result, expected)
+    else:
+        assert result == expected
 
     result = result - CalendarDay(1)
-    assert result == ts
+    if assert_func:
+        getattr(tm, assert_func)(result, ts)
+    else:
+        assert result == ts
 
     # CalendarDay applied to a Timestamp that leads to ambiguous time
     with pytest.raises(pytz.AmbiguousTimeError):
@@ -3199,6 +3213,7 @@ def test_CalendarDay_with_timezone():
     with pytest.raises(pytz.NonExistentTimeError):
         Timestamp("2019-03-09 02:00:00", tz='US/Pacific') + CalendarDay(1)
 
+
 @pytest.mark.parametrize('arg, exp', [
     [1, 2],
     [-1, 0],
@@ -3211,8 +3226,14 @@ def test_CalendarDay_arithmetic_with_self(arg, exp):
     assert result == expected
 
 
-@pytest.mark.parametrize('arg', [timedelta(1), Day(1), Timedelta(1)])
+@pytest.mark.parametrize('arg', [
+    timedelta(1),
+    Day(1),
+    Timedelta(1),
+    TimedeltaIndex([timedelta(1)])])
 def test_CalendarDay_invalid_arithmetic(arg):
     # GH 22274
+    # CalendarDay (relative time) cannot be added to Timedelta-like objects
+    # (absolute time)
     with pytest.raises(TypeError):
         CalendarDay(1) + arg

pandas/tseries/offsets.py

@@ -2140,7 +2140,7 @@ def __init__(self, n=1, normalize=False):
     @apply_wraps
     def apply(self, other):
         """
-        Apply the CalendarDay offset to a datetime object. Incoming datetime
+        Apply scalar arithmetic with CalendarDay offset. Incoming datetime
         objects can be tz-aware or naive.
         """
         if type(other) == type(self):
@@ -2160,7 +2160,7 @@ def apply(self, other):
             return as_timestamp(other)
         except TypeError:
             raise TypeError("Cannot perform arithmetic between {other} and "
-                            "{offset}".format(other=type(other), offset=self))
+                            "CalendarDay".format(other=type(other)))
 
     @apply_index_wraps
     def apply_index(self, i):