From 97b7ed12bc4238d124e66bdc7bae18862d7cb61b Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Tue, 6 Jul 2021 11:45:25 +0200 Subject: [PATCH] Fix test --- std-udp-recv/test/test_FrameUdpReceiver.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/std-udp-recv/test/test_FrameUdpReceiver.cpp b/std-udp-recv/test/test_FrameUdpReceiver.cpp index 5a9f116..0ebc5ce 100644 --- a/std-udp-recv/test/test_FrameUdpReceiver.cpp +++ b/std-udp-recv/test/test_FrameUdpReceiver.cpp @@ -68,7 +68,7 @@ TEST(BufferUdpReceiver, simple_recv) TEST(BufferUdpReceiver, missing_middle_packet) { auto n_packets = 128; - int source_id = 1234; + int module_id = 1234; int n_frames = 3; uint16_t udp_port = MOCK_UDP_PORT; @@ -76,7 +76,7 @@ TEST(BufferUdpReceiver, missing_middle_packet) auto send_socket_fd = socket(AF_INET, SOCK_DGRAM, 0); ASSERT_TRUE(send_socket_fd >= 0); - FrameUdpReceiver udp_receiver(udp_port, source_id); + FrameUdpReceiver udp_receiver(udp_port, n_packets); auto handle = async(launch::async, [&](){ for (int i_frame=0; i_frame < n_frames; i_frame++){ @@ -105,19 +105,20 @@ TEST(BufferUdpReceiver, missing_middle_packet) handle.wait(); - ModuleFrame metadata; + ModuleFrame meta; + meta.module_id = module_id; + auto frame_buffer = make_unique(DATA_BYTES_PER_FRAME); for (int i_frame=0; i_frame < n_frames; i_frame++) { - auto pulse_id = udp_receiver.get_frame_from_udp( - metadata, frame_buffer.get()); + udp_receiver.get_frame_from_udp(meta, frame_buffer.get()); - ASSERT_EQ(i_frame + 1, pulse_id); - ASSERT_EQ(metadata.frame_index, i_frame + 1000); - ASSERT_EQ(metadata.daq_rec, i_frame + 10000); + ASSERT_EQ(i_frame + 1, meta.pulse_id); + ASSERT_EQ(meta.frame_index, i_frame + 1000); + ASSERT_EQ(meta.daq_rec, i_frame + 10000); // -1 because we skipped a packet. - ASSERT_EQ(metadata.n_recv_packets, n_packets - 1); - ASSERT_EQ(metadata.module_id, source_id); + ASSERT_EQ(meta.n_recv_packets, n_packets - 1); + ASSERT_EQ(meta.module_id, module_id); } ::close(send_socket_fd);