Changeset 5985 for django/trunk/tests/regressiontests/humanize

Timestamp:

08/20/07 03:50:08 (1 year ago)

Author:

mtredinnick

Message:

Fixed #3311 -- Added naturalday filter to contrib.humanize. Thanks, Jyrki Pulliainen.

Files:

• django/trunk/tests/regressiontests/humanize/tests.py (modified) (3 diffs)

django/trunk/tests/regressiontests/humanize/tests.py

@@ -1 +1 @@
-import unittest
+from datetime import timedelta, date
-from django.template import Template, Context, add_to_builtins
+from django.utils.dateformat import DateFormat
+from django.utils.translation import ugettext as _
-
-add_to_builtins('django.contrib.humanize.templatetags.humanize')
@@ -9 +12 @@
-        # Using max below ensures we go through both lists
-        # However, if the lists are not equal length, this raises an exception
-len(max(test_list,
+max(len(test_list), len(
-            test_content = test_list[index]
-            t = Template('{{ test_content|%s }}' % method)
-            rendered = t.render(Context(locals())).strip()
-            self.assertEqual(rendered, result_list[index],
-
-
+
-
-    def test_ordinal(self):
@@ -50 +52 @@
-        self.humanize_tester(test_list, result_list, 'apnumber')
-
+    def test_naturalday(self):
+        from django.template import defaultfilters
+        today = date.today()
+        yesterday = today - timedelta(days=1)
+        tomorrow = today + timedelta(days=1)
+        someday = today - timedelta(days=10)
+        notdate = u"I'm not a date value"
+
+        test_list = (today, yesterday, tomorrow, someday, notdate)
+        someday_result = defaultfilters.date(someday)
+        result_list = (_(u'today'), _(u'yesterday'), _(u'tomorrow'),
+                       someday_result, u"I'm not a date value")
+        self.humanize_tester(test_list, result_list, 'naturalday')
+
-if __name__ == '__main__':
-    unittest.main()