From: Christian Heller Date: Thu, 20 Jun 2024 21:42:45 +0000 (+0200) Subject: More Days HTTP testing refactoring. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/static/%7B%7Bdb.prefix%7D%7D/templates?a=commitdiff_plain;h=df81cce527b2084738523a35f49d9c53045af31d;p=plomtask More Days HTTP testing refactoring. --- diff --git a/tests/days.py b/tests/days.py index e310180..e2d0548 100644 --- 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,45 +105,46 @@ class TestsWithServer(TestCaseWithServer): """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) - 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 @@ -163,20 +159,10 @@ class TestsWithServer(TestCaseWithServer): """Test GET /day displaying posted Todos (no tree structure).""" # check GET with two Todos and Processes date = '2024-01-01' - day = self.day_dict(date) 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=') - library: dict[str, object] - library = {'Day': self.as_refs([day]), 'Process': {}, 'Todo': {}} - expected: dict[str, object] = {'day': date, - 'top_nodes': [], - 'make_type': '', - 'enablers_for': {}, - 'disablers_for': {}, - 'conditions_present': [], - 'processes': [], - '_library': library} + 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) @@ -185,11 +171,13 @@ class TestsWithServer(TestCaseWithServer): 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) - library['Process'] = self.as_refs([proc1, proc2]) + 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) - library['Todo'] = self.as_refs([t1, t2]) + 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)