Refactor save and remove methods of BaseObject subclasses.

[plomtask] / tests / todos.py

diff --git a/tests/todos.py b/tests/todos.py
index d8cb3ff15339d6cd3a4deb0ec1c82389462133a5..7fabfdb4bcb6c0761b40f7159583141e5f38ba09 100644 (file)
--- a/tests/todos.py
+++ b/tests/todos.py
@@ -24,10 +24,10 @@ class TestsWithDB(TestCaseWithDB):
     def test_Todo_by_id(self) -> None:
         """Test creation and findability of Todos."""
         process_unsaved = Process(None)
-        todo = Todo(None, process_unsaved, False, self.date1)
         with self.assertRaises(NotFoundException):
-            todo.save(self.db_conn)
+            todo = Todo(None, process_unsaved, False, self.date1)
         process_unsaved.save(self.db_conn)
+        todo = Todo(None, process_unsaved, False, self.date1)
         todo.save(self.db_conn)
         self.assertEqual(Todo.by_id(self.db_conn, 1), todo)
         with self.assertRaises(NotFoundException):
@@ -206,10 +206,8 @@ class TestsWithDB(TestCaseWithDB):
         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_])
-        # fails because somehow we compare a Todo against a Condition;
-        # but leave it for now as we're gonna re-write everything anyways today
-        # node_2.children.remove(node_6)
-        # self.assertEqual(todo_1.get_step_tree(set(), set()), node_0)
+        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."""