also test initial values of AttrRs and AttrWs in CA transport

Author: James Souter

tests/example_softioc.py

@@ -14,6 +14,7 @@
 class InitialEnum(enum.Enum):
     A = 0
     B = 1
+    C = 2
 
 
 class ParentController(Controller):
@@ -39,6 +40,21 @@ class InitialValuesController(Controller):
         Waveform(np.int64, shape=(10,)),
         initial_value=np.array(range(10), dtype=np.int64),
     )
+    int_r = AttrR(Int(), initial_value=5)
+    float_r = AttrR(Float(), initial_value=4.1)
+    bool_r = AttrR(Bool(), initial_value=False)
+    enum_r = AttrR(Enum(InitialEnum), initial_value=InitialEnum.C)
+    str_r = AttrR(String(), initial_value="initial_r")
+    waveform_r = AttrR(
+        Waveform(np.int64, shape=(10,)),
+        initial_value=np.array(range(10, 20), dtype=np.int64),
+    )
+    int_w = AttrW(Int())
+    float_w = AttrW(Float())
+    bool_w = AttrW(Bool())
+    enum_w = AttrW(Enum(InitialEnum))
+    str_w = AttrW(String())
+    waveform_w = AttrW(Waveform(np.int64, shape=(10,)))
 
 
 def run(pv_prefix="SOFTIOC_TEST_DEVICE"):

tests/transport/epics/ca/test_softioc_system.py

@@ -38,6 +38,9 @@ def test_ioc(softioc_subprocess: tuple[str, Queue]):
 async def test_initial_values_set_in_ca(initial_softioc_subprocess):
     pv_prefix, _ = initial_softioc_subprocess
     # combine cagets to reduce timeouts
+
+    # AttrRWs
+
     scalar_sets = await caget(
         [
             f"{pv_prefix}:Int",
@@ -60,3 +63,30 @@ async def test_initial_values_set_in_ca(initial_softioc_subprocess):
     assert np.array_equal((await caget(f"{pv_prefix}:Waveform")), list(range(10)))
     assert (await caget(f"{pv_prefix}:Str_RBV")).tobytes() == b"initial\0"
     assert np.array_equal((await caget(f"{pv_prefix}:Waveform_RBV")), list(range(10)))
+
+    # AttrRs
+    scalars = await caget(
+        [
+            f"{pv_prefix}:IntR",
+            f"{pv_prefix}:FloatR",
+            f"{pv_prefix}:BoolR",
+            f"{pv_prefix}:EnumR",
+        ]
+    )
+    assert scalars == [5, 4.1, 0, 2]
+    assert (await caget(f"{pv_prefix}:StrR")).tobytes() == b"initial_r\0"
+    assert np.array_equal((await caget(f"{pv_prefix}:WaveformR")), list(range(10, 20)))
+
+    # Check AttrWs use the datatype initial value
+    w_scalars = await caget(
+        [
+            f"{pv_prefix}:IntW",
+            f"{pv_prefix}:FloatW",
+            f"{pv_prefix}:BoolW",
+            f"{pv_prefix}:EnumW",
+        ]
+    )
+    return
+    assert w_scalars == [0, 0, 0, 0]
+    assert (await caget(f"{pv_prefix}:StrW")).tobytes() == b"\0"
+    assert np.array_equal((await caget(f"{pv_prefix}:WaveformW")), 10 * [0])