Refactor save and remove methods of BaseObject subclasses.

[plomtask] / tests / todos.py

diff --git a/tests/todos.py b/tests/todos.py
index c6b28782bf98965fb6656dbdb7636793709d8c55..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):
@@ -319,69 +319,58 @@ class TestsWithServer(TestCaseWithServer):
             return Todo.by_date(self.db_conn, '2024-01-01')[0]
         # test minimum
         self.post_process()
-        form_data = {'comment': '', 'new_todo': 1}
-        self.check_post(form_data, '/day?date=2024-01-01', 302)
+        self.check_post({'comment': '', 'new_todo': 1},
+                        '/day?date=2024-01-01', 302)
         # test posting to bad URLs
-        form_data = {}
-        self.check_post(form_data, '/todo=', 404)
-        self.check_post(form_data, '/todo?id=', 400)
-        self.check_post(form_data, '/todo?id=FOO', 400)
-        self.check_post(form_data, '/todo?id=0', 404)
+        self.check_post({}, '/todo=', 404)
+        self.check_post({}, '/todo?id=', 400)
+        self.check_post({}, '/todo?id=FOO', 400)
+        self.check_post({}, '/todo?id=0', 404)
         # test posting naked entity
-        todo1 = post_and_reload(form_data)
+        todo1 = post_and_reload({})
         self.assertEqual(todo1.children, [])
         self.assertEqual(todo1.parents, [])
         self.assertEqual(todo1.is_done, False)
         # test posting doneness
-        form_data = {'done': ''}
-        todo1 = post_and_reload(form_data)
+        todo1 = post_and_reload({'done': ''})
         self.assertEqual(todo1.is_done, True)
         # test implicitly posting non-doneness
-        form_data = {}
-        todo1 = post_and_reload(form_data)
+        todo1 = post_and_reload({})
         self.assertEqual(todo1.is_done, False)
         # test malformed adoptions
-        form_data = {'adopt': 'foo'}
-        self.check_post(form_data, '/todo?id=1', 400)
-        form_data = {'adopt': 1}
-        self.check_post(form_data, '/todo?id=1', 400)
-        form_data = {'adopt': 2}
-        self.check_post(form_data, '/todo?id=1', 404)
+        self.check_post({'adopt': 'foo'}, '/todo?id=1', 400)
+        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
-        form_data = {'comment': '', 'new_todo': 1}
-        self.check_post(form_data, '/day?date=2024-01-01', 302)
+        self.check_post({'comment': '', 'new_todo': 1},
+                        '/day?date=2024-01-01', 302)
         # test todo 1 adopting todo 2
-        form_data = {'adopt': 2}
-        todo1 = post_and_reload(form_data)
+        todo1 = post_and_reload({'adopt': 2})
         todo2 = Todo.by_date(self.db_conn, '2024-01-01')[1]
         self.assertEqual(todo1.children, [todo2])
         self.assertEqual(todo1.parents, [])
         self.assertEqual(todo2.children, [])
         self.assertEqual(todo2.parents, [todo1])
         # test todo1 cannot be set done with todo2 not done yet
-        form_data = {'done': '', 'adopt': 2}
-        todo1 = post_and_reload(form_data, 400)
+        todo1 = post_and_reload({'done': '', 'adopt': 2}, 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)
+        todo1 = post_and_reload({}, 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, '/')
+        todo1 = post_and_reload({'delete': ''}, 302, '/')
 
     def test_do_POST_day_todo_adoption(self) -> None:
         """Test Todos posted to Day view may adopt existing Todos."""
         form_data = self.post_process()
-        form_data['new_top_step'] = 1
-        form_data = self.post_process(2, form_data)
+        form_data = self.post_process(2, form_data | {'new_top_step': 1})
         form_data = {'comment': '', 'new_todo': 1}
         self.check_post(form_data, '/day?date=2024-01-01', 302)
-        form_data = {'comment': '', 'new_todo': 2}
+        form_data['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]