X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=tests%2Fdays.py;h=4e70e097b5d1c53c709d43fb1b42462fe186c248;hb=e87f540aa7b550881462cb88380a773b328c0a3d;hp=d14e0afc58bd358ff92c1a032ea6f0367081acd2;hpb=b56761522f6ec874fde1eb9d4d69d8093fe70227;p=plomtask
diff --git a/tests/days.py b/tests/days.py
index d14e0af..4e70e09 100644
--- a/tests/days.py
+++ b/tests/days.py
@@ -81,42 +81,76 @@ class TestsWithServer(TestCaseWithServer):
@staticmethod
def day_dict(date: str) -> dict[str, object]:
"""Return JSON of Process to expect."""
- d: dict[str, object] = {'day': {'id': date,
- 'comment': '',
- 'todos': []},
- 'top_nodes': [],
- 'make_type': '',
- 'enablers_for': {},
- 'disablers_for': {},
- 'conditions_present': [],
- 'processes': []}
+ return {'id': date, 'comment': '', 'todos': []}
+
+ @staticmethod
+ def todo_as_dict(id_: int = 1,
+ process_id: int = 1,
+ date: str = '2024-01-01',
+ ) -> dict[str, object]:
+ """Return JSON of Process to expect."""
+ # pylint: disable=too-many-arguments
+ d = {'id': id_,
+ 'date': date,
+ 'process_id': process_id,
+ 'is_done': False,
+ 'calendarize': False,
+ 'comment': '',
+ 'children': [],
+ 'parents': [],
+ 'effort': None,
+ 'conditions': [],
+ 'disables': [],
+ 'enables': [],
+ 'blockers': []}
return d
+ @staticmethod
+ def todo_node_as_dict(todo_id: int) -> dict[str, object]:
+ """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
# check undefined day
date = date_in_n_days(0)
- expected = self.day_dict(date)
+ 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])}}
self.check_json_get('/day', expected)
# check "today", "yesterday", "tomorrow" days
self.check_json_get('/day?date=today', expected)
- expected = self.day_dict(date_in_n_days(1))
+ 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])
self.check_json_get('/day?date=tomorrow', expected)
- expected = self.day_dict(date_in_n_days(-1))
+ day = self.day_dict(date_in_n_days(-1))
+ expected['day'] = day['id']
+ expected['_library']['Day'] = self.as_refs([day])
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'
- expected = self.day_dict(date)
+ day = self.day_dict(date)
+ expected['day'] = day['id']
+ expected['_library']['Day'] = self.as_refs([day])
self.check_json_get(f'/day?date={date}', expected)
# check saved day
- post_day = {'day_comment': 'foo', 'make_type': ''}
+ 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['day'], dict)
- expected['day']['comment'] = 'foo'
+ 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'
@@ -125,6 +159,28 @@ 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)
+ # 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)
+ 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)
def test_do_GET(self) -> None:
"""Test /day and /calendar response codes, and / redirect."""