WIP: flesh out IOC tests

superscore/tests/ioc/ioc.py

@@ -1,9 +1,9 @@
 from multiprocessing import Process
 from typing import Iterable, Mapping, Union
 
-from caproto import ChannelString
 from caproto.server import PVGroup, pvproperty
 from caproto.server import run as run_ioc
+from epicscorelibs.ca import dbr
 
 from superscore.model import Entry, Nestable, Parameter, Readback, Setpoint
 
@@ -39,8 +39,6 @@ def from_entries(entries: Iterable[Entry], **ioc_options) -> PVGroup:
         """
         attrs = IOCFactory.prepare_attrs(entries)
         IOC = type("IOC", (TempIOC,), attrs)
-        #ioc = IOC(**ioc_options)
-        #return ioc
         return IOC
 
     @staticmethod
@@ -67,7 +65,7 @@ def prepare_attrs(entries: Iterable[Entry]) -> Mapping[str, pvproperty]:
         attrs = {}
         for entry in pvs:
             value = entry.data if isinstance(entry, (Setpoint, Readback)) else None
-            pv = pvproperty(name=entry.pv_name, doc=entry.description, value=value)
+            pv = pvproperty(name=entry.pv_name, doc=entry.description, value=value, dtype=dbr.DBR_STRING if isinstance(entry.data, str) else None)
             attr = "".join([c.lower() for c in entry.pv_name if c != ':'])
             attrs[attr] = pv
         return attrs

superscore/tests/test_ioc.py

@@ -1,14 +1,20 @@
-from epicscorelibs.ca  import dbr
-
 from superscore.control_layers.core import ControlLayer
 
 
 def test_ioc(linac_ioc):
     cl = ControlLayer()
     assert cl.get("SCORETEST:MGNT:GUNB:TEST0").data == 1
-    cl.put("SCORETEST:MGNT:GUNB:TEST0", False)
+    cl.put("SCORETEST:MGNT:GUNB:TEST0", 0)
     assert cl.get("SCORETEST:MGNT:GUNB:TEST0").data == 0
 
-    assert cl.get("SCORETEST:VAC:GUNB:TEST1").data.tobytes().decode() == "Ion Pump"
-    cl.put("SCORETEST:VAC:GUNB:TEST1", "new value".encode())
-    assert cl.get("SCORETEST:VAC:GUNB:TEST1").data.tobytes().decode() == "new value"
+    assert cl.get("SCORETEST:VAC:GUNB:TEST1").data == "Ion Pump"
+    cl.put("SCORETEST:VAC:GUNB:TEST1", "new value")
+    assert cl.get("SCORETEST:VAC:GUNB:TEST1").data == "new value"
+
+    assert cl.get("SCORETEST:LASR:GUNB:TEST2").data == 5
+    cl.put("SCORETEST:LASR:GUNB:TEST2", 10)
+    assert cl.get("SCORETEST:LASR:GUNB:TEST2").data == 10
+
+    assert cl.get("SCORETEST:LASR:IN10:TEST0").data == 645.26
+    cl.put("SCORETEST:LASR:IN10:TEST0", 600.0)
+    assert cl.get("SCORETEST:LASR:IN10:TEST0").data == 600.0