X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=tests%2Ftest_days.py;h=bc2e82d2dee69766f451a50dc6c90ae1e2abf834;hb=32f7f7084797cfa3a303e2c68ce46dfcf2b436bf;hp=08ce637501887b86bb626a465a19a1e1cae4ece5;hpb=fba983f72a30a9e30c905e5fc874d8843322a271;p=plomtask

diff --git a/tests/test_days.py b/tests/test_days.py
index 08ce637..bc2e82d 100644
--- a/tests/test_days.py
+++ b/tests/test_days.py
@@ -6,7 +6,7 @@ from urllib.parse import urlencode
 from datetime import datetime
 from os import remove as remove_file
 from plomtask.http import TaskHandler, TaskServer
-from plomtask.days import Day
+from plomtask.days import Day, todays_date
 from plomtask.misc import HandledException
 from plomtask.db import DatabaseFile, DatabaseConnection
 
@@ -89,18 +89,21 @@ class TestsWithDB(TestCase):
                          [day1, day2])
         self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '2024-01-01')),
                          [])
-
-    def test_Day_comment(self):
-        """Test Day.by_date()."""
-        self.assertEqual(None, Day.by_date(self.db_conn, '2024-01-01'))
-        d1 = Day('2024-01-01')
-        d1.save(self.db_conn)
-        day_retrieved = Day.by_date(self.db_conn, d1.date)
-        self.assertEqual(day_retrieved.comment, '')
-        d2 = Day('2024-01-02', 'foo')
-        d2.save(self.db_conn)
-        day_retrieved = Day.by_date(self.db_conn, d2.date)
-        self.assertEqual(day_retrieved.comment, 'foo')
+        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, ('2024-01-02', '2024-01-07'),
+                                 fill_gaps=True),
+                         [day2, day3, day4, day5, day6])
+        today = Day(todays_date())
+        today.save(self.db_conn)
+        self.assertEqual(Day.all(self.db_conn, ('today', 'today')), [today])
+
+    def test_Day_neighbor_dates(self):
+        """Test Day.prev_date and Day.next_date."""
+        self.assertEqual(Day('2024-01-01').prev_date, '2023-12-31')
+        self.assertEqual(Day('2023-02-28').next_date, '2023-03-01')
 
 
 class TestsWithServer(TestsWithDB):
@@ -142,6 +145,14 @@ class TestsWithServer(TestsWithDB):
         self.assertEqual(http_conn.getresponse().status, 400)
         http_conn.request('GET', '/calendar')
         self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/calendar?start=&end=')
+        self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/calendar?start=today&end=today')
+        self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/calendar?start=2024-01-01&end=2025-01-01')
+        self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/calendar?start=foo')
+        self.assertEqual(http_conn.getresponse().status, 400)
 
     def tearDown(self):
         self.httpd.shutdown()