dates: Add more tests for interval formatting

Author: akx

babel/dates.py

@@ -756,7 +756,10 @@ def format_skeleton(skeleton, datetime=None, tzinfo=None, fuzzy=True, locale=LC_
     u'Sun, Apr 1'
     >>> format_skeleton('yMMd', t, locale='fi')  # yMMd is not in the Finnish locale; yMd gets used
     u'1.4.2007'
-
+    >>> format_skeleton('yMMd', t, fuzzy=False, locale='fi')  # yMMd is not in the Finnish locale, an error is thrown
+    Traceback (most recent call last):
+        ...
+    KeyError: yMMd
 
     After the skeleton is resolved to a pattern `format_datetime` is called so
     all timezone processing etc is the same as for that.
@@ -928,6 +931,11 @@ def format_interval(start, end, skeleton=None, tzinfo=None, fuzzy=True, locale=L
     >>> format_interval(time(16, 18), time(16, 24), "Hm", locale="it")
     '16:18\u201316:24'
 
+    If the start instant equals the end instant, the interval is formatted like the instant.
+
+    >>> format_interval(time(16, 18), time(16, 18), "Hm", locale="it")
+    '16:18'
+
     Unknown skeletons fall back to "default" formatting.
 
     >>> format_interval(time(16, 18), time(16, 24), "xxx", locale="ja")
@@ -1483,6 +1491,14 @@ def split_interval_pattern(pattern):
     [u'E d.M. \u2013 ', 'E d.M.']
     >>> split_interval_pattern("Y 'text' Y 'more text'")
     ["Y 'text '", "Y 'more text'"]
+    >>> split_interval_pattern(u"E, MMM d \u2013 E")
+    [u'E, MMM d \u2013 ', u'E']
+    >>> split_interval_pattern("MMM d")
+    ['MMM d']
+    >>> split_interval_pattern("y G")
+    ['y G']
+    >>> split_interval_pattern(u"MMM d \u2013 d")
+    [u'MMM d \u2013 ', u'd']
 
     :param pattern: Interval pattern string
     :return: list of "subpatterns"
@@ -1516,6 +1532,9 @@ def match_skeleton(skeleton, options, allow_different_fields=False):
 
     >>> match_skeleton('yMMd', ('qyMMd',), allow_different_fields=False)
 
+    >>> match_skeleton('hmz', ('hmv',))
+    'hmv'
+
     :param skeleton: The skeleton to match
     :type skeleton: str
     :param options: An iterable of other skeletons to match against

tests/test_date_intervals.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import datetime
+
+from babel import dates
+from babel.dates import get_timezone
+from babel.util import UTC
+
+TEST_DT = datetime.datetime(2016, 1, 8, 11, 46, 15)
+TEST_TIME = TEST_DT.time()
+TEST_DATE = TEST_DT.date()
+
+
+def test_format_interval_same_instant_1():
+    assert dates.format_interval(TEST_DT, TEST_DT, "yMMMd", fuzzy=False, locale="fi") == "8. tammikuuta 2016"
+
+
+def test_format_interval_same_instant_2():
+    assert dates.format_interval(TEST_DT, TEST_DT, "xxx", fuzzy=False, locale="fi") == "8.1.2016 klo 11.46.15"
+
+
+def test_format_interval_same_instant_3():
+    assert dates.format_interval(TEST_TIME, TEST_TIME, "xxx", fuzzy=False, locale="fi") == "11.46.15"
+
+
+def test_format_interval_same_instant_4():
+    assert dates.format_interval(TEST_DATE, TEST_DATE, "xxx", fuzzy=False, locale="fi") == "8.1.2016"
+
+
+def test_format_interval_invalid_skeleton():
+    t1 = TEST_DATE
+    t2 = TEST_DATE + datetime.timedelta(days=1)
+    assert dates.format_interval(t1, t2, "mumumu", fuzzy=False, locale="fi") == u"8.1.2016\u20139.1.2016"
+    assert dates.format_interval(t1, t2, fuzzy=False, locale="fi") == u"8.1.2016\u20139.1.2016"
+
+
+def test_format_interval_no_difference():
+    t1 = TEST_DT
+    t2 = t1 + datetime.timedelta(minutes=8)
+    assert dates.format_interval(t1, t2, "yMd", fuzzy=False, locale="fi") == "8.1.2016"
+
+
+def test_format_interval_in_tz():
+    t1 = TEST_DT.replace(tzinfo=UTC)
+    t2 = t1 + datetime.timedelta(minutes=18)
+    hki_tz = get_timezone("Europe/Helsinki")
+    assert dates.format_interval(t1, t2, "Hmv", tzinfo=hki_tz, locale="fi") == "13.46\u201314.04 aikavyöhyke: Suomi"
+
+
+def test_format_interval_12_hour():
+    t2 = TEST_DT
+    t1 = t2 - datetime.timedelta(hours=1)
+    assert dates.format_interval(t1, t2, "hm", locale="en") == "10:46 \u2013 11:46 AM"