X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=tests%2Fdays.py;h=856ce9978dc1d12cb0f8fc1040f02257b21ddedb;hb=bc75c875576268d24f6e93af15b6198939785fea;hp=e2d0548efd81734f86c52cdee9a32f3bfe62c349;hpb=df81cce527b2084738523a35f49d9c53045af31d;p=plomtask
diff --git a/tests/days.py b/tests/days.py
index e2d0548..856ce99 100644
--- a/tests/days.py
+++ b/tests/days.py
@@ -82,6 +82,10 @@ class TestsWithServer(TestCaseWithServer):
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
@@ -94,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
@@ -120,8 +124,21 @@ class TestsWithServer(TestCaseWithServer):
'_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."""
+ """Test GET /day basics (no Todos)."""
# check undefined day
date = date_in_n_days(0)
expected = self.get_day_dict(date)
@@ -140,48 +157,110 @@ class TestsWithServer(TestCaseWithServer):
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=')
+ 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['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')
+ 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)
+ # ⦠not any following, â¦
+ expected['make_type'] = ''
+ 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_todos(self) -> None:
- """Test GET /day displaying posted Todos (no tree structure)."""
- # check GET with two Todos and Processes
+ def test_do_GET_day_with_processes_and_todos(self) -> None:
+ """Test GET /day displaying Processes and Todos."""
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=')
+ # check Processes get displayed in ['processes'] and ['_library']
+ procs_expected = [self.proc_as_dict(1, 'foo', 'oof', 1.1),
+ self.proc_as_dict(2, 'bar', 'rab', 0.9)]
+ for proc in procs_expected:
+ post = {}
+ assert isinstance(proc['_versioned'], dict)
+ for k in ('title', 'description', 'effort'):
+ post[k] = proc['_versioned'][k][0]
+ assert isinstance(proc['id'], int)
+ self.post_process(proc['id'], post)
+ self.post_day(f'date={date}')
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)
+ expected['processes'] = self.as_id_list(procs_expected)
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]
+ 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
+ conds_expected = [self.cond_as_dict(1, False, ['A'], ['a']),
+ self.cond_as_dict(2, True, ['B'], ['b'])]
+ for i, cond in enumerate(conds_expected):
+ post = {'is_active': cond['is_active']}
+ assert isinstance(cond['_versioned'], dict)
+ for k in ('title', 'description'):
+ post[k] = cond['_versioned'][k][0]
+ self.check_post(post, f'/condition?id={i+1}', 302)
+ procs_expected = [self.proc_as_dict(1, 'foo', 'oof', 1.1),
+ self.proc_as_dict(2, 'bar', 'rab', 0.9)]
+ cond_names = ('conditions', 'disables', 'blockers', 'enables')
+ cond_vals = ((1, 1, 2, 2), (2, 2, 1, 1))
+ for i, proc in enumerate(procs_expected):
+ post = {}
+ assert isinstance(proc['_versioned'], dict)
+ for k in ('title', 'description', 'effort'):
+ post[k] = proc['_versioned'][k][0]
+ for j, cond_name in enumerate(cond_names):
+ post[cond_name] = proc[cond_name] = [cond_vals[i][j]]
+ assert isinstance(proc['id'], int)
+ self.post_process(proc['id'], post)
+ date = '2024-01-01'
+ 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)
+ expected['_library']['Condition'] = self.as_refs(conds_expected)
+ 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_expected)
self.check_json_get(f'/day?date={date}', expected)
def test_do_GET(self) -> None: