diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-12-17 14:32:20 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-12-17 14:32:20 +0000 |
commit | db51f7f103bbbd6c91c8f47d75b3482ef8939691 (patch) | |
tree | ab59b1147bd0cd39f31a48073cff236ede4ec1df /tests/interval | |
parent | Adding upstream version 3.0.0~a1. (diff) | |
download | pendulum-upstream.tar.xz pendulum-upstream.zip |
Adding upstream version 3.0.0.upstream/3.0.0upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/interval')
-rw-r--r-- | tests/interval/test_add_subtract.py | 20 | ||||
-rw-r--r-- | tests/interval/test_behavior.py | 21 | ||||
-rw-r--r-- | tests/interval/test_construct.py | 28 | ||||
-rw-r--r-- | tests/interval/test_hashing.py | 20 | ||||
-rw-r--r-- | tests/interval/test_in_words.py | 38 | ||||
-rw-r--r-- | tests/interval/test_range.py | 2 |
6 files changed, 71 insertions, 58 deletions
diff --git a/tests/interval/test_add_subtract.py b/tests/interval/test_add_subtract.py index 88525a3..d1f6036 100644 --- a/tests/interval/test_add_subtract.py +++ b/tests/interval/test_add_subtract.py @@ -6,8 +6,8 @@ import pendulum def test_dst_add(): start = pendulum.datetime(2017, 3, 7, tz="America/Toronto") end = start.add(days=6) - period = end - start - new_end = start + period + interval = end - start + new_end = start + interval assert new_end == end @@ -15,8 +15,8 @@ def test_dst_add(): def test_dst_add_non_variable_units(): start = pendulum.datetime(2013, 3, 31, 1, 30, tz="Europe/Paris") end = start.add(hours=1) - period = end - start - new_end = start + period + interval = end - start + new_end = start + interval assert new_end == end @@ -24,8 +24,8 @@ def test_dst_add_non_variable_units(): def test_dst_subtract(): start = pendulum.datetime(2017, 3, 7, tz="America/Toronto") end = start.add(days=6) - period = end - start - new_start = end - period + interval = end - start + new_start = end - interval assert new_start == start @@ -33,8 +33,8 @@ def test_dst_subtract(): def test_naive_subtract(): start = pendulum.naive(2013, 3, 31, 1, 30) end = start.add(hours=1) - period = end - start - new_end = start + period + interval = end - start + new_end = start + interval assert new_end == end @@ -43,7 +43,7 @@ def test_negative_difference_subtract(): start = pendulum.datetime(2018, 5, 28, 12, 34, 56, 123456) end = pendulum.datetime(2018, 1, 1) - period = end - start - new_end = start + period + interval = end - start + new_end = start + interval assert new_end == end diff --git a/tests/interval/test_behavior.py b/tests/interval/test_behavior.py index b5e057a..96a1f42 100644 --- a/tests/interval/test_behavior.py +++ b/tests/interval/test_behavior.py @@ -40,15 +40,28 @@ def test_comparison_to_timedelta(): dt1 = pendulum.datetime(2016, 11, 18) dt2 = pendulum.datetime(2016, 11, 20) - period = dt2 - dt1 + interval = dt2 - dt1 - assert period < timedelta(days=4) + assert interval < timedelta(days=4) def test_equality_to_timedelta(): dt1 = pendulum.datetime(2016, 11, 18) dt2 = pendulum.datetime(2016, 11, 20) - period = dt2 - dt1 + interval = dt2 - dt1 - assert period == timedelta(days=2) + assert interval == timedelta(days=2) + + +def test_inequality(): + dt1 = pendulum.datetime(2016, 11, 18) + dt2 = pendulum.datetime(2016, 11, 20) + dt3 = pendulum.datetime(2016, 11, 22) + + interval1 = dt2 - dt1 + interval2 = dt3 - dt2 + interval3 = dt3 - dt1 + + assert interval1 != interval2 + assert interval1 != interval3 diff --git a/tests/interval/test_construct.py b/tests/interval/test_construct.py index 024e741..550b808 100644 --- a/tests/interval/test_construct.py +++ b/tests/interval/test_construct.py @@ -72,17 +72,17 @@ def test_accuracy(): def test_dst_transition(): start = pendulum.datetime(2017, 3, 7, tz="America/Toronto") end = start.add(days=6) - period = end - start + interval = end - start - assert period.days == 5 - assert period.seconds == 82800 + assert interval.days == 5 + assert interval.seconds == 82800 - assert period.remaining_days == 6 - assert period.hours == 0 - assert period.remaining_seconds == 0 + assert interval.remaining_days == 6 + assert interval.hours == 0 + assert interval.remaining_seconds == 0 - assert period.in_days() == 6 - assert period.in_hours() == 5 * 24 + 23 + assert interval.in_days() == 6 + assert interval.in_hours() == 5 * 24 + 23 def test_timedelta_behavior(): @@ -108,14 +108,14 @@ def test_timedelta_behavior(): def test_different_timezones_same_time(): dt1 = pendulum.datetime(2013, 3, 31, 1, 30, tz="Europe/Paris") dt2 = pendulum.datetime(2013, 4, 1, 1, 30, tz="Europe/Paris") - period = dt2 - dt1 + interval = dt2 - dt1 - assert period.in_words() == "1 day" - assert period.in_hours() == 23 + assert interval.in_words() == "1 day" + assert interval.in_hours() == 23 dt1 = pendulum.datetime(2013, 3, 31, 1, 30, tz="Europe/Paris") dt2 = pendulum.datetime(2013, 4, 1, 1, 30, tz="America/Toronto") - period = dt2 - dt1 + interval = dt2 - dt1 - assert period.in_words() == "1 day 5 hours" - assert period.in_hours() == 29 + assert interval.in_words() == "1 day 5 hours" + assert interval.in_hours() == 29 diff --git a/tests/interval/test_hashing.py b/tests/interval/test_hashing.py index c18502f..ca9ef9c 100644 --- a/tests/interval/test_hashing.py +++ b/tests/interval/test_hashing.py @@ -3,21 +3,21 @@ from __future__ import annotations import pendulum -def test_periods_with_same_duration_and_different_dates(): +def test_intervals_with_same_duration_and_different_dates(): day1 = pendulum.DateTime(2018, 1, 1) day2 = pendulum.DateTime(2018, 1, 2) day3 = pendulum.DateTime(2018, 1, 2) - period1 = day2 - day1 - period2 = day3 - day2 + interval1 = day2 - day1 + interval2 = day3 - day2 - assert period1 != period2 - assert len({period1, period2}) == 2 + assert interval1 != interval2 + assert len({interval1, interval2}) == 2 -def test_periods_with_same_dates(): - period1 = pendulum.DateTime(2018, 1, 2) - pendulum.DateTime(2018, 1, 1) - period2 = pendulum.DateTime(2018, 1, 2) - pendulum.DateTime(2018, 1, 1) +def test_intervals_with_same_dates(): + interval1 = pendulum.DateTime(2018, 1, 2) - pendulum.DateTime(2018, 1, 1) + interval2 = pendulum.DateTime(2018, 1, 2) - pendulum.DateTime(2018, 1, 1) - assert period1 == period2 - assert len({period1, period2}) == 1 + assert interval1 == interval2 + assert len({interval1, interval2}) == 1 diff --git a/tests/interval/test_in_words.py b/tests/interval/test_in_words.py index 410e11f..f60e20d 100644 --- a/tests/interval/test_in_words.py +++ b/tests/interval/test_in_words.py @@ -5,66 +5,66 @@ import pendulum def test_week(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval(start=start_date, end=start_date.add(weeks=1)) - assert period.in_words() == "1 week" + interval = pendulum.interval(start=start_date, end=start_date.add(weeks=1)) + assert interval.in_words() == "1 week" def test_week_and_day(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval(start=start_date, end=start_date.add(weeks=1, days=1)) - assert period.in_words() == "1 week 1 day" + interval = pendulum.interval(start=start_date, end=start_date.add(weeks=1, days=1)) + assert interval.in_words() == "1 week 1 day" def test_all(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval( + interval = pendulum.interval( start=start_date, end=start_date.add(years=1, months=1, days=1, seconds=1, microseconds=1), ) - assert period.in_words() == "1 year 1 month 1 day 1 second" + assert interval.in_words() == "1 year 1 month 1 day 1 second" def test_in_french(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval( + interval = pendulum.interval( start=start_date, end=start_date.add(years=1, months=1, days=1, seconds=1, microseconds=1), ) - assert period.in_words(locale="fr") == "1 an 1 mois 1 jour 1 seconde" + assert interval.in_words(locale="fr") == "1 an 1 mois 1 jour 1 seconde" def test_singular_negative_values(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval(start=start_date, end=start_date.subtract(days=1)) - assert period.in_words() == "-1 day" + interval = pendulum.interval(start=start_date, end=start_date.subtract(days=1)) + assert interval.in_words() == "-1 day" def test_separator(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval( + interval = pendulum.interval( start=start_date, end=start_date.add(years=1, months=1, days=1, seconds=1, microseconds=1), ) - assert period.in_words(separator=", ") == "1 year, 1 month, 1 day, 1 second" + assert interval.in_words(separator=", ") == "1 year, 1 month, 1 day, 1 second" def test_subseconds(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval( + interval = pendulum.interval( start=start_date, end=start_date.add(microseconds=123456) ) - assert period.in_words() == "0.12 second" + assert interval.in_words() == "0.12 second" def test_subseconds_with_seconds(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval( + interval = pendulum.interval( start=start_date, end=start_date.add(seconds=12, microseconds=123456) ) - assert period.in_words() == "12 seconds" + assert interval.in_words() == "12 seconds" -def test_zero_period(): +def test_zero_interval(): start_date = pendulum.datetime(2012, 1, 1) - period = pendulum.interval(start=start_date, end=start_date) - assert period.in_words() == "0 microseconds" + interval = pendulum.interval(start=start_date, end=start_date) + assert interval.in_words() == "0 microseconds" diff --git a/tests/interval/test_range.py b/tests/interval/test_range.py index 28fe1ff..0b883e5 100644 --- a/tests/interval/test_range.py +++ b/tests/interval/test_range.py @@ -47,7 +47,7 @@ def test_iter(): dt2 = pendulum.datetime(2000, 1, 31, 12, 45, 37) p = Interval(dt1, dt2) - i = 0 # noqa: SIM113 (suggests use of enumerate) + i = 0 for dt in p: assert isinstance(dt, pendulum.DateTime) i += 1 |