X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=tests%2Fdays.py;h=7cb0f4fa6c9da13e8064e7e51a8c40e7284c7375;hb=36d71cd777259ad08da17aeb0b0ef05fc40156ca;hp=5ff6459f48e34e09b945b5f79f62d0176c3295f8;hpb=f20d686a4972db5e6bc10bdbd48d27d4b035a716;p=plomtask
diff --git a/tests/days.py b/tests/days.py
index 5ff6459..7cb0f4f 100644
--- a/tests/days.py
+++ b/tests/days.py
@@ -1,30 +1,25 @@
"""Test Days module."""
from unittest import TestCase
-from http.client import HTTPConnection
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):
"""Days module tests not requiring DB setup."""
- def test_Day_dates(self):
+ 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):
- Day(None)
- with self.assertRaises(HandledException):
- Day(3)
- 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)
- def test_Day_sorting(self):
+ def test_Day_sorting(self) -> None:
"""Test Day.__lt__."""
day1 = Day('2024-01-01')
day2 = Day('2024-01-02')
@@ -32,7 +27,7 @@ class TestsSansDB(TestCase):
days = [day3, day1, day2]
self.assertEqual(sorted(days), [day1, day2, day3])
- def test_Day_weekday(self):
+ def test_Day_weekday(self) -> None:
"""Test Day.weekday."""
self.assertEqual(Day('2024-03-17').weekday, 'Sunday')
@@ -40,18 +35,19 @@ class TestsSansDB(TestCase):
class TestsWithDB(TestCaseWithDB):
"""Days module tests not requiring DB setup."""
- def test_Day_by_date(self):
+ def test_Day_by_date(self) -> None:
"""Test Day.by_date()."""
- self.assertEqual(None, Day.by_date(self.db_conn, '2024-01-01'))
+ 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'))
- self.assertEqual(None,
- Day.by_date(self.db_conn, '2024-01-02'))
+ 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))
- def test_Day_all(self):
+ 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')
@@ -59,8 +55,7 @@ class TestsWithDB(TestCaseWithDB):
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')),
@@ -86,7 +81,7 @@ class TestsWithDB(TestCaseWithDB):
today.save(self.db_conn)
self.assertEqual(Day.all(self.db_conn, ('today', 'today')), [today])
- def test_Day_neighbor_dates(self):
+ def test_Day_neighbor_dates(self) -> None:
"""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')
@@ -95,22 +90,27 @@ class TestsWithDB(TestCaseWithDB):
class TestsWithServer(TestCaseWithServer):
"""Tests against our HTTP server/handler (and database)."""
- 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 test_do_GET(self) -> None:
+ """Test /day and /calendar response codes, and / redirect."""
+ 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)
+ self.conn.request('GET', '/')
+ response = self.conn.getresponse()
+ self.assertEqual(response.status, 302)
+ self.assertEqual(response.getheader('Location'), '/day')
+ self.conn.request('GET', '/foo')
+ self.assertEqual(self.conn.getresponse().status, 404)