home · contact · privacy
Use same date ranging code for Day and Todo filtering.
[plomtask] / tests / days.py
index 9e12d3ff665550f3fb23bb603e639ce8efbf60ff..c1e1343c63c7cb24e6e7133f09538a06f7104e11 100644 (file)
@@ -2,7 +2,8 @@
 from unittest import TestCase
 from datetime import datetime
 from tests.utils import TestCaseWithDB, TestCaseWithServer
-from plomtask.days import Day, todays_date
+from plomtask.dating import todays_date
+from plomtask.days import Day
 from plomtask.exceptions import BadFormatException
 
 
@@ -81,13 +82,13 @@ class TestsWithDB(TestCaseWithDB):
                          [])
         # check fill_gaps= instantiates unsaved dates within date range
         # (but does not store them)
-        day4 = Day('2024-01-04')
         day5 = Day('2024-01-05')
         day6 = Day('2024-01-06')
         day6.save(self.db_conn)
-        self.assertEqual(Day.all(self.db_conn, (date2, '2024-01-07'),
+        day7 = Day('2024-01-07')
+        self.assertEqual(Day.all(self.db_conn, (day5.date, day7.date),
                                  fill_gaps=True),
-                         [day2, day3, day4, day5, day6])
+                         [day5, day6, day7])
         self.check_storage([day1, day2, day3, day6])
         # check 'today' is interpreted as today's date
         today = Day(todays_date())