X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=tests%2Fdays.py;h=81dbcf58c0cf3d4215044809a3851017fbfa169e;hb=4724d02b2c8a7fac3029ae6380641c4093fa4554;hp=f3ed08228aafa3550ed49caa1bf022f144285e6e;hpb=3558a14701955de18ae7adbda0e93aaee7710a92;p=plomtask

diff --git a/tests/days.py b/tests/days.py
index f3ed082..81dbcf5 100644
--- a/tests/days.py
+++ b/tests/days.py
@@ -3,7 +3,7 @@ from unittest import TestCase
 from datetime import datetime
 from tests.utils import TestCaseWithDB, TestCaseWithServer
 from plomtask.days import Day, todays_date
-from plomtask.misc import HandledException
+from plomtask.exceptions import BadFormatException, NotFoundException
 
 
 class TestsSansDB(TestCase):
@@ -11,11 +11,11 @@ class TestsSansDB(TestCase):
 
     def test_Day_dates(self) -> None:
         """Test Day's date format."""
-        with self.assertRaises(HandledException):
+        with self.assertRaises(BadFormatException):
             Day('foo')
-        with self.assertRaises(HandledException):
+        with self.assertRaises(BadFormatException):
             Day('2024-02-30')
-        with self.assertRaises(HandledException):
+        with self.assertRaises(BadFormatException):
             Day('2024-02-01 23:00:00')
         self.assertEqual(datetime(2024, 1, 1), Day('2024-01-01').datetime)
 
@@ -37,12 +37,12 @@ class TestsWithDB(TestCaseWithDB):
 
     def test_Day_by_date(self) -> None:
         """Test Day.by_date()."""
-        with self.assertRaises(HandledException):
+        with self.assertRaises(NotFoundException):
             Day.by_date(self.db_conn, '2024-01-01')
         Day('2024-01-01').save(self.db_conn)
         self.assertEqual(Day('2024-01-01'),
                          Day.by_date(self.db_conn, '2024-01-01'))
-        with self.assertRaises(HandledException):
+        with self.assertRaises(NotFoundException):
             Day.by_date(self.db_conn, '2024-01-02')
         self.assertEqual(Day('2024-01-02'),
                          Day.by_date(self.db_conn, '2024-01-02', create=True))
@@ -91,20 +91,20 @@ 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, 400)
-        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, 400)
+        """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)