Merge branch 523 into 578

tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py

@@ -68,9 +68,14 @@ class TestBeamDevice(base.TestCase):
             proxy.on()
             self.assertEqual(DevState.ON, proxy.state())
         
+            # verify property is retrieved (workaround)
+            HBAT_signal_input_delays = beam.Beam.HBAT_signal_input_delays.default_value
+            self.assertTrue((HBAT_signal_input_delays==numpy.zeros((96,32), dtype=numpy.float64)).all())
+
             # verify if values are actually transformed
-            HBAT_delays = proxy.HBAT_delays(numpy.array([["J2000","0deg","0deg"]] * 96).flatten())
-            HBAT_signal_input_delays = numpy.random.rand(96,32)    # tango properties cannot be retrieved for mock devices
-            HBAT_bf_delay_step_delays = numpy.random.rand(32)
-            HBAT_bf_delays = beam.Beam._calculate_HBAT_bf_delays(numpy.array(HBAT_delays).reshape(96,16), HBAT_signal_input_delays, HBAT_bf_delay_step_delays)
+            HBAT_delays_flat = proxy.HBAT_delays(numpy.array([["J2000","0deg","0deg"]] * 96).flatten()) 
+            HBAT_delays = numpy.array(HBAT_delays_flat).reshape(96,16)
+
+            HBAT_bf_delays = beam.Beam._calculate_HBAT_bf_delays(HBAT_delays, HBAT_signal_input_delays)
             self.assertNotEqual(HBAT_delays, HBAT_bf_delays)
+            self.assertTrue(HBAT_bf_delays[0][0]==numpy.int64((HBAT_delays[0][0]+HBAT_signal_input_delays[0][0])/0.5e-09))