diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2013-01-29 23:51:53 +0100 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2013-01-29 23:51:53 +0100 |
commit | 745dfc4b1ebaec9086184412b2e6d426a23cc8e9 (patch) | |
tree | d02325b925ee0ee5f93cee8cd5ef2b9fc83121d5 /rhodecode/tests | |
parent | 366f92533d88bd1a971f820cdfe4849a1d2275e6 (diff) |
fixed AGE funtion for future dates, testa are now cleaner with dateutil usage
--HG--
branch : beta
Diffstat (limited to 'rhodecode/tests')
-rw-r--r-- | rhodecode/tests/test_libs.py | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/rhodecode/tests/test_libs.py b/rhodecode/tests/test_libs.py index fe541081..a4864fc7 100644 --- a/rhodecode/tests/test_libs.py +++ b/rhodecode/tests/test_libs.py @@ -119,39 +119,36 @@ class TestLibs(unittest.TestCase): self.assertEqual(s, extract_mentioned_users(sample)) def test_age(self): - import calendar from rhodecode.lib.utils2 import age + from dateutil import relativedelta n = datetime.datetime.now() - delt = lambda *args, **kwargs: datetime.timedelta(*args, **kwargs) - prev_month = n.month - 1 if n.month != 1 else n.month - 2 + delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs) + self.assertEqual(age(n), u'just now') - self.assertEqual(age(n - delt(seconds=1)), u'1 second ago') - self.assertEqual(age(n - delt(seconds=60 * 2)), u'2 minutes ago') - self.assertEqual(age(n - delt(hours=1)), u'1 hour ago') - self.assertEqual(age(n - delt(hours=24)), u'1 day ago') - self.assertEqual(age(n - delt(hours=24 * 5)), u'5 days ago') - self.assertEqual(age(n - delt(hours=24 * (calendar.mdays[prev_month]))), - u'1 month ago') - self.assertEqual(age(n - delt(hours=24 * (calendar.mdays[prev_month] + 2))), - u'1 month and 2 days ago') - self.assertEqual(age(n - delt(hours=24 * 400)), u'1 year and 1 month ago') + self.assertEqual(age(n + delt(seconds=-1)), u'1 second ago') + self.assertEqual(age(n + delt(seconds=-60 * 2)), u'2 minutes ago') + self.assertEqual(age(n + delt(hours=-1)), u'1 hour ago') + self.assertEqual(age(n + delt(hours=-24)), u'1 day ago') + self.assertEqual(age(n + delt(hours=-24 * 5)), u'5 days ago') + self.assertEqual(age(n + delt(months=-1)), u'1 month ago') + self.assertEqual(age(n + delt(months=-1, days=-2)), u'1 month and 2 days ago') + self.assertEqual(age(n + delt(years=-1, months=-1)), u'1 year and 1 month ago') def test_age_in_future(self): - import calendar from rhodecode.lib.utils2 import age + from dateutil import relativedelta n = datetime.datetime.now() - delt = lambda *args, **kwargs: datetime.timedelta(*args, **kwargs) + delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs) + self.assertEqual(age(n), u'just now') self.assertEqual(age(n + delt(seconds=1)), u'in 1 second') self.assertEqual(age(n + delt(seconds=60 * 2)), u'in 2 minutes') self.assertEqual(age(n + delt(hours=1)), u'in 1 hour') self.assertEqual(age(n + delt(hours=24)), u'in 1 day') self.assertEqual(age(n + delt(hours=24 * 5)), u'in 5 days') - self.assertEqual(age(n + delt(hours=24 * (calendar.mdays[n.month]))), - u'in 1 month') - self.assertEqual(age(n + delt(hours=24 * (calendar.mdays[n.month] + 1))), - u'in 1 month and 1 day') - self.assertEqual(age(n + delt(hours=24 * 400)), u'in 1 year and 1 month') + self.assertEqual(age(n + delt(months=1)), u'in 1 month') + self.assertEqual(age(n + delt(months=1, days=1)), u'in 1 month and 1 day') + self.assertEqual(age(n + delt(years=1, months=1)), u'in 1 year and 1 month') def test_tag_exctrator(self): sample = ( |