Skip to content
Snippets Groups Projects

Resolve L2SS-247 "2021 07 06 branched from master attribute testing"

Merged Resolve L2SS-247 "2021 07 06 branched from master attribute testing"
L2SS-247_2021-07-06-Branched_from_master-attribute_testing into master
All threads resolved!
Merged Corné Lukken requested to merge L2SS-247_2021-07-06-Branched_from_master-attribute_testing into master
All threads resolved!
Compare
and
Show latest version
2 files
+ 157
− 288
Compare changes
  • Side-by-side
  • Inline
Files
2
devices/test/clients/test_attr_wrapper.py
+ 56
− 188
@@ -22,404 +22,272 @@ scalar_dims = (1,)
spectrum_dims = (4,)
image_dims = (3,2)
class TestAttributeTypes(base.TestCase):
str_scalar_val = '1'
str_spectrum_val = ['1','1', '1','1']
str_image_val = [['1','1'],['1','1'],['1','1']]
def dev_init(device):
device.set_state(DevState.INIT)
device.test_client = test_client(device.Fault, device)
for i in device.attr_list():
i.set_comm_client(device.test_client)
device.test_client.start()
class TestAttributeTypes(base.TestCase):
class str_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="str_scalar_R", datatype=str)
scalar_RW = attribute_wrapper(comms_annotation="str_scalar_RW", datatype=str, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class bool_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="bool_scalar_R", datatype=numpy.bool_)
scalar_RW = attribute_wrapper(comms_annotation="bool_scalar_RW", datatype=numpy.bool_, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class float32_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="float32_scalar_R", datatype=numpy.float32)
scalar_RW = attribute_wrapper(comms_annotation="float32_scalar_RW", datatype=numpy.float32, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class float64_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="float64_scalar_R", datatype=numpy.float64)
scalar_RW = attribute_wrapper(comms_annotation="float64_scalar_RW", datatype=numpy.float64, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class double_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="double_scalar_R", datatype=numpy.double)
scalar_RW = attribute_wrapper(comms_annotation="double_scalar_RW", datatype=numpy.double, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint8_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="uint8_scalar_R", datatype=numpy.uint8)
scalar_RW = attribute_wrapper(comms_annotation="uint8_scalar_RW", datatype=numpy.uint8, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint16_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="uint16_scalar_R", datatype=numpy.uint16)
scalar_RW = attribute_wrapper(comms_annotation="uint16_scalar_RW", datatype=numpy.uint16, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint32_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="uint32_scalar_R", datatype=numpy.uint32)
scalar_RW = attribute_wrapper(comms_annotation="uint32_scalar_RW", datatype=numpy.uint32, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint64_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="uint64_scalar_R", datatype=numpy.uint64)
scalar_RW = attribute_wrapper(comms_annotation="uint64_scalar_RW", datatype=numpy.uint64, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int16_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="int16_scalar_R", datatype=numpy.int16)
scalar_RW = attribute_wrapper(comms_annotation="int16_scalar_RW", datatype=numpy.int16, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int32_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="int32_scalar_R", datatype=numpy.int32)
scalar_RW = attribute_wrapper(comms_annotation="int32_scalar_RW", datatype=numpy.int32, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int64_scalar_device(hardware_device):
scalar_R = attribute_wrapper(comms_annotation="int64_scalar_R", datatype=numpy.int64)
scalar_RW = attribute_wrapper(comms_annotation="int64_scalar_RW", datatype=numpy.int64, access=AttrWriteType.READ_WRITE)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class str_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="str_spectrum_R", datatype=str, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="str_spectrum_RW", datatype=str, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class bool_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="bool_spectrum_R", datatype=numpy.bool_, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="bool_spectrum_RW", datatype=numpy.bool_, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class float32_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="float32_spectrum_R", datatype=numpy.float32, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="float32_spectrum_RW", datatype=numpy.float32, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class float64_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="float64_spectrum_R", datatype=numpy.float64, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="float64_spectrum_RW", datatype=numpy.float64, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class double_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="double_spectrum_R", datatype=numpy.double, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="double_spectrum_RW", datatype=numpy.double, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint8_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="uint8_spectrum_R", datatype=numpy.uint8, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="uint8_spectrum_RW", datatype=numpy.uint8, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint16_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="uint16_spectrum_R", datatype=numpy.uint16, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="uint16_spectrum_RW", datatype=numpy.uint16, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint32_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="uint32_spectrum_R", datatype=numpy.uint32, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="uint32_spectrum_RW", datatype=numpy.uint32, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint64_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="uint64_spectrum_R", datatype=numpy.uint64, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="uint64_spectrum_RW", datatype=numpy.uint64, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int16_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="int16_spectrum_R", datatype=numpy.int16, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="int16_spectrum_RW", datatype=numpy.int16, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int32_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="int32_spectrum_R", datatype=numpy.int32, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="int32_spectrum_RW", datatype=numpy.int32, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int64_spectrum_device(hardware_device):
spectrum_R = attribute_wrapper(comms_annotation="int64_spectrum_R", datatype=numpy.int64, dims=spectrum_dims)
spectrum_RW = attribute_wrapper(comms_annotation="int64_spectrum_RW", datatype=numpy.int64, access=AttrWriteType.READ_WRITE, dims=spectrum_dims)
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class str_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="str_image_R", datatype=str, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="str_image_RW", datatype=str, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class bool_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="bool_image_R", datatype=numpy.bool_, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="bool_image_RW", datatype=numpy.bool_, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class float32_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="float32_image_R", datatype=numpy.float32, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="float32_image_RW", datatype=numpy.float32, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class float64_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="float64_image_R", datatype=numpy.float64, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="float64_image_RW", datatype=numpy.float64, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class double_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="double_image_R", datatype=numpy.double, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="double_image_RW", datatype=numpy.double, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint8_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="uint8_image_R", datatype=numpy.uint8, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="uint8_image_RW", datatype=numpy.uint8, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint16_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="uint16_image_R", datatype=numpy.uint16, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="uint16_image_RW", datatype=numpy.uint16, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint32_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="uint32_image_R", datatype=numpy.uint32, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="uint32_image_RW", datatype=numpy.uint32, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class uint64_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="uint64_image_R", datatype=numpy.uint64, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="uint64_image_RW", datatype=numpy.uint64, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int16_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="int16_image_R", datatype=numpy.int16, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="int16_image_RW", datatype=numpy.int16, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int32_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="int32_image_R", datatype=numpy.int32, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="int32_image_RW", datatype=numpy.int32, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
class int64_image_device(hardware_device):
image_R = attribute_wrapper(comms_annotation="int64_image_R", datatype=numpy.int64, dims=(2,3))
image_RW = attribute_wrapper(comms_annotation="int64_image_RW", datatype=numpy.int64, access=AttrWriteType.READ_WRITE, dims=(2,3))
def configure_for_initialise(self):
self.set_state(DevState.INIT)
self.test_client = test_client(self.Fault, self)
for i in self.attr_list():
i.set_comm_client(self.test_client)
self.test_client.start()
dev_init(self)
def read_R_test(self, dev, dtype, test_type):
'''Test device'''
@@ -466,20 +334,20 @@ class TestAttributeTypes(base.TestCase):
if test_type == "scalar":
if dtype is str or dtype is numpy.str_:
val = '1'
val = str_scalar_val
else:
val = dtype(1)
proxy.scalar_RW = val
elif test_type == "spectrum":
if dtype is str or dtype is numpy.str_:
val = ['1','1','1','1']
val = str_spectrum_val
else:
val = numpy.full(spectrum_dims, dtype=dtype, fill_value=1)
print(val)
proxy.spectrum_RW = val
elif test_type == "image":
if dtype is str or dtype is numpy.str_:
val = [['1','1'],['1','1'],['1','1']]
val = str_image_val
else:
val = numpy.full(image_dims, dtype=dtype, fill_value=1)
proxy.image_RW = val
@@ -541,7 +409,7 @@ class TestAttributeTypes(base.TestCase):
if test_type == "scalar":
if dtype is str or dtype is numpy.str_:
val = '1'
val = str_scalar_val
else:
val = dtype(1)
proxy.scalar_RW = val
@@ -549,7 +417,7 @@ class TestAttributeTypes(base.TestCase):
result_RW = proxy.scalar_RW
elif test_type == "spectrum":
if dtype is str or dtype is numpy.str_:
val = ['1','1','1','1']
val = str_spectrum_val
else:
val = numpy.full(spectrum_dims, dtype=dtype, fill_value=1)
proxy.spectrum_RW = val
@@ -557,7 +425,7 @@ class TestAttributeTypes(base.TestCase):
result_RW = proxy.spectrum_RW
elif test_type == "image":
if dtype is str or dtype is numpy.str_:
val = [['1','1'],['1','1'],['1','1']]
val = str_image_val
else:
val = numpy.full(image_dims, dtype=dtype, fill_value=1)
@@ -728,4 +596,4 @@ class TestAttributeTypes(base.TestCase):
for attribute_type_test in self.attribute_type_tests:
self.readback_test(
attribute_type_test['image'], attribute_type_test['type'],
'image')
'image')