Ubuntu Software Center

Merge lp:~brendan-donegan/software-center/test_utils_get_nice_date_string into lp:software-center

  1. test_utils_get_nice_date_string
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Merged at revision: 2700
Proposed branch: lp:~brendan-donegan/software-center/test_utils_get_nice_date_string
Merge into: lp:software-center
Diff against target: 41 lines (+21/-1)
1 file modified
test/test_utils.py (+21/-1)
To merge this branch: bzr merge lp:~brendan-donegan/software-center/test_utils_get_nice_date_string
Reviewer Review Type Date Requested Status
Gary Lasker (community) Approve
software-center-developers Pending
Review via email: mp+90172@code.launchpad.net

Description of the change

I added a test function in test_utils.py which covers all of get_nice_date_string. It doesn't actually increase the code coverage percentage by a whole integer, but hopefully the tests are useful :)

To post a comment you must log in.
Revision history for this message
Gary Lasker (gary-lasker) wrote :

Hi Brendan, these are great! Thanks a lot!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/test_utils.py'
2--- test/test_utils.py 2012-01-18 18:03:39 +0000
3+++ test/test_utils.py 2012-01-25 17:56:46 +0000
4@@ -1,9 +1,9 @@
5 #!/usr/bin/python
6
7 import os
8+import datetime
9 import unittest
10
11-
12 from testutils import setup_test_env
13 setup_test_env()
14 from softwarecenter.utils import (decode_xml_char_reference,
15@@ -99,6 +99,26 @@
16 self.assertEqual(split_icon_ext(changed),
17 os.path.splitext(changed)[0])
18
19+ def test_get_nice_date_string(self):
20+ from softwarecenter.utils import get_nice_date_string
21+
22+ now = datetime.datetime.utcnow()
23+
24+ ten_secs_ago = now + datetime.timedelta(seconds=-10)
25+ self.assertEqual(get_nice_date_string(ten_secs_ago), 'a few minutes ago')
26+
27+ two_mins_ago = now + datetime.timedelta(minutes=-2)
28+ self.assertEqual(get_nice_date_string(two_mins_ago), '2 minutes ago')
29+
30+ under_a_day = now + datetime.timedelta(hours=-23, minutes=-59, seconds=-59)
31+ self.assertEqual(get_nice_date_string(under_a_day), '23 hours ago')
32+
33+ under_a_week = now + datetime.timedelta(days=-4, hours=-23, minutes=-59, seconds=-59)
34+ self.assertEqual(get_nice_date_string(under_a_week), '4 days ago')
35+
36+ over_a_week = now + datetime.timedelta(days=-7)
37+ self.assertEqual(get_nice_date_string(over_a_week), over_a_week.isoformat().split('T')[0])
38+
39
40 if __name__ == "__main__":
41 import logging