More Days HTTP testing refactoring.

[plomtask] / tests / days.py

diff --git a/tests/days.py b/tests/days.py
index 4e70e097b5d1c53c709d43fb1b42462fe186c248..e2d0548efd81734f86c52cdee9a32f3bfe62c349 100644 (file)
--- a/tests/days.py
+++ b/tests/days.py
@@ -78,11 +78,6 @@ class TestsWithDB(TestCaseWithDB):
 class TestsWithServer(TestCaseWithServer):
     """Tests against our HTTP server/handler (and database)."""
 
-    @staticmethod
-    def day_dict(date: str) -> dict[str, object]:
-        """Return JSON of Process to expect."""
-        return {'id': date, 'comment': '', 'todos': []}
-
     @staticmethod
     def todo_as_dict(id_: int = 1,
                      process_id: int = 1,
@@ -110,46 +105,46 @@ class TestsWithServer(TestCaseWithServer):
         """Return JSON of TodoNode to expect."""
         return {'children': [], 'seen': False, 'todo': todo_id}
 
-    def test_do_GET_day(self) -> None:
+    @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."""
-        # pylint: disable=too-many-statements
         # check undefined day
         date = date_in_n_days(0)
-        day = self.day_dict(date)
-        expected: dict[str, object]
-        expected = {'day': date,
-                    'top_nodes': [],
-                    'make_type': '',
-                    'enablers_for': {},
-                    'disablers_for': {},
-                    'conditions_present': [],
-                    'processes': [],
-                    '_library': {'Day': self.as_refs([day])}}
+        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)
-        day = self.day_dict(date_in_n_days(1))
-        expected['day'] = day['id']
-        assert isinstance(expected['_library'], dict)
-        expected['_library']['Day'] = self.as_refs([day])
+        expected = self.get_day_dict(date_in_n_days(1))
         self.check_json_get('/day?date=tomorrow', expected)
-        day = self.day_dict(date_in_n_days(-1))
-        expected['day'] = day['id']
-        expected['_library']['Day'] = self.as_refs([day])
+        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'
-        day = self.day_dict(date)
-        expected['day'] = day['id']
-        expected['_library']['Day'] = self.as_refs([day])
+        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
@@ -159,23 +154,30 @@ class TestsWithServer(TestCaseWithServer):
         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
-        expected['make_type'] = ''
-        form_data = self.post_process(1)
-        form_data['title'] = 'bar'
-        form_data['description'] = 'rab'
-        form_data['effort'] = 0.9
-        self.post_process(2, form_data)
+        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=foo')
+                        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)