Some test refactoring.

[plomtask] / tests / days.py

diff --git a/tests/days.py b/tests/days.py
index 61a27edbb0d266b892182c241d769ae36a5846b4..3524a660b023b2aedcd8c4568181f9b5a77e947d 100644 (file)
--- a/tests/days.py
+++ b/tests/days.py
@@ -33,7 +33,7 @@ class TestsSansDB(TestCase):
 
 
 class TestsWithDB(TestCaseWithDB):
-    """Days module tests not requiring DB setup."""
+    """Tests requiring DB, but not server setup."""
 
     def test_Day_by_date(self) -> None:
         """Test Day.by_date()."""
@@ -49,32 +49,36 @@ class TestsWithDB(TestCaseWithDB):
 
     def test_Day_all(self) -> None:
         """Test Day.all(), especially in regards to date range filtering."""
-        day1 = Day('2024-01-01')
-        day2 = Day('2024-01-02')
-        day3 = Day('2024-01-03')
+        date1 = '2024-01-01'
+        date2 = '2024-01-02'
+        date3 = '2024-01-03'
+        day1 = Day(date1)
+        day2 = Day(date2)
+        day3 = Day(date3)
         day1.save(self.db_conn)
         day2.save(self.db_conn)
         day3.save(self.db_conn)
-        self.assertEqual(Day.all(self.db_conn), [day1, day2, day3])
+        self.assertEqual(Day.all(self.db_conn),
+                         [day1, day2, day3])
         self.assertEqual(Day.all(self.db_conn, ('', '')),
                          [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-01', '2024-01-03')),
+        self.assertEqual(Day.all(self.db_conn, (date1, date3)),
                          [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-02', '2024-01-03')),
+        self.assertEqual(Day.all(self.db_conn, (date2, date3)),
                          [day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '')),
+        self.assertEqual(Day.all(self.db_conn, (date3, '')),
                          [day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-01', '')),
+        self.assertEqual(Day.all(self.db_conn, (date1, '')),
                          [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('', '2024-01-02')),
+        self.assertEqual(Day.all(self.db_conn, ('', date2)),
                          [day1, day2])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '2024-01-01')),
+        self.assertEqual(Day.all(self.db_conn, (date3, date1)),
                          [])
         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'),
+        self.assertEqual(Day.all(self.db_conn, (date2, '2024-01-07'),
                                  fill_gaps=True),
                          [day2, day3, day4, day5, day6])
         today = Day(todays_date())
@@ -86,25 +90,33 @@ class TestsWithDB(TestCaseWithDB):
         self.assertEqual(Day('2024-01-01').prev_date, '2023-12-31')
         self.assertEqual(Day('2023-02-28').next_date, '2023-03-01')
 
+    def test_Day_singularity(self) -> None:
+        """Test pointers made for single object keep pointing to it."""
+        day = Day('2024-01-01')
+        day.save(self.db_conn)
+        retrieved_day = Day.by_date(self.db_conn, '2024-01-01')
+        day.comment = 'foo'
+        self.assertEqual(retrieved_day.comment, 'foo')
+
 
 class TestsWithServer(TestCaseWithServer):
     """Tests against our HTTP server/handler (and database)."""
 
     def test_do_GET(self) -> None:
-        """Test /day and /calendar response codes."""
-        self.conn.request('GET', '/day')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/day?date=3000-01-01')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/day?date=FOO')
-        self.assertEqual(self.conn.getresponse().status, 401)
-        self.conn.request('GET', '/calendar')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/calendar?start=&end=')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/calendar?start=today&end=today')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/calendar?start=2024-01-01&end=2025-01-01')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/calendar?start=foo')
-        self.assertEqual(self.conn.getresponse().status, 401)
+        """Test /day and /calendar response codes, and / redirect."""
+        self.check_get('/day', 200)
+        self.check_get('/day?date=3000-01-01', 200)
+        self.check_get('/day?date=FOO', 400)
+        self.check_get('/calendar', 200)
+        self.check_get('/calendar?start=&end=', 200)
+        self.check_get('/calendar?start=today&end=today', 200)
+        self.check_get('/calendar?start=2024-01-01&end=2025-01-01', 200)
+        self.check_get('/calendar?start=foo', 400)
+
+    def test_do_POST_day(self) -> None:
+        """Test POST /day."""
+        form_data = {'comment': ''}
+        self.check_post(form_data, '/day', 400)
+        self.check_post(form_data, '/day?date=foo', 400)
+        self.check_post(form_data, '/day?date=2024-01-01', 302, '/')
+        self.check_post({'foo': ''}, '/day?date=2024-01-01', 400)