Ticket #11321: 11321-r11173-test.diff

tests/regressiontests/humanize/timezone.py

@@ +1 @@
+from datetime import tzinfo, timedelta
+
+class FixedOffset(tzinfo):
+    """Fixed offset in hours east from UTC."""
+
+    def __init__(self, offset, name):
+        self.__offset = timedelta(hours=offset)
+        self.__name = name
+
+    def utcoffset(self, dt):
+        return self.__offset
+
+    def tzname(self, dt):
+        return self.__name
+
+    def dst(self, dt):
+        return timedelta(0)

tests/regressiontests/humanize/tests.py

@@ -59 +59 @@
-        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')
+    
+    def test_naturalday_tz(self):
+        from datetime import datetime
+        from django.contrib.humanize.templatetags.humanize import naturalday
+        from timezone import FixedOffset
+        
+        today = date.today()
+        
+        tz_one = FixedOffset(-12, 'TzOne')
+        tz_two = FixedOffset(12, 'TzTwo')
-
+        # Can be today or yesterday
+        date_one = datetime(today.year, today.month, today.day, tzinfo=tz_one)
+        naturalday_one = naturalday(date_one)
+        # Can be today or tomorrow
+        date_two = datetime(today.year, today.month, today.day, tzinfo=tz_two)
+        naturalday_two = naturalday(date_two)
+        
+        # As 24h of difference they will never be the same    
+        self.assertNotEqual(naturalday_one, naturalday_two)
+
-if __name__ == '__main__':
-    unittest.main()
-