X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=tests%2Fdays.py;h=856ce9978dc1d12cb0f8fc1040f02257b21ddedb;hb=bc75c875576268d24f6e93af15b6198939785fea;hp=5c910ecdb9cf639c44ed6e0492aaae1190a20f65;hpb=c01144241aec26aa6b8fc8c2a6e9bb90136b96c9;p=plomtask
diff --git a/tests/days.py b/tests/days.py
index 5c910ec..856ce99 100644
--- a/tests/days.py
+++ b/tests/days.py
@@ -124,7 +124,7 @@ class TestsWithServer(TestCaseWithServer):
'_library': {'Day': TestsWithServer.as_refs([day])}}
return d
- def post_day(self, params: str,
+ def post_day(self, params: str = '',
form_data: None | dict[str, object] = None,
redir_to: str = '',
status: int = 302,
@@ -163,35 +163,40 @@ class TestsWithServer(TestCaseWithServer):
day = expected['_library']['Day'][date]
day['comment'] = post['day_comment']
self.check_json_get(f'/day?date={date}', expected)
- # check GET parameter of a POST does not affect reply to param-free GET
+ # 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)
- expected['make_type'] = 'bar'
- self.check_json_get(f'/day?date={date}&make_type=bar', expected)
- def test_do_GET_day_with_todos_flat(self) -> None:
- """Test GET /day displaying posted Todos (no tree structure)."""
- # post two Todos of differing processes and check their display
+ 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']
+ 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)
- post_proc1 = {'title': 'foo', 'description': 'oof', 'effort': 1.1}
- post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9}
- procs: 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[i] = self.proc_as_dict(i+1, post['title'],
- post['description'], post['effort'])
+ 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)
- assert isinstance(expected['_library'], dict)
- expected['_library']['Process'] = self.as_refs(procs)
- expected['processes'] = self.as_id_list(procs)
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)
@@ -214,39 +219,33 @@ class TestsWithServer(TestCaseWithServer):
"""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]):
+ 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)
- 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]] = [{}, {}]
- names_input = ('condition', 'disables', 'blocker', 'enables')
- names_output = ('conditions', 'disables', 'blockers', 'enables')
+ 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, 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, name_input in enumerate(names_input):
- post[name_input] = [cond_vals[i][j]]
- procs[i][names_output[j]] = [cond_vals[i][j]]
- self.post_process(i+1, post)
+ 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['processes'] = self.as_id_list(procs_expected)
assert isinstance(expected['_library'], dict)
- expected['_library']['Process'] = self.as_refs(procs)
- expected['_library']['Condition'] = self.as_refs(conds)
+ 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
@@ -261,7 +260,7 @@ class TestsWithServer(TestCaseWithServer):
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['conditions_present'] = self.as_id_list(conds_expected)
self.check_json_get(f'/day?date={date}', expected)
def test_do_GET(self) -> None: