From 272200950c84a6cbba939ecb227a3f59107fe195 Mon Sep 17 00:00:00 2001 From: stedif <stefano.difrischia@inaf.it> Date: Tue, 25 Jan 2022 16:05:19 +0100 Subject: [PATCH] L2SS-480: flat input arrays on test methods --- .../integration_test/devices/test_device_beam.py | 2 +- .../tangostationcontrol/test/devices/test_beam_device.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py index 8c546220d..8e1f2091f 100644 --- a/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py +++ b/tangostationcontrol/tangostationcontrol/integration_test/devices/test_device_beam.py @@ -34,7 +34,7 @@ class TestDeviceBeam(AbstractTestBases.TestDeviceBase): self.assertIsNotNone(HBAT_delays_r1) # Verify writing operation does not lead to errors - self.proxy.HBAT_set_pointing(["J2000", "0deg", "0deg"] * 96) # write values to RECV + self.proxy.HBAT_set_pointing(numpy.array([["J2000","0deg","0deg"]] * 96).flatten()) # write values to RECV HBAT_delays_r2 = numpy.array(recv_proxy.read_attribute('HBAT_BF_delays_RW').value) self.assertIsNotNone(HBAT_delays_r2) diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py index 929f969b3..2aa26e1b4 100644 --- a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py +++ b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py @@ -12,6 +12,7 @@ from tango.test_context import DeviceTestContext from tangostationcontrol.devices import beam +import numpy import mock from tangostationcontrol.test import base @@ -55,7 +56,7 @@ class TestBeamDevice(base.TestCase): self.assertEqual(DevState.ON, proxy.state()) # verify HBAT_delays method returns the correct dimensions - HBAT_delays = proxy.HBAT_delays([["J2000","0deg","0deg"]] * 96) + HBAT_delays = proxy.HBAT_delays(numpy.array([["J2000","0deg","0deg"]] * 96).flatten()) self.assertEqual((96*16,), HBAT_delays.shape) def test_HBAT_delays_calculations(self): @@ -69,6 +70,6 @@ class TestBeamDevice(base.TestCase): self.assertEqual(DevState.ON, proxy.state()) # verify if values are actually transformed - HBAT_delays = proxy.HBAT_delays([["J2000","0deg","0deg"]] * 96) + HBAT_delays = proxy.HBAT_delays(numpy.array([["J2000","0deg","0deg"]] * 96).flatten()) HBAT_bf_delays = proxy.calculate_HBAT_bf_delays(HBAT_delays) self.assertNotEqual(HBAT_delays, HBAT_bf_delays) -- GitLab