X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=tests%2Ftodos.py;h=419d3dba122cb274110e30a6697cb5f40f8849d2;hb=32c0e270d3c521329c0b7a988b25585e6a275ff5;hp=74715653595b1f4f91404ec40f206bdd4a46d554;hpb=5104eb7b33c386b6df7508405917408855e1468c;p=plomtask diff --git a/tests/todos.py b/tests/todos.py index 7471565..419d3db 100644 --- a/tests/todos.py +++ b/tests/todos.py @@ -1,6 +1,6 @@ """Test Todos module.""" from tests.utils import TestCaseWithDB, TestCaseWithServer -from plomtask.todos import Todo, TodoStepsNode +from plomtask.todos import Todo, TodoNode from plomtask.processes import Process from plomtask.conditions import Condition from plomtask.exceptions import (NotFoundException, BadFormatException, @@ -88,40 +88,6 @@ class TestsWithDB(TestCaseWithDB): self.assertEqual(self.cond1.is_active, True) self.assertEqual(self.cond2.is_active, False) - def test_Todo_enablers_disablers(self) -> None: - """Test Todo.enablers_for_at/disablers_for_at.""" - assert isinstance(self.cond1.id_, int) - assert isinstance(self.cond2.id_, int) - todo1 = Todo(None, self.proc, False, self.date1) - todo1.save(self.db_conn) - todo1.set_enables(self.db_conn, [self.cond1.id_]) - todo1.set_disables(self.db_conn, [self.cond2.id_]) - todo1.save(self.db_conn) - todo2 = Todo(None, self.proc, False, self.date1) - todo2.save(self.db_conn) - todo2.set_enables(self.db_conn, [self.cond2.id_]) - todo2.save(self.db_conn) - todo3 = Todo(None, self.proc, False, self.date2) - todo3.save(self.db_conn) - todo3.set_enables(self.db_conn, [self.cond2.id_]) - todo3.save(self.db_conn) - enablers = Todo.enablers_for_at(self.db_conn, self.cond1, self.date1) - self.assertEqual(enablers, [todo1]) - enablers = Todo.enablers_for_at(self.db_conn, self.cond1, self.date2) - self.assertEqual(enablers, []) - disablers = Todo.disablers_for_at(self.db_conn, self.cond1, self.date1) - self.assertEqual(disablers, []) - disablers = Todo.disablers_for_at(self.db_conn, self.cond1, self.date2) - self.assertEqual(disablers, []) - enablers = Todo.enablers_for_at(self.db_conn, self.cond2, self.date1) - self.assertEqual(enablers, [todo2]) - enablers = Todo.enablers_for_at(self.db_conn, self.cond2, self.date2) - self.assertEqual(enablers, [todo3]) - disablers = Todo.disablers_for_at(self.db_conn, self.cond2, self.date1) - self.assertEqual(disablers, [todo1]) - disablers = Todo.disablers_for_at(self.db_conn, self.cond2, self.date2) - self.assertEqual(disablers, []) - def test_Todo_children(self) -> None: """Test Todo.children relations.""" todo_1 = Todo(None, self.proc, False, self.date1) @@ -163,56 +129,37 @@ class TestsWithDB(TestCaseWithDB): def test_Todo_step_tree(self) -> None: """Test self-configuration of TodoStepsNode tree for Day view.""" - assert isinstance(self.cond1.id_, int) - assert isinstance(self.cond2.id_, int) todo_1 = Todo(None, self.proc, False, self.date1) todo_1.save(self.db_conn) assert isinstance(todo_1.id_, int) # test minimum - node_0 = TodoStepsNode(todo_1, True, [], False, False) - self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) + node_0 = TodoNode(todo_1, False, []) + self.assertEqual(todo_1.get_step_tree(set()), node_0) # test non_emtpy seen_todo does something node_0.seen = True - self.assertEqual(todo_1.get_step_tree({todo_1.id_}, set()), node_0) + self.assertEqual(todo_1.get_step_tree({todo_1.id_}), 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_2 = TodoStepsNode(todo_2, True, [], False, False) + node_2 = TodoNode(todo_2, False, []) node_0.children = [node_2] node_0.seen = False - self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) + self.assertEqual(todo_1.get_step_tree(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_3 = TodoStepsNode(todo_3, True, [], False, False) + node_3 = TodoNode(todo_3, False, []) node_2.children = [node_3] - self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) + self.assertEqual(todo_1.get_step_tree(set()), node_0) # test same todo can be child-ed multiple times at different locations todo_1.add_child(todo_3) - node_4 = TodoStepsNode(todo_3, True, [], True, False) + node_4 = TodoNode(todo_3, 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_5 = TodoStepsNode(self.cond1, False, [], 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_6 = TodoStepsNode(self.cond2, False, [], 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()), node_0) - # test second condition is hidden if fulfilled by sibling - todo_3.set_enables(self.db_conn, [self.cond2.id_]) - node_2.children.remove(node_6) - self.assertEqual(todo_1.get_step_tree(set(), set()), node_0) + self.assertEqual(todo_1.get_step_tree(set()), node_0) def test_Todo_unsatisfied_steps(self) -> None: """Test options of satisfying unfulfilled Process.explicit_steps.""" @@ -290,7 +237,7 @@ class TestsWithServer(TestCaseWithServer): self.post_process(2) proc = Process.by_id(self.db_conn, 1) proc2 = Process.by_id(self.db_conn, 2) - form_data = {'comment': ''} + form_data = {'day_comment': ''} 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_) @@ -317,7 +264,7 @@ class TestsWithServer(TestCaseWithServer): return Todo.by_date(self.db_conn, '2024-01-01')[0] # test minimum self.post_process() - self.check_post({'comment': '', 'new_todo': 1}, + self.check_post({'day_comment': '', 'new_todo': 1}, '/day?date=2024-01-01', 302) # test posting to bad URLs self.check_post({}, '/todo=', 404) @@ -340,7 +287,7 @@ class TestsWithServer(TestCaseWithServer): self.check_post({'adopt': 1}, '/todo?id=1', 400) self.check_post({'adopt': 2}, '/todo?id=1', 404) # test posting second todo of same process - self.check_post({'comment': '', 'new_todo': 1}, + self.check_post({'day_comment': '', 'new_todo': 1}, '/day?date=2024-01-01', 302) # test todo 1 adopting todo 2 todo1 = post_and_reload({'adopt': 2}) @@ -366,7 +313,7 @@ class TestsWithServer(TestCaseWithServer): """Test Todos posted to Day view may adopt existing Todos.""" form_data = self.post_process() form_data = self.post_process(2, form_data | {'new_top_step': 1}) - form_data = {'comment': '', 'new_todo': 1} + form_data = {'day_comment': '', 'new_todo': 1} self.check_post(form_data, '/day?date=2024-01-01', 302) form_data['new_todo'] = 2 self.check_post(form_data, '/day?date=2024-01-01', 302) @@ -377,10 +324,56 @@ class TestsWithServer(TestCaseWithServer): self.assertEqual(todo2.children, [todo1]) self.assertEqual(todo2.parents, []) + def test_do_POST_day_todo_multiple(self) -> None: + """Test multiple Todos can be posted to Day view.""" + form_data = self.post_process() + form_data = self.post_process(2) + form_data = {'day_comment': '', 'new_todo': [1, 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.process.id_, 1) + self.assertEqual(todo2.process.id_, 2) + + def test_do_POST_day_todo_multiple_inner_adoption(self) -> None: + """Test multiple Todos can be posted to Day view w. inner adoption.""" + form_data = self.post_process() + form_data = self.post_process(2, form_data | {'new_top_step': 1}) + form_data = {'day_comment': '', 'new_todo': [1, 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, []) + # check process ID order does not affect end result + form_data = {'day_comment': '', 'new_todo': [2, 1]} + self.check_post(form_data, '/day?date=2024-01-02', 302) + todo1 = Todo.by_date(self.db_conn, '2024-01-02')[1] + todo2 = Todo.by_date(self.db_conn, '2024-01-02')[0] + self.assertEqual(todo1.children, []) + self.assertEqual(todo1.parents, [todo2]) + self.assertEqual(todo2.children, [todo1]) + self.assertEqual(todo2.parents, []) + + def test_do_POST_day_todo_doneness(self) -> None: + """Test Todo doneness can be posted to Day view.""" + form_data = self.post_process() + form_data = {'day_comment': '', 'new_todo': [1]} + self.check_post(form_data, '/day?date=2024-01-01', 302) + todo = Todo.by_date(self.db_conn, '2024-01-01')[0] + form_data = {'day_comment': '', 'todo_id': [1]} + self.check_post(form_data, '/day?date=2024-01-01', 302) + self.assertEqual(todo.is_done, False) + form_data = {'day_comment': '', 'todo_id': [1], 'done': [1]} + self.check_post(form_data, '/day?date=2024-01-01', 302) + self.assertEqual(todo.is_done, True) + def test_do_GET_todo(self) -> None: """Test GET /todo response codes.""" self.post_process() - form_data = {'comment': '', 'new_todo': 1} + form_data = {'day_comment': '', 'new_todo': 1} self.check_post(form_data, '/day?date=2024-01-01', 302) self.check_get('/todo', 400) self.check_get('/todo?id=', 400)