X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=tests%2Ftodos.py;h=5736e5da9717616d47e09f0698ecf5865c4524f4;hb=f19823e9e77ae0017022dbfe63f66d2b065ba33a;hp=7aed5f83a0eee3e2eb50845c42de9fd57e3aee0f;hpb=696aed8a590fa9c67a6b9c723e2134b2663bd769;p=plomtask
diff --git a/tests/todos.py b/tests/todos.py
index 7aed5f8..5736e5d 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,7 +164,7 @@ class TestsWithDB(TestCaseWithDB):
todo_1.save(self.db_conn)
assert isinstance(todo_1.id_, int)
# test minimum
- node_0 = TodoStepsNode(todo_1, True, [], False)
+ node_0 = TodoStepsNode(todo_1, True, [], False, False)
self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
# test non_emtpy seen_todo does something
node_0.seen = True
@@ -174,7 +174,7 @@ class TestsWithDB(TestCaseWithDB):
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)
+ node_2 = TodoStepsNode(todo_2, True, [], False, False)
node_0.children = [node_2]
node_0.seen = False
self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
@@ -183,22 +183,22 @@ class TestsWithDB(TestCaseWithDB):
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)
+ node_3 = TodoStepsNode(todo_3, True, [], False, 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_4 = TodoStepsNode(todo_3, True, [], True)
+ node_4 = TodoStepsNode(todo_3, True, [], True, False)
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)
+ 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)
+ 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
@@ -266,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)."""
@@ -273,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]
@@ -289,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)
@@ -298,14 +314,13 @@ 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)
# test posting to bad URLs
@@ -357,13 +372,16 @@ class TestsWithServer(TestCaseWithServer):
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, '/')
+ self.check_post(form_data, '/process', 302, '/process?id=1')
form_data['new_top_step'] = 1
- self.check_post(form_data, '/process', 302, '/')
+ 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}
@@ -378,9 +396,9 @@ class TestsWithServer(TestCaseWithServer):
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)