X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=tests%2Fprocesses.py;h=c718677f78e7afea5a95fdaa65e3c3981df96f1b;hb=0ed3bc539d21d5536d0fc635760d88a2231587b9;hp=084cfe0c6acac566f391500bf092261c1b82d811;hpb=8f6b4ec61b126d6edbfda4f20d62398d92390a95;p=plomtask

diff --git a/tests/processes.py b/tests/processes.py
index 084cfe0..c718677 100644
--- a/tests/processes.py
+++ b/tests/processes.py
@@ -1,8 +1,7 @@
 """Test Processes module."""
 from unittest import TestCase
-from typing import Any
 from tests.utils import TestCaseWithDB, TestCaseWithServer
-from plomtask.processes import Process, ProcessStep
+from plomtask.processes import Process, ProcessStep, ProcessStepsNode
 from plomtask.conditions import Condition
 from plomtask.exceptions import NotFoundException, HandledException
 
@@ -58,46 +57,30 @@ class TestsWithDB(TestCaseWithDB):
         assert isinstance(self.proc3.id_, int)
         steps_proc1: list[tuple[int | None, int, int | None]] = []
         add_step(self.proc1, steps_proc1, (None, self.proc2.id_, None), 1)
-        p_1_dict: dict[int, dict[str, Any]] = {1: {
-            'process': self.proc2, 'parent_id': None,
-            'is_explicit': True, 'steps': {}, 'seen': False
-        }}
+        p_1_dict: dict[int, ProcessStepsNode] = {}
+        p_1_dict[1] = ProcessStepsNode(self.proc2, None, True, {}, False)
         self.assertEqual(self.proc1.get_steps(self.db_conn, None), p_1_dict)
         add_step(self.proc1, steps_proc1, (None, self.proc3.id_, None), 2)
         step_2 = self.proc1.explicit_steps[-1]
         assert isinstance(step_2.id_, int)
-        p_1_dict[2] = {
-            'process': self.proc3, 'parent_id': None,
-            'is_explicit': True, 'steps': {}, 'seen': False
-        }
+        p_1_dict[2] = ProcessStepsNode(self.proc3, None, True, {}, False)
         self.assertEqual(self.proc1.get_steps(self.db_conn, None), p_1_dict)
         steps_proc2: list[tuple[int | None, int, int | None]] = []
         add_step(self.proc2, steps_proc2, (None, self.proc3.id_, None), 3)
-        p_1_dict[1]['steps'] = {3: {
-            'process': self.proc3, 'parent_id': None,
-            'is_explicit': False, 'steps': {}, 'seen': False
-        }}
+        p_1_dict[1].steps[3] = ProcessStepsNode(self.proc3, None,
+                                                False, {}, False)
         self.assertEqual(self.proc1.get_steps(self.db_conn, None), p_1_dict)
         add_step(self.proc1, steps_proc1, (None, self.proc2.id_, step_2.id_),
                  4)
-        p_1_dict[2]['steps'][4] = {
-            'process': self.proc2, 'parent_id': step_2.id_, 'seen': False,
-            'is_explicit': True, 'steps': {3: {
-                'process': self.proc3, 'parent_id': None,
-                'is_explicit': False, 'steps': {}, 'seen': True
-                }}}
+        step_3 = ProcessStepsNode(self.proc3, None, False, {}, True)
+        p_1_dict[2].steps[4] = ProcessStepsNode(self.proc2, step_2.id_, True,
+                                                {3: step_3}, False)
         self.assertEqual(self.proc1.get_steps(self.db_conn, None), p_1_dict)
         add_step(self.proc1, steps_proc1, (None, self.proc3.id_, 999), 5)
-        p_1_dict[5] = {
-            'process': self.proc3, 'parent_id': None,
-            'is_explicit': True, 'steps': {}, 'seen': False
-        }
+        p_1_dict[5] = ProcessStepsNode(self.proc3, None, True, {}, False)
         self.assertEqual(self.proc1.get_steps(self.db_conn, None), p_1_dict)
         add_step(self.proc1, steps_proc1, (None, self.proc3.id_, 3), 6)
-        p_1_dict[6] = {
-            'process': self.proc3, 'parent_id': None,
-            'is_explicit': True, 'steps': {}, 'seen': False
-        }
+        p_1_dict[6] = ProcessStepsNode(self.proc3, None, True, {}, False)
         self.assertEqual(self.proc1.get_steps(self.db_conn, None),
                          p_1_dict)
         self.assertEqual(self.proc1.used_as_step_by(self.db_conn),
@@ -152,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)."""