X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=tests%2Ftodos.py;h=b85f2d105f0f09e174f13de88506b309ccfc4f3d;hb=8c0cbef8f467d125ba7c987b3eb1f5bef7d38120;hp=52363c07b7ddbd49ba8a2ee8e4f09adda68fb16e;hpb=54e6c8bccace28583cf9926aa00917a796628a00;p=plomtask diff --git a/tests/todos.py b/tests/todos.py index 52363c0..b85f2d1 100644 --- a/tests/todos.py +++ b/tests/todos.py @@ -31,9 +31,9 @@ class TestsWithDB(TestCaseWithDB): todo.save(self.db_conn) self.assertEqual(Todo.by_id(self.db_conn, 1), todo) with self.assertRaises(NotFoundException): - self.assertEqual(Todo.by_id(self.db_conn, 0), todo) + Todo.by_id(self.db_conn, 0) with self.assertRaises(NotFoundException): - self.assertEqual(Todo.by_id(self.db_conn, 2), todo) + Todo.by_id(self.db_conn, 2) def test_Todo_by_date(self) -> None: """Test findability of Todos by date.""" @@ -164,61 +164,96 @@ class TestsWithDB(TestCaseWithDB): todo_1.save(self.db_conn) assert isinstance(todo_1.id_, int) # test minimum - tree_expected = TodoStepsNode(todo_1, True, [], False) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + node_0 = TodoStepsNode(todo_1, True, [], False) + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) # test non_emtpy seen_todo does something - tree_expected = TodoStepsNode(todo_1, True, [], True) - self.assertEqual(todo_1.get_step_tree({todo_1.id_}, set()), - tree_expected) + node_0.seen = True + self.assertEqual(todo_1.get_step_tree({todo_1.id_}, set()), node_0) # test child shows up todo_2 = Todo(None, self.proc, False, self.date1) todo_2.save(self.db_conn) assert isinstance(todo_2.id_, int) todo_1.add_child(todo_2) - node_todo_2 = TodoStepsNode(todo_2, True, [], False) - tree_expected = TodoStepsNode(todo_1, True, [node_todo_2], False) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + node_2 = TodoStepsNode(todo_2, True, [], False) + node_0.children = [node_2] + node_0.seen = False + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) # test child shows up with child todo_3 = Todo(None, self.proc, False, self.date1) todo_3.save(self.db_conn) assert isinstance(todo_3.id_, int) todo_2.add_child(todo_3) - node_todo_3 = TodoStepsNode(todo_3, True, [], False) - node_todo_2 = TodoStepsNode(todo_2, True, [node_todo_3], False) - tree_expected = TodoStepsNode(todo_1, True, [node_todo_2], False) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + node_3 = TodoStepsNode(todo_3, True, [], False) + node_2.children = [node_3] + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) # test same todo can be child-ed multiple times at different locations todo_1.add_child(todo_3) - node_todo_4 = TodoStepsNode(todo_3, True, [], True) - tree_expected = TodoStepsNode(todo_1, True, - [node_todo_2, node_todo_4], False) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + node_4 = TodoStepsNode(todo_3, True, [], True) + node_0.children += [node_4] + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) # test condition shows up todo_1.set_conditions(self.db_conn, [self.cond1.id_]) - node_cond_1 = TodoStepsNode(self.cond1, False, [], False) - tree_expected = TodoStepsNode(todo_1, True, - [node_todo_2, node_todo_4, node_cond_1], - False) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + node_5 = TodoStepsNode(self.cond1, False, [], False) + node_0.children += [node_5] + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) # test second condition shows up todo_2.set_conditions(self.db_conn, [self.cond2.id_]) - node_cond_2 = TodoStepsNode(self.cond2, False, [], False) - node_todo_2 = TodoStepsNode(todo_2, True, - [node_todo_3, node_cond_2], False) - tree_expected = TodoStepsNode(todo_1, True, - [node_todo_2, node_todo_4, node_cond_1], - False) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + node_6 = TodoStepsNode(self.cond2, False, [], False) + node_2.children += [node_6] + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) # test second condition is not hidden if fulfilled by non-sibling todo_1.set_enables(self.db_conn, [self.cond2.id_]) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) # test second condition is hidden if fulfilled by sibling todo_3.set_enables(self.db_conn, [self.cond2.id_]) - node_todo_2 = TodoStepsNode(todo_2, True, [node_todo_3], False) - tree_expected = TodoStepsNode(todo_1, True, - [node_todo_2, node_todo_4, node_cond_1], - False) - self.assertEqual(todo_1.get_step_tree(set(), set()), tree_expected) + node_2.children.remove(node_6) + self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) + + def test_Todo_unsatisfied_steps(self) -> None: + """Test options of satisfying unfulfilled Process.explicit_steps.""" + assert isinstance(self.proc.id_, int) + todo_1 = Todo(None, self.proc, False, self.date1) + todo_1.save(self.db_conn) + proc2 = Process(None) + proc2.save(self.db_conn) + assert isinstance(proc2.id_, int) + proc3 = Process(None) + proc3.save(self.db_conn) + assert isinstance(proc3.id_, int) + proc4 = Process(None) + proc4.save(self.db_conn) + assert isinstance(proc4.id_, int) + proc3.set_steps(self.db_conn, [(None, proc4.id_, None)]) + proc2.set_steps(self.db_conn, [(None, self.proc.id_, None), + (None, self.proc.id_, None), + (None, proc3.id_, None)]) + todo_2 = Todo(None, proc2, False, self.date1) + todo_2.save(self.db_conn) + # test empty adoption does nothing + todo_2.adopt_from([]) + self.assertEqual(todo_2.children, []) + # test basic adoption + todo_2.adopt_from([todo_1]) + self.assertEqual(todo_2.children, [todo_1]) + self.assertEqual(todo_1.parents, [todo_2]) + # test making missing children + todo_2.make_missing_children(self.db_conn) + todo_3 = Todo.by_id(self.db_conn, 3) + todo_4 = Todo.by_id(self.db_conn, 4) + self.assertEqual(todo_2.children, [todo_1, todo_3, todo_4]) + self.assertEqual(todo_3.process, self.proc) + self.assertEqual(todo_3.parents, [todo_2]) + self.assertEqual(todo_3.children, []) + self.assertEqual(todo_4.process, proc3) + self.assertEqual(todo_4.parents, [todo_2]) + # test .make_missing_children doesn't further than top-level + self.assertEqual(todo_4.children, []) + # test .make_missing_children lower down the tree + todo_4.make_missing_children(self.db_conn) + todo_5 = Todo.by_id(self.db_conn, 5) + self.assertEqual(todo_5.process, proc4) + self.assertEqual(todo_4.children, [todo_5]) + self.assertEqual(todo_5.parents, [todo_4]) def test_Todo_singularity(self) -> None: """Test pointers made for single object keep pointing to it.""" @@ -231,6 +266,22 @@ class TestsWithDB(TestCaseWithDB): retrieved_todo.is_done = False self.assertEqual(todo.is_done, False) + def test_Todo_remove(self) -> None: + """Test removal.""" + todo_1 = Todo(None, self.proc, False, self.date1) + todo_1.save(self.db_conn) + todo_0 = Todo(None, self.proc, False, self.date1) + todo_0.save(self.db_conn) + todo_0.add_child(todo_1) + todo_2 = Todo(None, self.proc, False, self.date1) + todo_2.save(self.db_conn) + todo_1.add_child(todo_2) + todo_1.remove(self.db_conn) + with self.assertRaises(NotFoundException): + Todo.by_id(self.db_conn, todo_1.id_) + self.assertEqual(todo_0.children, []) + self.assertEqual(todo_2.parents, []) + class TestsWithServer(TestCaseWithServer): """Tests against our HTTP server/handler (and database).""" @@ -238,15 +289,15 @@ class TestsWithServer(TestCaseWithServer): def test_do_POST_day(self) -> None: """Test Todo posting of POST /day.""" form_data = {'title': '', 'description': '', 'effort': 1} - self.check_post(form_data, '/process?id=', 302, '/') - self.check_post(form_data, '/process?id=', 302, '/') + self.check_post(form_data, '/process?id=', 302, '/process?id=1') + self.check_post(form_data, '/process?id=', 302, '/process?id=2') proc = Process.by_id(self.db_conn, 1) proc2 = Process.by_id(self.db_conn, 2) form_data = {'comment': ''} - self.check_post(form_data, '/day?date=2024-01-01', 302, '/') + self.check_post(form_data, '/day?date=2024-01-01', 302) self.assertEqual(Todo.by_date(self.db_conn, '2024-01-01'), []) form_data['new_todo'] = str(proc.id_) - self.check_post(form_data, '/day?date=2024-01-01', 302, '/') + self.check_post(form_data, '/day?date=2024-01-01', 302) todos = Todo.by_date(self.db_conn, '2024-01-01') self.assertEqual(1, len(todos)) todo1 = todos[0] @@ -254,7 +305,7 @@ class TestsWithServer(TestCaseWithServer): self.assertEqual(todo1.process.id_, proc.id_) self.assertEqual(todo1.is_done, False) form_data['new_todo'] = str(proc2.id_) - self.check_post(form_data, '/day?date=2024-01-01', 302, '/') + self.check_post(form_data, '/day?date=2024-01-01', 302) todos = Todo.by_date(self.db_conn, '2024-01-01') todo1 = todos[1] self.assertEqual(todo1.id_, 2) @@ -263,16 +314,15 @@ class TestsWithServer(TestCaseWithServer): def test_do_POST_todo(self) -> None: """Test POST /todo.""" - def post_and_reload(form_data: dict[str, object], - status: int = 302) -> Todo: - self.check_post(form_data, '/todo?id=1', status, '/') - self.db_conn.cached_todos = {} + def post_and_reload(form_data: dict[str, object], status: int = 302, + redir_url: str = '/todo?id=1') -> Todo: + self.check_post(form_data, '/todo?id=1', status, redir_url) return Todo.by_date(self.db_conn, '2024-01-01')[0] # test minimum form_data = {'title': '', 'description': '', 'effort': 1} - self.check_post(form_data, '/process', 302, '/') + self.check_post(form_data, '/process', 302, '/process?id=1') form_data = {'comment': '', 'new_todo': 1} - self.check_post(form_data, '/day?date=2024-01-01', 302, '/') + self.check_post(form_data, '/day?date=2024-01-01', 302) # test posting to bad URLs form_data = {} self.check_post(form_data, '/todo=', 404) @@ -301,7 +351,7 @@ class TestsWithServer(TestCaseWithServer): self.check_post(form_data, '/todo?id=1', 404) # test posting second todo of same process form_data = {'comment': '', 'new_todo': 1} - self.check_post(form_data, '/day?date=2024-01-01', 302, '/') + self.check_post(form_data, '/day?date=2024-01-01', 302) # test todo 1 adopting todo 2 form_data = {'adopt': 2} todo1 = post_and_reload(form_data) @@ -310,19 +360,45 @@ class TestsWithServer(TestCaseWithServer): self.assertEqual(todo1.parents, []) self.assertEqual(todo2.children, []) self.assertEqual(todo2.parents, [todo1]) - # test failure of re-adopting same child - self.check_post(form_data, '/todo?id=1', 400, '/') # test todo1 cannot be set done with todo2 not done yet - form_data = {'done': ''} + form_data = {'done': '', 'adopt': 2} todo1 = post_and_reload(form_data, 400) self.assertEqual(todo1.is_done, False) + # test todo1 un-adopting todo 2 by just not sending an adopt + form_data = {} + todo1 = post_and_reload(form_data, 302) + todo2 = Todo.by_date(self.db_conn, '2024-01-01')[1] + self.assertEqual(todo1.children, []) + self.assertEqual(todo1.parents, []) + self.assertEqual(todo2.children, []) + self.assertEqual(todo2.parents, []) + # test todo1 deletion + form_data = {'delete': ''} + todo1 = post_and_reload(form_data, 302, '/') + + def test_do_POST_day_todo_adoption(self) -> None: + """Test Todos posted to Day view may adopt existing Todos.""" + form_data = {'title': '', 'description': '', 'effort': 1} + self.check_post(form_data, '/process', 302, '/process?id=1') + form_data['new_top_step'] = 1 + self.check_post(form_data, '/process', 302, '/process?id=2') + form_data = {'comment': '', 'new_todo': 1} + self.check_post(form_data, '/day?date=2024-01-01', 302) + form_data = {'comment': '', 'new_todo': 2} + self.check_post(form_data, '/day?date=2024-01-01', 302) + todo1 = Todo.by_date(self.db_conn, '2024-01-01')[0] + todo2 = Todo.by_date(self.db_conn, '2024-01-01')[1] + self.assertEqual(todo1.children, []) + self.assertEqual(todo1.parents, [todo2]) + self.assertEqual(todo2.children, [todo1]) + self.assertEqual(todo2.parents, []) def test_do_GET_todo(self) -> None: """Test GET /todo response codes.""" form_data = {'title': '', 'description': '', 'effort': 1} - self.check_post(form_data, '/process?id=', 302, '/') + self.check_post(form_data, '/process?id=', 302, '/process?id=1') form_data = {'comment': '', 'new_todo': 1} - self.check_post(form_data, '/day?date=2024-01-01', 302, '/') + self.check_post(form_data, '/day?date=2024-01-01', 302) self.check_get('/todo', 400) self.check_get('/todo?id=', 400) self.check_get('/todo?id=foo', 400)