optimization; refactoring tests

tomi77 · Oct 24, 2014 · 8bc116a · 8bc116a
1 parent c643dcf
commit 8bc116a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 11 deletions.
diff --git a/best_before.py b/best_before.py
@@ -29,7 +29,7 @@ def possible_dates(date, separator=None):
         else:
             dates.add(new_date)
 
-    return sorted(dates)
+    return dates
 
 
 if __name__ == '__main__':

diff --git a/test_best_before.py b/test_best_before.py
@@ -9,13 +9,40 @@
 
 class TestPossibleDates(TestCase):
     def test_possible_dates(self):
-        self.assertEqual(possible_dates('01/01/01'), [date(2001, 1, 1)])
-        self.assertEqual(possible_dates('01/01/99'), [date(2099, 1, 1)])
-        self.assertEqual(possible_dates('12/11/10'), [date(2010, 11, 12), date(2010, 12, 11), date(2011, 10, 12),
-                                                      date(2011, 12, 10), date(2012, 10, 11), date(2012, 11, 10)])
-        self.assertEqual(possible_dates('12/13/10'), [date(2010, 12, 13), date(2012, 10, 13), date(2013, 10, 12),
-                                                      date(2013, 12, 10)])
-        self.assertEqual(possible_dates('2999/1/1'), [date(2999, 1, 1)])
-        self.assertEqual(possible_dates('99/99/99'), [])
-        self.assertEqual(possible_dates('01/01/01', separator='-'), [])
-        self.assertEqual(possible_dates('01-01-01', separator='-'), [date(2001, 1, 1)])
+        dates = possible_dates('01/01/01')
+        self.assertEqual(len(dates), 1)
+        self.assertTrue(date(2001, 1, 1) in dates)
+
+        dates = possible_dates('01/01/99')
+        self.assertEqual(len(dates), 1)
+        self.assertTrue(date(2099, 1, 1) in dates)
+
+        dates = possible_dates('12/11/10')
+        self.assertEqual(len(dates), 6)
+        self.assertTrue(date(2010, 11, 12) in dates)
+        self.assertTrue(date(2010, 12, 11) in dates)
+        self.assertTrue(date(2011, 10, 12) in dates)
+        self.assertTrue(date(2011, 12, 10) in dates)
+        self.assertTrue(date(2012, 10, 11) in dates)
+        self.assertTrue(date(2012, 11, 10) in dates)
+
+        dates = possible_dates('12/13/10')
+        self.assertEqual(len(dates), 4)
+        self.assertTrue(date(2010, 12, 13) in dates)
+        self.assertTrue(date(2012, 10, 13) in dates)
+        self.assertTrue(date(2013, 10, 12) in dates)
+        self.assertTrue(date(2013, 12, 10) in dates)
+
+        dates = possible_dates('2999/1/1')
+        self.assertEqual(len(dates), 1)
+        self.assertTrue(date(2999, 1, 1) in dates)
+
+        dates = possible_dates('99/99/99')
+        self.assertEqual(len(dates), 0)
+
+        dates = possible_dates('01/01/01', separator='-')
+        self.assertEqual(len(dates), 0)
+
+        dates = possible_dates('01-01-01', separator='-')
+        self.assertEqual(len(dates), 1)
+        self.assertTrue(date(2001, 1, 1) in dates)