home · contact · privacy
More Days HTTP testing refactoring.
[plomtask] / tests / days.py
index 81dbcf58c0cf3d4215044809a3851017fbfa169e..e2d0548efd81734f86c52cdee9a32f3bfe62c349 100644 (file)
 from unittest import TestCase
 from datetime import datetime
 from tests.utils import TestCaseWithDB, TestCaseWithServer
-from plomtask.days import Day, todays_date
-from plomtask.exceptions import BadFormatException, NotFoundException
+from plomtask.dating import date_in_n_days
+from plomtask.days import Day
 
 
 class TestsSansDB(TestCase):
     """Days module tests not requiring DB setup."""
+    legal_ids = ['2024-01-01']
+    illegal_ids = ['foo', '2024-02-30', '2024-02-01 23:00:00']
 
-    def test_Day_dates(self) -> None:
-        """Test Day's date format."""
-        with self.assertRaises(BadFormatException):
-            Day('foo')
-        with self.assertRaises(BadFormatException):
-            Day('2024-02-30')
-        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_datetime_weekday_neighbor_dates(self) -> None:
+        """Test Day's date parsing."""
+        self.assertEqual(datetime(2024, 5, 1), Day('2024-05-01').datetime)
+        self.assertEqual('Sunday', Day('2024-03-17').weekday)
+        self.assertEqual('March', Day('2024-03-17').month_name)
+        self.assertEqual('2023-12-31', Day('2024-01-01').prev_date)
+        self.assertEqual('2023-03-01', Day('2023-02-28').next_date)
 
     def test_Day_sorting(self) -> None:
-        """Test Day.__lt__."""
+        """Test sorting by .__lt__ and Day.__eq__."""
         day1 = Day('2024-01-01')
         day2 = Day('2024-01-02')
         day3 = Day('2024-01-03')
         days = [day3, day1, day2]
         self.assertEqual(sorted(days), [day1, day2, day3])
 
-    def test_Day_weekday(self) -> None:
-        """Test Day.weekday."""
-        self.assertEqual(Day('2024-03-17').weekday, 'Sunday')
-
 
 class TestsWithDB(TestCaseWithDB):
-    """Days module tests not requiring DB setup."""
+    """Tests requiring DB, but not server setup."""
+    checked_class = Day
+    default_ids = ('2024-01-01', '2024-01-02', '2024-01-03')
 
-    def test_Day_by_date(self) -> None:
-        """Test Day.by_date()."""
-        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(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) -> 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')
-        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, ('2024-01-01', '2024-01-03')),
+    def test_Day_by_date_range_filled(self) -> None:
+        """Test Day.by_date_range_filled."""
+        date1, date2, date3 = self.default_ids
+        day1 = Day(date1)
+        day2 = Day(date2)
+        day3 = Day(date3)
+        for day in [day1, day2, day3]:
+            day.save(self.db_conn)
+        # check date range includes limiter days
+        self.assertEqual(Day.by_date_range_filled(self.db_conn, date1, date3),
                          [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-02', '2024-01-03')),
+        # check first date range value excludes what's earlier
+        self.assertEqual(Day.by_date_range_filled(self.db_conn, date2, date3),
                          [day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '')),
-                         [day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-01', '')),
-                         [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('', '2024-01-02')),
+        # check second date range value excludes what's later
+        self.assertEqual(Day.by_date_range_filled(self.db_conn, date1, date2),
                          [day1, day2])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '2024-01-01')),
+        # check swapped (impossible) date range returns emptiness
+        self.assertEqual(Day.by_date_range_filled(self.db_conn, date3, date1),
                          [])
-        day4 = Day('2024-01-04')
+        # check fill_gaps= instantiates unsaved dates within date range
+        # (but does not store them)
         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) -> 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')
+        day7 = Day('2024-01-07')
+        self.assertEqual(Day.by_date_range_filled(self.db_conn,
+                                                  day5.date, day7.date),
+                         [day5, day6, day7])
+        self.check_identity_with_cache_and_db([day1, day2, day3, day6])
+        # check 'today' is interpreted as today's date
+        today = Day(date_in_n_days(0))
+        self.assertEqual(Day.by_date_range_filled(self.db_conn,
+                                                  'today', 'today'),
+                         [today])
+        prev_day = Day(date_in_n_days(-1))
+        next_day = Day(date_in_n_days(1))
+        self.assertEqual(Day.by_date_range_filled(self.db_conn,
+                                                  'yesterday', 'tomorrow'),
+                         [prev_day, today, next_day])
 
 
 class TestsWithServer(TestCaseWithServer):
     """Tests against our HTTP server/handler (and database)."""
 
