Merge remote-tracking branch 'devops/dev' into feature/1706_node_class_and_node_type_subclasses

# Conflicts:
#	CHANGELOG.md
#	src/primaite/simulator/core.py

tests/unit_tests/_primaite/_simulator/_domain/test_account.py

@@ -0,0 +1,18 @@
+"""Test the account module of the simulator."""
+from primaite.simulator.domain.account import Account, AccountType
+
+
+def test_account_serialise():
+    """Test that an account can be serialised. If pydantic throws error then this test fails."""
+    acct = Account(username="Jake", password="JakePass1!", account_type=AccountType.USER)
+    serialised = acct.model_dump_json()
+    print(serialised)
+
+
+def test_account_deserialise():
+    """Test that an account can be deserialised. The test fails if pydantic throws an error."""
+    acct_json = (
+        '{"uuid":"dfb2bcaa-d3a1-48fd-af3f-c943354622b4","num_logons":0,"num_logoffs":0,"num_group_changes":0,'
+        '"username":"Jake","password":"JakePass1!","account_type":2,"status":2,"action_manager":null}'
+    )
+    acct = Account.model_validate_json(acct_json)

tests/unit_tests/_primaite/_simulator/test_core.py

@@ -44,36 +44,3 @@ class TestIsolatedSimComponent:
         comp = TestComponent(name="computer", size=(5, 10))
         dump = comp.model_dump_json()
         assert comp == TestComponent.model_validate_json(dump)
-
-    def test_apply_action(self):
-        """Validate that we can override apply_action behaviour and it updates the state of the component."""
-
-        class TestComponent(SimComponent):
-            name: str
-            status: Literal["on", "off"] = "off"
-
-            def describe_state(self) -> Dict:
-                return {}
-
-            def _possible_actions(self) -> Dict[str, Callable[[List[str]], None]]:
-                return {
-                    "turn_off": self._turn_off,
-                    "turn_on": self._turn_on,
-                }
-
-            def _turn_off(self, options: List[str]) -> None:
-                assert len(options) == 0, "This action does not support options."
-                self.status = "off"
-
-            def _turn_on(self, options: List[str]) -> None:
-                assert len(options) == 0, "This action does not support options."
-                self.status = "on"
-
-        comp = TestComponent(name="computer", status="off")
-
-        assert comp.status == "off"
-        comp.apply_action(["turn_on"])
-        assert comp.status == "on"
-
-        with pytest.raises(ValueError):
-            comp.apply_action(["do_nothing"])