Add tests with chained delegates

Author: jenshnielsen

tests/dataset/measurement/test_measurement_context_manager.py

@@ -207,7 +207,7 @@ def test_register_custom_parameter(DAC) -> None:
         )
 
 
-def test_register_delegate_parameters():
+def test_register_delegate_parameters() -> None:
     x_param = Parameter("x", set_cmd=None, get_cmd=None)
 
     complex_param = Parameter(
@@ -224,7 +224,7 @@ def test_register_delegate_parameters():
     assert meas.parameters["x"].type == "numeric"
 
 
-def test_register_delegate_parameters_with_late_source():
+def test_register_delegate_parameters_with_late_source() -> None:
     x_param = Parameter("x", set_cmd=None, get_cmd=None)
 
     complex_param = Parameter(
@@ -244,6 +244,28 @@ def test_register_delegate_parameters_with_late_source():
     assert meas.parameters["x"].type == "numeric"
 
 
+def test_register_delegate_parameters_with_late_source_chain():
+    x_param = Parameter("x", set_cmd=None, get_cmd=None)
+
+    complex_param = Parameter(
+        "complex_param", get_cmd=None, set_cmd=None, vals=ComplexNumbers()
+    )
+    delegate_inner = DelegateParameter("delegate_inner", source=None)
+    delegate_outer = DelegateParameter("delegate_outer", source=None)
+
+    meas = Measurement()
+
+    meas.register_parameter(x_param)
+
+    delegate_outer.source = delegate_inner
+    delegate_inner.source = complex_param
+
+    meas.register_parameter(delegate_outer, setpoints=(x_param,))
+    assert len(meas.parameters) == 2
+    assert meas.parameters["delegate_outer"].type == "complex"
+    assert meas.parameters["x"].type == "numeric"
+
+
 def test_unregister_parameter(DAC, DMM) -> None:
     """
     Test the unregistering of parameters.

tests/parameter/test_delegate_parameter.py

@@ -660,6 +660,55 @@ def test_validator_delegates_and_source() -> None:
     assert delegate_param.vals == some_other_validator
 
 
+def test_validator_delegates_and_source_chain() -> None:
+    source_param = Parameter("source", set_cmd=None, get_cmd=None)
+    delegate_inner = DelegateParameter("delegate_inner", source=source_param)
+    delegate_outer = DelegateParameter("delegate_outer", source=delegate_inner)
+    source_validator = vals.Numbers(-10, 10)
+    delegate_inner_validator = vals.Numbers(-7, 7)
+    delegate_outer_validator = vals.Numbers(-5, 5)
+
+    source_param.vals = source_validator
+    delegate_inner.vals = delegate_inner_validator
+    delegate_outer.vals = delegate_outer_validator
+
+    delegate_outer.validate(1)
+    with pytest.raises(ValueError):
+        delegate_outer.validate(6)
+
+    delegate_inner.validate(6)
+    source_param.validate(6)
+
+    assert delegate_outer.validators == (
+        delegate_outer_validator,
+        delegate_inner_validator,
+        source_validator,
+    )
+    assert delegate_outer.vals == delegate_outer_validator
+
+    assert delegate_inner.validators == (
+        delegate_inner_validator,
+        source_validator,
+    )
+    assert delegate_inner.vals == delegate_inner_validator
+
+    assert delegate_outer.source is not None
+    delegate_outer.source.vals = None
+
+    assert delegate_outer.validators == (
+        delegate_outer_validator,
+        source_validator,
+    )
+    assert delegate_outer.vals == delegate_outer_validator
+
+    assert isinstance(delegate_outer.source, DelegateParameter)
+    assert delegate_outer.source.source is not None
+    delegate_outer.source.source.vals = None
+
+    assert delegate_outer.validators == (delegate_outer_validator,)
+    assert delegate_outer.vals == delegate_outer_validator
+
+
 def test_value_validation_with_offset_and_scale() -> None:
     source_param = Parameter(
         "source", set_cmd=None, get_cmd=None, vals=vals.Numbers(-5, 5)