X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=blobdiff_plain;f=tests%2Fprocesses.py;h=2ac8cf4cf7787be287792b583a7402c6ed013855;hb=e14580b4ee47363cad317e4ec1de91affe03d53a;hp=9413822291a87439aafda0cd39459c93b3905661;hpb=951d8ad55c0d54286f9c986257a67dfa9710fcf2;p=plomtask

diff --git a/tests/processes.py b/tests/processes.py
index 9413822..2ac8cf4 100644
--- a/tests/processes.py
+++ b/tests/processes.py
@@ -135,12 +135,20 @@ class TestsWithDB(TestCaseWithDB):
         self.assertEqual(step.parent_step_id, step_retrieved.parent_step_id)
 
     def test_Process_singularity(self) -> None:
-        """Test pointers made for single object keep pointing to it."""
+        """Test pointers made for single object keep pointing to it, and
+        subsequent retrievals don't overload relations."""
         assert isinstance(self.proc1.id_, int)
         assert isinstance(self.proc2.id_, int)
+        c1 = Condition(None, False)
+        c1.save(self.db_conn)
+        assert isinstance(c1.id_, int)
+        self.proc1.set_conditions(self.db_conn, [c1.id_])
         self.proc1.set_steps(self.db_conn, [(None, self.proc2.id_, None)])
+        self.proc1.save(self.db_conn)
         p_retrieved = Process.by_id(self.db_conn, self.proc1.id_)
         self.assertEqual(self.proc1.explicit_steps, p_retrieved.explicit_steps)
+        self.assertEqual(self.proc1.conditions, p_retrieved.conditions)
+        self.proc1.save(self.db_conn)
 
     def test_Process_versioned_attributes_singularity(self) -> None:
         """Test behavior of VersionedAttributes on saving (with .title)."""
@@ -149,6 +157,22 @@ class TestsWithDB(TestCaseWithDB):
         p_loaded = Process.by_id(self.db_conn, self.proc1.id_)
         self.assertEqual(self.proc1.title.history, p_loaded.title.history)
 
+    def test_Process_removal(self) -> None:
+        """Test removal of Processes."""
+        assert isinstance(self.proc3.id_, int)
+        self.proc1.remove(self.db_conn)
+        self.assertEqual({self.proc2.id_, self.proc3.id_},
+                         set(p.id_ for p in Process.all(self.db_conn)))
+        self.proc2.set_steps(self.db_conn, [(None, self.proc3.id_, None)])
+        self.proc2.explicit_steps[0].remove(self.db_conn)
+        retrieved = Process.by_id(self.db_conn, self.proc2.id_)
+        self.assertEqual(retrieved.explicit_steps, [])
+        self.proc2.set_steps(self.db_conn, [(None, self.proc3.id_, None)])
+        step = retrieved.explicit_steps[0]
+        self.proc2.remove(self.db_conn)
+        with self.assertRaises(NotFoundException):
+            ProcessStep.by_id(self.db_conn, step.id_)
+
 
 class TestsWithServer(TestCaseWithServer):
     """Module tests against our HTTP server/handler (and database)."""
@@ -157,7 +181,7 @@ class TestsWithServer(TestCaseWithServer):
         """Test POST /process and its effect on the database."""
         self.assertEqual(0, len(Process.all(self.db_conn)))
         form_data = {'title': 'foo', 'description': 'foo', 'effort': 1.1}
-        self.check_post(form_data, '/process?id=', 302, '/')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=1')
         self.assertEqual(1, len(Process.all(self.db_conn)))
         self.check_post(form_data, '/process?id=FOO', 400)
         form_data['effort'] = 'foo'
@@ -172,16 +196,20 @@ class TestsWithServer(TestCaseWithServer):
         self.assertEqual(1, len(Process.all(self.db_conn)))
         form_data = {'title': 'foo', 'description': 'foo', 'effort': 1.0,
                      'condition': []}
-        self.check_post(form_data, '/process?id=', 302, '/')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=2')
         form_data['condition'] = [1]
         self.check_post(form_data, '/process?id=', 404)
         form_data_cond = {'title': 'foo', 'description': 'foo'}
-        self.check_post(form_data_cond, '/condition', 302, '/')
-        self.check_post(form_data, '/process?id=', 302, '/')
+        self.check_post(form_data_cond, '/condition', 302, '/condition?id=1')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=3')
         form_data['disables'] = [1]
-        self.check_post(form_data, '/process?id=', 302, '/')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=4')
         form_data['enables'] = [1]
-        self.check_post(form_data, '/process?id=', 302, '/')
+        self.check_post(form_data, '/process?id=', 302, '/process?id=5')
+        form_data['delete'] = ''
+        self.check_post(form_data, '/process?id=', 404)
+        self.check_post(form_data, '/process?id=6', 404)
+        self.check_post(form_data, '/process?id=5', 302, '/processes')
 
     def test_do_GET(self) -> None:
         """Test /process and /processes response codes."""