Fixed #26656 -- Added duration (timedelta) support to DjangoJSONEncoder.

2 files changed, 52 insertions, 1 deletions

diff --git a/tests/serializers/test_json.py b/tests/serializers/test_json.py
index d0c9656643..b191ce6644 100644
--- a/tests/serializers/test_json.py
+++ b/tests/serializers/test_json.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+import datetime
 import decimal
 import json
 import re
@@ -302,3 +303,15 @@ class DjangoJSONEncoderTests(SimpleTestCase):
                 json.dumps({'lang': ugettext_lazy("French")}, cls=DjangoJSONEncoder),
                 '{"lang": "Fran\\u00e7ais"}'
             )
+
+    def test_timedelta(self):
+        duration = datetime.timedelta(days=1, hours=2, seconds=3)
+        self.assertEqual(
+            json.dumps({'duration': duration}, cls=DjangoJSONEncoder),
+            '{"duration": "P1DT02H00M03S"}'
+        )
+        duration = datetime.timedelta(0)
+        self.assertEqual(
+            json.dumps({'duration': duration}, cls=DjangoJSONEncoder),
+            '{"duration": "P0DT00H00M00S"}'
+        )
diff --git a/tests/utils_tests/test_duration.py b/tests/utils_tests/test_duration.py
index 559d2ef16f..d0564f396f 100644
--- a/tests/utils_tests/test_duration.py
+++ b/tests/utils_tests/test_duration.py
@@ -2,7 +2,7 @@ import datetime
 import unittest
 
 from django.utils.dateparse import parse_duration
-from django.utils.duration import duration_string
+from django.utils.duration import duration_iso_string, duration_string
 
 
 class TestDurationString(unittest.TestCase):
@@ -41,3 +41,41 @@ class TestParseDurationRoundtrip(unittest.TestCase):
     def test_negative(self):
         duration = datetime.timedelta(days=-1, hours=1, minutes=3, seconds=5)
         self.assertEqual(parse_duration(duration_string(duration)), duration)
+
+
+class TestISODurationString(unittest.TestCase):
+
+    def test_simple(self):
+        duration = datetime.timedelta(hours=1, minutes=3, seconds=5)
+        self.assertEqual(duration_iso_string(duration), 'P0DT01H03M05S')
+
+    def test_days(self):
+        duration = datetime.timedelta(days=1, hours=1, minutes=3, seconds=5)
+        self.assertEqual(duration_iso_string(duration), 'P1DT01H03M05S')
+
+    def test_microseconds(self):
+        duration = datetime.timedelta(hours=1, minutes=3, seconds=5, microseconds=12345)
+        self.assertEqual(duration_iso_string(duration), 'P0DT01H03M05.012345S')
+
+    def test_negative(self):
+        duration = -1 * datetime.timedelta(days=1, hours=1, minutes=3, seconds=5)
+        self.assertEqual(duration_iso_string(duration), '-P1DT01H03M05S')
+
+
+class TestParseISODurationRoundtrip(unittest.TestCase):
+
+    def test_simple(self):
+        duration = datetime.timedelta(hours=1, minutes=3, seconds=5)
+        self.assertEqual(parse_duration(duration_iso_string(duration)), duration)
+
+    def test_days(self):
+        duration = datetime.timedelta(days=1, hours=1, minutes=3, seconds=5)
+        self.assertEqual(parse_duration(duration_iso_string(duration)), duration)
+
+    def test_microseconds(self):
+        duration = datetime.timedelta(hours=1, minutes=3, seconds=5, microseconds=12345)
+        self.assertEqual(parse_duration(duration_iso_string(duration)), duration)
+
+    def test_negative(self):
+        duration = datetime.timedelta(days=-1, hours=1, minutes=3, seconds=5)
+        self.assertEqual(parse_duration(duration_iso_string(duration)).total_seconds(), duration.total_seconds())