From 305aef31ba3fd67fb45497e8b04d02c0dcab8f92 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Wed, 15 Apr 2020 10:44:39 +0200 Subject: [PATCH] Fix test to use template version of RingBuffer --- core-writer/src/module/ZmqRecvModule.cpp | 2 -- core-writer/test/test_H5WriteModule.cpp | 4 ++-- core-writer/test/test_ProcessManager.cpp | 2 +- core-writer/test/test_ZmqRecvModule.cpp | 8 ++++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/core-writer/src/module/ZmqRecvModule.cpp b/core-writer/src/module/ZmqRecvModule.cpp index a168c59..9ea0096 100644 --- a/core-writer/src/module/ZmqRecvModule.cpp +++ b/core-writer/src/module/ZmqRecvModule.cpp @@ -144,8 +144,6 @@ void ZmqRecvModule::receive_thread(const string& connect_address) continue; } - cout <<" Something!!!"<< endl; - if (!is_saving_) { continue; } diff --git a/core-writer/test/test_H5WriteModule.cpp b/core-writer/test/test_H5WriteModule.cpp index 59f930a..53869e1 100644 --- a/core-writer/test/test_H5WriteModule.cpp +++ b/core-writer/test/test_H5WriteModule.cpp @@ -11,7 +11,7 @@ using namespace std; // Shape * 2 bytes/value (uint16_t) size_t image_n_bytes = 1024*2*2; -void generate_frames(RingBuffer& ring_buffer, int n_frames) +void generate_frames(RingBuffer& ring_buffer, int n_frames) { size_t y_length = 2; size_t x_length = 1024; @@ -47,7 +47,7 @@ TEST(H5WriteModule, basic_interaction) { TestH5Format format("start_dataset"); - RingBuffer ring_buffer(10); + RingBuffer ring_buffer(10); ring_buffer.initialize(image_n_bytes); H5WriteModule h5_write_module(ring_buffer, {}, format); diff --git a/core-writer/test/test_ProcessManager.cpp b/core-writer/test/test_ProcessManager.cpp index c6af27c..df983ae 100644 --- a/core-writer/test/test_ProcessManager.cpp +++ b/core-writer/test/test_ProcessManager.cpp @@ -7,7 +7,7 @@ TEST(ProcessManager, basic_interaction) { TestH5Format format("start_dataset"); - RingBuffer ring_buffer(10); + RingBuffer ring_buffer(10); ZmqRecvModule recv_module(ring_buffer, {}); H5WriteModule write_module(ring_buffer, {}, format); diff --git a/core-writer/test/test_ZmqRecvModule.cpp b/core-writer/test/test_ZmqRecvModule.cpp index f56ceba..f7c0f03 100644 --- a/core-writer/test/test_ZmqRecvModule.cpp +++ b/core-writer/test/test_ZmqRecvModule.cpp @@ -11,7 +11,7 @@ using namespace std; TEST(ZmqRecvModule, basic_interaction) { - RingBuffer ring_buffer(10); + RingBuffer ring_buffer(10); ZmqRecvModule zmq_recv_module(ring_buffer, {}); uint8_t n_receivers = 4; @@ -36,11 +36,11 @@ TEST(ZmqRecvModule, simple_recv) size_t n_msg = 10; thread sender(generate_stream, n_msg); - RingBuffer ring_buffer(n_msg); + RingBuffer ring_buffer(n_msg); ZmqRecvModule zmq_recv_module(ring_buffer, {}); zmq_recv_module.start_saving(); - zmq_recv_module.start_recv("tcp://127.0.0.1:11000", 4); + zmq_recv_module.start_recv(MOCK_STREAM_ADDRESS, 4); sender.join(); this_thread::sleep_for(chrono::milliseconds(100)); @@ -68,7 +68,7 @@ TEST(ZmqRecvModule, stop_saving_and_clear_buffer) size_t n_msg = 10; thread sender(generate_stream, n_msg); - RingBuffer ring_buffer(n_msg); + RingBuffer ring_buffer(n_msg); ZmqRecvModule zmq_recv_module(ring_buffer, {}); zmq_recv_module.start_saving();