From a37bf9955bf308b07cbe044ce0ddcdb473b60d67 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Tue, 17 Nov 2020 11:06:33 +0100
Subject: [PATCH] Move RamBuffer check to common file

---
 tests/test_ram_buffer.py | 41 +++---------------------------------
 tests/utils.py           | 45 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 38 deletions(-)
 create mode 100644 tests/utils.py

diff --git a/tests/test_ram_buffer.py b/tests/test_ram_buffer.py
index 55cfdad..414b290 100644
--- a/tests/test_ram_buffer.py
+++ b/tests/test_ram_buffer.py
@@ -1,10 +1,6 @@
 import unittest
-
-import numpy
-
-from sf_daq_broker.detector.buffer_reader import FrameMetadata, META_FRAME_BYTES
-from sf_daq_broker.detector.image_assembler import JF_N_PACKETS_PER_FRAME
 from sf_daq_broker.detector.ram_buffer import RamBuffer
+from tests.utils import fill_ram_buffer, test_ram_buffer
 
 
 class TestRamBuffer(unittest.TestCase):
@@ -21,39 +17,8 @@ class TestRamBuffer(unittest.TestCase):
         ram_buffer = RamBuffer(n_modules=n_modules, n_slots=n_slots)
 
         for pulse_id in pulse_ids:
-            for module_id in range(n_modules):
-                meta_buffer, image_buffer = ram_buffer.get_frame_buffers(module_id, pulse_id)
-
-                metadata = FrameMetadata.from_buffer(meta_buffer)
-                metadata.pulse_id = pulse_id
-                metadata.module_id = module_id
-                metadata.frame_index = pulse_id + 1000
-                metadata.daq_rec = pulse_id + 10000
-                metadata.n_recv_packets = JF_N_PACKETS_PER_FRAME
-
-                data = numpy.frombuffer(image_buffer, dtype="uint16")
-                data += module_id
+            fill_ram_buffer(ram_buffer, pulse_id)
 
         for pulse_id in pulse_ids:
-            image_meta, image_buffer = ram_buffer.get_image_buffers(pulse_id)
+            test_ram_buffer(self, ram_buffer, pulse_id)
 
-            image = numpy.frombuffer(image_buffer, dtype="uint16").reshape(1024 * n_modules, 512)
-
-            for module_id in range(n_modules):
-                metadata = FrameMetadata.from_buffer(image_meta, module_id * META_FRAME_BYTES)
-                self.assertEqual(pulse_id, metadata.pulse_id)
-                self.assertEqual(module_id, metadata.module_id)
-                self.assertEqual(pulse_id+1000, metadata.frame_index)
-                self.assertEqual(pulse_id+10000, metadata.daq_rec)
-                self.assertEqual(JF_N_PACKETS_PER_FRAME, metadata.n_recv_packets)
-
-                start_offset = module_id * 1024
-                end_offset = start_offset + 1024
-
-                frame_data = image[start_offset:end_offset, :]
-                # We test only first and last line. Improves speed and we can still test modules boundary.
-                first_line = frame_data[0, :]
-                last_line = frame_data[-1, :]
-
-                self.assertTrue(all((x == module_id for x in first_line)))
-                self.assertTrue(all((x == module_id for x in last_line)))
diff --git a/tests/utils.py b/tests/utils.py
new file mode 100644
index 0000000..ee8afa7
--- /dev/null
+++ b/tests/utils.py
@@ -0,0 +1,45 @@
+import numpy
+
+from sf_daq_broker.detector.buffer_reader import FrameMetadata, META_FRAME_BYTES
+from sf_daq_broker.detector.image_assembler import JF_N_PACKETS_PER_FRAME
+
+
+def fill_ram_buffer(ram_buffer, pulse_id):
+    for module_id in range(ram_buffer.n_modules):
+
+        meta_buffer, image_buffer = ram_buffer.get_frame_buffers(module_id, pulse_id)
+
+        metadata = FrameMetadata.from_buffer(meta_buffer)
+        metadata.pulse_id = pulse_id
+        metadata.module_id = module_id
+        metadata.frame_index = pulse_id + 1000
+        metadata.daq_rec = pulse_id + 10000
+        metadata.n_recv_packets = JF_N_PACKETS_PER_FRAME
+
+        data = numpy.frombuffer(image_buffer, dtype="uint16")
+        data += module_id
+
+
+def test_ram_buffer(self, ram_buffer, pulse_id):
+    image_meta, image_buffer = ram_buffer.get_image_buffers(pulse_id)
+
+    image = numpy.frombuffer(image_buffer, dtype="uint16").reshape(1024 * ram_buffer.n_modules, 512)
+
+    for module_id in range(ram_buffer.n_modules):
+        metadata = FrameMetadata.from_buffer(image_meta, module_id * META_FRAME_BYTES)
+        self.assertEqual(pulse_id, metadata.pulse_id)
+        self.assertEqual(module_id, metadata.module_id)
+        self.assertEqual(pulse_id + 1000, metadata.frame_index)
+        self.assertEqual(pulse_id + 10000, metadata.daq_rec)
+        self.assertEqual(JF_N_PACKETS_PER_FRAME, metadata.n_recv_packets)
+
+        start_offset = module_id * 1024
+        end_offset = start_offset + 1024
+
+        frame_data = image[start_offset:end_offset, :]
+        # We test only first and last line. Improves speed and we can still test modules boundary.
+        first_line = frame_data[0, :]
+        last_line = frame_data[-1, :]
+
+        self.assertTrue(all((x == module_id for x in first_line)))
+        self.assertTrue(all((x == module_id for x in last_line)))