Remove some redundant code.

[plomtask] / tests / test_days.py

diff --git a/tests/test_days.py b/tests/test_days.py
index 04f667bfb88dbbae58087399dde3aae1daf251a7..f35e6b2725cdc3545f4490d7d8fe94f940704004 100644 (file)
--- a/tests/test_days.py
+++ b/tests/test_days.py
@@ -2,10 +2,11 @@
 from unittest import TestCase
 from threading import Thread
 from http.client import HTTPConnection
+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
 
@@ -86,20 +87,16 @@ class TestsWithDB(TestCase):
                          [day1, day2, day3])
         self.assertEqual(Day.all(self.db_conn, ('', '2024-01-02')),
                          [day1, day2])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03, 2024-01-01')),
+        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '2024-01-01')),
                          [])
+        today = Day(todays_date())
+        today.save(self.db_conn)
+        self.assertEqual(Day.all(self.db_conn, ('today', 'today')), [today])
 
-    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')
+    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):
@@ -112,13 +109,43 @@ class TestsWithServer(TestsWithDB):
         self.server_thread.daemon = True
         self.server_thread.start()
 
-    def test_do_GET_day(self):
-        """Test /day response."""
-        conn = HTTPConnection(*self.httpd.server_address)
-        conn.request('GET', '/day')
-        self.assertEqual(conn.getresponse().status, 200)
-        conn.request('GET', '/day?date=FOO')
-        self.assertEqual(conn.getresponse().status, 400)
+    def test_do_POST_day(self):
+        """Test POST /day and its effect on the database."""
+        http_conn = HTTPConnection(*self.httpd.server_address)
+        form_data = {'comment': 'foo'}
+        encoded_form_data = urlencode(form_data).encode('utf-8')
+        headers = {'Content-Type': 'application/x-www-form-urlencoded',
+                   'Content-Length': str(len(encoded_form_data))}
+        http_conn.request('POST', '/day?date=FOO',
+                          body=encoded_form_data, headers=headers)
+        self.assertEqual(http_conn.getresponse().status, 400)
+        self.assertEqual(Day.all(self.db_conn), [])
+        http_conn.request('POST', '/day?date=2024-01-01',
+                          body=encoded_form_data, headers=headers)
+        self.assertEqual(http_conn.getresponse().status, 302)
+        retrieved = Day.by_date(self.db_conn, '2024-01-01')
+        self.assertEqual(retrieved.comment, 'foo')
+        self.assertEqual(Day.all(self.db_conn), [retrieved])
+
+    def test_do_GET(self):
+        """Test /day and /calendar response codes."""
+        http_conn = HTTPConnection(*self.httpd.server_address)
+        http_conn.request('GET', '/day')
+        self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/day?date=3000-01-01')
+        self.assertEqual(http_conn.getresponse().status, 200)
+        http_conn.request('GET', '/day?date=FOO')
+        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()