X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/task?a=blobdiff_plain;f=tests%2Fprocesses.py;h=8a7f91d4c561a34878af14b7e0796dcaa38ecf26;hb=8bbb9ac156bdca7b9dd015b62db3f07f1e7a9e17;hp=88a7a6c006912dddc3fcc86af4a1691a5982db6c;hpb=11c4e6fc42ab96a13b18e8195c264899e31dddf0;p=plomtask

diff --git a/tests/processes.py b/tests/processes.py
index 88a7a6c..8a7f91d 100644
--- a/tests/processes.py
+++ b/tests/processes.py
@@ -67,48 +67,52 @@ class TestsWithServer(TestCaseWithServer):
 
     def test_do_POST_process(self) -> None:
         """Test POST /process and its effect on the database."""
-        form_data = {'title': 'foo', 'description': 'foo', 'effort': 1.0}
-        self.post_to(form_data, '/process?id=FOO')
-        self.assertEqual(self.conn.getresponse().status, 400)
+        form_data = {'title': 'foo', 'description': 'foo',
+                     'effort': 1.1, 'children': [1, 2]}
+        self.check_post(form_data, '/process?id=FOO', 400)
         form_data['effort'] = 'foo'
-        self.post_to(form_data, '/process?id=')
-        self.assertEqual(self.conn.getresponse().status, 400)
-        form_data['effort'] = None
-        self.post_to(form_data, '/process?id=')
-        self.assertEqual(self.conn.getresponse().status, 400)
-        form_data = {}
-        self.post_to(form_data, '/process?id=')
-        self.assertEqual(self.conn.getresponse().status, 400)
+        self.check_post(form_data, '/process?id=', 400)
+        form_data['effort'] = 1.1
+        form_data['children'] = 1.1
+        self.check_post(form_data, '/process?id=', 400)
+        form_data['children'] = 'a'
+        self.check_post(form_data, '/process?id=', 400)
+        form_data['children'] = [1, 1.2]
+        self.check_post(form_data, '/process?id=', 400)
+        form_data['children'] = [1, 'b']
+        self.check_post(form_data, '/process?id=', 400)
+        self.check_post({}, '/process?id=', 400)
         form_data = {'title': '', 'description': ''}
-        self.post_to(form_data, '/process?id=')
-        self.assertEqual(self.conn.getresponse().status, 400)
-        form_data = {'title': '', 'effort': 1}
-        self.post_to(form_data, '/process?id=')
-        self.assertEqual(self.conn.getresponse().status, 400)
-        form_data = {'description': '', 'effort': 1}
-        self.post_to(form_data, '/process?id=')
-        self.assertEqual(self.conn.getresponse().status, 400)
-        form_data = {'title': None, 'description': 1, 'effort': 1.0}
-        self.post_to(form_data, '/process?id=')
-        self.check_redirect('/')
-        retrieved = Process.by_id(self.db_conn, 1)
-        self.assertEqual(retrieved.title.newest, 'None')
+        self.check_post(form_data, '/process?id=', 400)
+        form_data = {'title': '', 'effort': 1.1}
+        self.check_post(form_data, '/process?id=', 400)
+        form_data = {'description': '', 'effort': 1.0}
+        self.check_post(form_data, '/process?id=', 400)
+        form_data = {'title': '', 'description': '',
+                     'effort': 1.1, 'children': [1, 2]}
+        self.check_post(form_data, '/process?id=', 302, '/')
+        retrieved_1 = Process.by_id(self.db_conn, 1)
+        self.assertEqual(retrieved_1.title.newest, '')
+        self.assertEqual(retrieved_1.child_ids, [1, 2])
+        form_data['children'] = []
+        self.check_post(form_data, '/process?id=', 302, '/')
+        retrieved_2 = Process.by_id(self.db_conn, 2)
+        self.assertEqual(retrieved_2.child_ids, [])
+        del form_data['children']
+        self.check_post(form_data, '/process?id=', 302, '/')
+        retrieved_3 = Process.by_id(self.db_conn, 3)
+        self.assertEqual(retrieved_2.child_ids, [])
+        self.check_post(form_data, '/process?id=1', 302, '/')
         self.assertEqual([p.id_ for p in Process.all(self.db_conn)],
-                         [retrieved.id_])
-        self.post_to(form_data, '/process?id=1')
-        self.check_redirect('/')
-        self.post_to(form_data, '/process')
-        self.check_redirect('/')
+                         [retrieved_1.id_, retrieved_2.id_, retrieved_3.id_])
+        retrieved_1 = Process.by_id(self.db_conn, 1)
+        self.assertEqual(retrieved_1.child_ids, [])
+        self.check_post(form_data, '/process', 302, '/')
 
     def test_do_GET(self) -> None:
         """Test /process and /processes response codes."""
-        self.conn.request('GET', '/process')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/process?id=')
-        self.assertEqual(self.conn.getresponse().status, 200)
-        self.conn.request('GET', '/process?id=0')
-        self.assertEqual(self.conn.getresponse().status, 400)
-        self.conn.request('GET', '/process?id=FOO')
-        self.assertEqual(self.conn.getresponse().status, 400)
-        self.conn.request('GET', '/processes')
-        self.assertEqual(self.conn.getresponse().status, 200)
+        self.check_get('/process', 200)
+        self.check_get('/process?id=', 200)
+        self.check_get('/process?id=0', 400)
+        self.check_get('/process?id=FOO', 400)
+        self.check_get('/processes', 200)