X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;f=tests%2Fdays.py;h=59c9f4911b8d6b649d42cb71a9035c811af7e1df;hb=1a9557367351fe26d08ea705400b3b56394caae6;hp=4e70e097b5d1c53c709d43fb1b42462fe186c248;hpb=e87f540aa7b550881462cb88380a773b328c0a3d;p=plomtask diff --git a/tests/days.py b/tests/days.py index 4e70e09..59c9f49 100644 --- a/tests/days.py +++ b/tests/days.py @@ -78,15 +78,14 @@ 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, date: str = '2024-01-01', + conditions: None | list[int] = None, + disables: None | list[int] = None, + blockers: None | list[int] = None, + enables: None | list[int] = None ) -> dict[str, object]: """Return JSON of Process to expect.""" # pylint: disable=too-many-arguments @@ -99,10 +98,10 @@ class TestsWithServer(TestCaseWithServer): 'children': [], 'parents': [], 'effort': None, - 'conditions': [], - 'disables': [], - 'enables': [], - 'blockers': []} + 'conditions': conditions if conditions else [], + 'disables': disables if disables else [], + 'blockers': blockers if blockers else [], + 'enables': enables if enables else []} return d @staticmethod @@ -110,76 +109,165 @@ class TestsWithServer(TestCaseWithServer): """Return JSON of TodoNode to expect.""" return {'children': [], 'seen': False, 'todo': todo_id} - def test_do_GET_day(self) -> None: - """Test GET /day basics.""" - # pylint: disable=too-many-statements + @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 post_day(self, params: str = '', + form_data: None | dict[str, object] = None, + redir_to: str = '', + status: int = 302, + ) -> None: + """POST /day?{params} with form_data.""" + if not form_data: + form_data = {'day_comment': '', 'make_type': ''} + target = f'/day?{params}' + if not redir_to: + redir_to = f'{target}&make_type={form_data["make_type"]}' + self.check_post(form_data, target, status, redir_to) + + def test_do_GET_day_basics(self) -> None: + """Test GET /day basics (no Todos).""" # 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=') - 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') + post: dict[str, object] = {'day_comment': 'foo', 'make_type': ''} + self.post_day(f'date={date}', post) + assert isinstance(expected['_library'], dict) + day = expected['_library']['Day'][date] + day['comment'] = post['day_comment'] self.check_json_get(f'/day?date={date}', expected) + # check GET parameter to GET requests affects immediate reply, but … expected['make_type'] = 'bar' self.check_json_get(f'/day?date={date}&make_type=bar', expected) - # check GET with two Todos and Processes + # … not any following, … 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) - post_day['new_todo'] = [1, 2] - self.check_post(post_day, f'/day?date={date}', 302, - f'/day?date={date}&make_type=foo') - proc1 = self.proc_as_dict(1, 'foo', 'foo', 1.1) - proc2 = self.proc_as_dict(2, 'bar', 'rab', 0.9) - 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['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) + # … not even when part of a POST request + post['make_type'] = 'foo' + self.post_day(f'date={date}', post) + self.check_json_get(f'/day?date={date}', expected) + + def test_do_GET_day_with_processes_and_todos(self) -> None: + """Test GET /day displaying Processes and Todos.""" + date = '2024-01-01' + # check Processes get displayed in ['processes'] and ['_library'] + post_proc1 = {'title': 'foo', 'description': 'oof', 'effort': 1.1} + post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9} + procs_expected: list[dict[str, object]] = [{}, {}] + for i, post in enumerate([post_proc1, post_proc2]): + self.post_process(i+1, post) + assert isinstance(post['title'], str) + assert isinstance(post['description'], str) + assert isinstance(post['effort'], float) + procs_expected[i] = self.proc_as_dict(i+1, post['title'], + post['description'], + post['effort']) + self.post_day(f'date={date}') + expected = self.get_day_dict(date) + expected['processes'] = self.as_id_list(procs_expected) + assert isinstance(expected['_library'], dict) + expected['_library']['Process'] = self.as_refs(procs_expected) + self.check_json_get(f'/day?date={date}', expected) + # post Todos of either process and check their display + post_day: dict[str, object] + post_day = {'day_comment': '', 'make_type': '', 'new_todo': [1, 2]} + self.post_day(f'date={date}', post_day) + todos = [self.todo_as_dict(1, 1, date), self.todo_as_dict(2, 2, date)] + expected['_library']['Todo'] = self.as_refs(todos) + expected['_library']['Day'][date]['todos'] = self.as_id_list(todos) + nodes = [self.todo_node_as_dict(1), self.todo_node_as_dict(2)] + expected['top_nodes'] = nodes + self.check_json_get(f'/day?date={date}', expected) + # add a comment to one Todo and set the other's doneness and effort + post_day['new_todo'] = [] + post_day['todo_id'] = [1, 2] + post_day['done'] = [2] + post_day['comment'] = ['FOO', ''] + post_day['effort'] = ['2.3', ''] + self.post_day(f'date={date}', post_day) + expected['_library']['Todo']['1']['comment'] = 'FOO' + expected['_library']['Todo']['1']['effort'] = 2.3 + expected['_library']['Todo']['2']['is_done'] = True + self.check_json_get(f'/day?date={date}', expected) + + def test_do_GET_day_with_conditions(self) -> None: + """Test GET /day displaying Conditions and their relations.""" + # add Process with Conditions and their Todos, check display + # pylint: disable=too-many-locals + post_cond1 = {'title': 'A', 'description': '', 'is_active': False} + post_cond2 = {'title': 'B', 'description': '', 'is_active': True} + conds: list[dict[str, object]] = [{}, {}] + for i, post in enumerate([post_cond1, post_cond2]): + self.check_post(post, f'/condition?id={i+1}', 302) + assert isinstance(post['is_active'], bool) + assert isinstance(post['title'], str) + assert isinstance(post['description'], str) + conds[i] = self.cond_as_dict(i+1, post['is_active'], + [post['title']], + [post['description']]) + post_proc1 = {'title': 'foo', 'description': 'oof', 'effort': 1.1} + post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9} + procs: list[dict[str, object]] = [{}, {}] + cond_names = ('conditions', 'disables', 'blockers', 'enables') + cond_vals = ((1, 1, 2, 2), (2, 2, 1, 1)) + for i, post in enumerate([post_proc1, post_proc2]): + assert isinstance(post['title'], str) + assert isinstance(post['description'], str) + assert isinstance(post['effort'], float) + procs[i] = self.proc_as_dict(i+1, post['title'], + post['description'], post['effort']) + for j, cond_name in enumerate(cond_names): + post[cond_name] = [cond_vals[i][j]] + procs[i][cond_name] = [cond_vals[i][j]] + self.post_process(i+1, post) + date = '2024-01-01' + expected = self.get_day_dict(date) + expected['processes'] = self.as_id_list(procs) + assert isinstance(expected['_library'], dict) + expected['_library']['Process'] = self.as_refs(procs) + expected['_library']['Condition'] = self.as_refs(conds) + self.post_day(f'date={date}') + self.check_json_get(f'/day?date={date}', expected) + # add Todos in relation to Conditions, check consequences + post_day: dict[str, object] + post_day = {'day_comment': '', 'make_type': '', 'new_todo': [1, 2]} + self.post_day(f'date={date}', post_day) + todos = [self.todo_as_dict(1, 1, date, [1], [1], [2], [2]), + self.todo_as_dict(2, 2, date, [2], [2], [1], [1])] + expected['_library']['Todo'] = self.as_refs(todos) + expected['_library']['Day'][date]['todos'] = self.as_id_list(todos) + nodes = [self.todo_node_as_dict(1), self.todo_node_as_dict(2)] + expected['top_nodes'] = nodes + expected['disablers_for'] = {'1': [1], '2': [2]} + expected['enablers_for'] = {'1': [2], '2': [1]} + expected['conditions_present'] = self.as_id_list(conds) self.check_json_get(f'/day?date={date}', expected) def test_do_GET(self) -> None: