cactus-test-definitions 1.6.0__py3-none-any.whl → 1.8.1__py3-none-any.whl

tests/unit/client/test_validate.py

@@ -151,3 +151,50 @@ def test_procedures_have_required_preconditions(tp_id: TestProcedureId):
                 ):
                     assert tp.preconditions.checks is not None
                     assert any([check.type == "der-settings-contents" for check in tp.preconditions.checks])
+
+
+@pytest.mark.parametrize("tp_id", TestProcedureId)
+def test_response_subject_tags_have_corresponding_der_control_tags(tp_id: TestProcedureId):
+    """Ensures that every subject_tag in response-contents checks has a corresponding
+    tag defined in a create-der-control action in the same test procedure."""
+
+    tp = get_test_procedure(tp_id)
+
+    # Collect all tags defined in create-der-control actions
+    der_control_tags = set()
+
+    if tp.preconditions and tp.preconditions.actions:
+        der_control_tags.update(
+            [
+                a.parameters.get("tag")
+                for a in tp.preconditions.actions
+                if a.type == "create-der-control" and a.parameters and a.parameters.get("tag")
+            ]
+        )
+
+    der_control_tags.update(
+        [
+            a.parameters.get("tag")
+            for s in tp.steps.values()
+            for a in s.actions
+            if a.type == "create-der-control" and a.parameters and a.parameters.get("tag")
+        ]
+    )
+
+    # Collect all subject_tags referenced in response-contents checks
+    referenced_subject_tags = set(
+        [
+            c.parameters.get("subject_tag")
+            for s in tp.steps.values()
+            if s.event.checks
+            for c in s.event.checks
+            if c.type == "response-contents" and c.parameters and c.parameters.get("subject_tag")
+        ]
+    )
+
+    # Verify all referenced subject_tags have corresponding der-control tags
+    missing_tags = referenced_subject_tags - der_control_tags
+    assert not missing_tags, (
+        f"The following subject_tags in response-contents checks do not have corresponding "
+        f"tags in create-der-control actions: {missing_tags}"
+    )

tests/unit/server/test_validate.py

@@ -32,11 +32,13 @@ def test_each_alias_defined(tp_id: str):
 
     # sanity check - make sure we are looking for the action names that are valid
     UPSERT_MUP_ACTION = "upsert-mup"
-    INSERT_MUP_ACTION = "insert-readings"
+    INSERT_READING_ACTION = "insert-readings"
     CREATE_SUB_ACTION = "create-subscription"
     DELETE_SUB_ACTION = "delete-subscription"
     assert UPSERT_MUP_ACTION in ACTION_PARAMETER_SCHEMA, "If this fails - the action name has changed. Update this test"
-    assert INSERT_MUP_ACTION in ACTION_PARAMETER_SCHEMA, "If this fails - the action name has changed. Update this test"
+    assert (
+        INSERT_READING_ACTION in ACTION_PARAMETER_SCHEMA
+    ), "If this fails - the action name has changed. Update this test"
     assert CREATE_SUB_ACTION in ACTION_PARAMETER_SCHEMA, "If this fails - the action name has changed. Update this test"
     assert DELETE_SUB_ACTION in ACTION_PARAMETER_SCHEMA, "If this fails - the action name has changed. Update this test"
 
@@ -51,12 +53,23 @@ def test_each_alias_defined(tp_id: str):
             sub_id = None
 
         if step.action.type == UPSERT_MUP_ACTION:
-            assert mup_id and (mup_id not in mup_aliases_found), "mup_id is already defined in this test."
             mup_aliases_found.add(mup_id)
-        elif step.action.type == INSERT_MUP_ACTION:
+        elif step.action.type == INSERT_READING_ACTION:
             assert mup_id and (mup_id in mup_aliases_found), "mup_id hasn't been defined yet."
         elif step.action.type == CREATE_SUB_ACTION:
             assert sub_id and (sub_id not in sub_aliases_found), "sub_id is already defined in this test."
             sub_aliases_found.add(sub_id)
         elif step.action.type == DELETE_SUB_ACTION:
             assert sub_id and (sub_id in sub_aliases_found), "sub_id hasn't been defined yet."
+
+        # Any instance of "sub_id" / "mup_id" in a check must have ALSO been defined in an earlier action
+        for check in step.checks or []:
+            sub_id = check.parameters.get("sub_id", None)
+            if sub_id:
+                # This will match
+                assert sub_id and (sub_id in sub_aliases_found), "sub_id hasn't been defined yet."
+
+            mup_id = check.parameters.get("mup_id", None)
+            if mup_id:
+                # This will match
+                assert mup_id and (mup_id in mup_aliases_found), "mup_id hasn't been defined yet."