+    @staticmethod
+    def todo_as_dict(id_: int = 1,
+                     process_id: int = 1,
+                     date: str = '2024-01-01',
+                     ) -> dict[str, object]:
+        """Return JSON of Process to expect."""
+        # pylint: disable=too-many-arguments
+        d = {'id': id_,
+             'date': date,
+             'process_id': process_id,
+             'is_done': False,
+             'calendarize': False,
+             'comment': '',
+             'children': [],
+             'parents': [],
+             'effort': None,
+             'conditions': [],
+             'disables': [],
+             'enables': [],
+             'blockers': []}
+        return d
+
+    @staticmethod
+    def todo_node_as_dict(todo_id: int) -> dict[str, object]:
+        """Return JSON of TodoNode to expect."""
+        return {'children': [], 'seen': False, 'todo': todo_id}
+
+    @staticmethod
+    def get_day_dict(date: str) -> dict[str, object]:
+        """Return JSON of GET /day to expect."""
+        day: dict[str, object] = {'id': date, 'comment': '', 'todos': []}
+        d: dict[str, object]
+        d = {'day': date,
+             'top_nodes': [],
+             'make_type': '',
+             'enablers_for': {},
+             'disablers_for': {},
+             'conditions_present': [],
+             'processes': [],
+             '_library': {'Day': TestsWithServer.as_refs([day])}}
+        return d
+
+    def test_do_GET_day_basics(self) -> None:
+        """Test GET /day basics."""
+        # check undefined day
+        date = date_in_n_days(0)
+        expected = self.get_day_dict(date)
+        self.check_json_get('/day', expected)
+        # check "today", "yesterday", "tomorrow" days
+        self.check_json_get('/day?date=today', expected)
+        expected = self.get_day_dict(date_in_n_days(1))
+        self.check_json_get('/day?date=tomorrow', expected)
+        expected = self.get_day_dict(date_in_n_days(-1))
+        self.check_json_get('/day?date=yesterday', expected)
+        # check wrong day strings
+        self.check_get('/day?date=foo', 400)
+        self.check_get('/day?date=2024-02-30', 400)
+        # check defined day
+        date = '2024-01-01'
+        expected = self.get_day_dict(date)
+        self.check_json_get(f'/day?date={date}', expected)
+        # check saved day
+        post_day: dict[str, object] = {'day_comment': 'foo', 'make_type': ''}
+        self.check_post(post_day, f'/day?date={date}', 302,
+                        f'/day?date={date}&make_type=')
+        assert isinstance(expected['_library'], dict)
+        day = expected['_library']['Day'][date]
+        day['comment'] = post_day['day_comment']
+        self.check_json_get(f'/day?date={date}', expected)
+        # check GET parameter POST not affecting reply to non-parameter GET
+        post_day['make_type'] = 'foo'
+        self.check_post(post_day, f'/day?date={date}', 302,
+                        f'/day?date={date}&make_type=foo')
+        self.check_json_get(f'/day?date={date}', expected)
+        expected['make_type'] = 'bar'
+        self.check_json_get(f'/day?date={date}&make_type=bar', expected)
+
+    def test_do_GET_day_with_todos(self) -> None:
+        """Test GET /day displaying posted Todos (no tree structure)."""
+        # check GET with two Todos and Processes
+        date = '2024-01-01'
+        post_day: dict[str, object] = {'day_comment': '', 'make_type': ''}
+        self.check_post(post_day, f'/day?date={date}', 302,
+                        f'/day?date={date}&make_type=')
+        expected = self.get_day_dict(date)
+        self.post_process(1)
+        post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9}
+        self.post_process(2, post_proc2)
+        post_day['new_todo'] = [1, 2]
+        self.check_post(post_day, f'/day?date={date}', 302,
+                        f'/day?date={date}&make_type=')
+        proc1 = self.proc_as_dict(1, 'foo', 'foo', 1.1)
+        proc2 = self.proc_as_dict(2, 'bar', 'rab', 0.9)
+        assert isinstance(expected['_library'], dict)
+        expected['_library']['Process'] = self.as_refs([proc1, proc2])
+        expected['processes'] = self.as_id_list([proc1, proc2])
+        t1 = self.todo_as_dict(1, 1, date)
+        t2 = self.todo_as_dict(2, 2, date)
+        expected['_library']['Todo'] = self.as_refs([t1, t2])
+        day = expected['_library']['Day'][date]
+        day['todos'] = self.as_id_list([t1, t2])
+        n1 = self.todo_node_as_dict(1)
+        n2 = self.todo_node_as_dict(2)
+        expected['top_nodes'] = [n1, n2]
+        self.check_json_get(f'/day?date={date}', expected)
+
     def test_do_GET(self) -> None:
         """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)
@@ -103,8 +194,8 @@ class TestsWithServer(TestCaseWithServer):
 
     def test_do_POST_day(self) -> None:
         """Test POST /day."""
-        form_data = {'comment': ''}
+        form_data = {'day_comment': '', 'make_type': 'full'}
         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(form_data, '/day?date=2024-01-01&make_type=full', 302)
         self.check_post({'foo': ''}, '/day?date=2024-01-01', 400)