Skip to content

Commit 762b013

Browse files
sigiesecsigiesec
committed
Problem: no tests for poller_t
Solution: add tests
1 parent 3251d05 commit 762b013

File tree

4 files changed

+351
-42
lines changed

4 files changed

+351
-42
lines changed

‎tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ add_executable(
2525
message.cpp
2626
context.cpp
2727
socket.cpp
28+
poller.cpp
2829
active_poller.cpp
2930
multipart.cpp
3031
)

‎tests/active_poller.cpp

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#include <gtest/gtest.h>
21
#include <zmq_addon.hpp>
32

3+
#include "testutil.hpp"
4+
45
#if defined(ZMQ_CPP11) && defined(ZMQ_BUILD_DRAFT_API)
56

67
#include <array>
@@ -82,6 +83,9 @@ TEST(active_poller, add_handler)
8283

8384
TEST(active_poller, add_handler_invalid_events_type)
8485
{
86+
/// \todo is it good that this is accepted? should probably already be
87+
/// checked by zmq_poller_add/modify in libzmq:
88+
/// https://github.com/zeromq/libzmq/issues/3088
8589
zmq::context_t context;
8690
zmq::socket_t socket{context, zmq::socket_type::router};
8791
zmq::active_poller_t active_poller;
@@ -138,54 +142,15 @@ TEST(active_poller, remove_registered_non_empty)
138142
}
139143

140144
namespace {
141-
142-
class loopback_ip4_binder
145+
struct server_client_setup : common_server_client_setup
143146
{
144-
public:
145-
loopback_ip4_binder(zmq::socket_t &socket) { bind(socket); }
146-
std::string endpoint() { return endpoint_; }
147-
private:
148-
// Helper function used in constructor
149-
// as Gtest allows ASSERT_* only in void returning functions
150-
// and constructor/destructor are not.
151-
void bind(zmq::socket_t &socket)
152-
{
153-
ASSERT_NO_THROW(socket.bind("tcp://127.0.0.1:*"));
154-
std::array<char, 100> endpoint{};
155-
size_t endpoint_size = endpoint.size();
156-
ASSERT_NO_THROW(socket.getsockopt(ZMQ_LAST_ENDPOINT, endpoint.data(),
157-
&endpoint_size));
158-
ASSERT_TRUE(endpoint_size < endpoint.size());
159-
endpoint_ = std::string{endpoint.data()};
160-
}
161-
std::string endpoint_;
162-
};
163-
164-
struct server_client_setup
165-
{
166-
server_client_setup ()
167-
{
168-
init ();
169-
}
170-
171-
void init()
172-
{
173-
endpoint = loopback_ip4_binder {server}.endpoint ();
174-
ASSERT_NO_THROW (client.connect (endpoint));
175-
}
176-
177147
zmq::active_poller_t::handler_t handler = [&](short e) {
178148
events = e;
179149
};
180150

181-
zmq::context_t context;
182-
zmq::socket_t server {context, zmq::socket_type::server};
183-
zmq::socket_t client {context, zmq::socket_type::client};
184-
std::string endpoint;
185151
short events = 0;
186152
};
187-
188-
} //namespace
153+
}
189154

190155
TEST(active_poller, poll_basic)
191156
{

‎tests/poller.cpp

Lines changed: 294 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,294 @@
1+
#include "testutil.hpp"
2+
3+
#if defined(ZMQ_CPP11) && defined(ZMQ_BUILD_DRAFT_API)
4+
5+
#include <array>
6+
#include <memory>
7+
8+
TEST(poller, create_destroy)
9+
{
10+
zmq::poller_t<> poller;
11+
}
12+
13+
static_assert(!std::is_copy_constructible<zmq::poller_t<>>::value, "poller_t should not be copy-constructible");
14+
static_assert(!std::is_copy_assignable<zmq::poller_t<>>::value, "poller_t should not be copy-assignable");
15+
16+
TEST(poller, move_construct_empty)
17+
{
18+
zmq::poller_t<> a;
19+
zmq::poller_t<> b = std::move (a);
20+
}
21+
22+
TEST(poller, move_assign_empty)
23+
{
24+
zmq::poller_t<> a;
25+
zmq::poller_t<> b;
26+
b = std::move(a);
27+
}
28+
29+
TEST(poller, move_construct_non_empty)
30+
{
31+
zmq::context_t context;
32+
zmq::socket_t socket{context, zmq::socket_type::router};
33+
34+
zmq::poller_t<> a;
35+
a.add(socket, ZMQ_POLLIN, nullptr);
36+
zmq::poller_t<> b = std::move (a);
37+
}
38+
39+
TEST(poller, move_assign_non_empty)
40+
{
41+
zmq::context_t context;
42+
zmq::socket_t socket{context, zmq::socket_type::router};
43+
44+
zmq::poller_t<> a;
45+
a.add(socket, ZMQ_POLLIN, nullptr);
46+
zmq::poller_t<> b;
47+
b = std::move(a);
48+
}
49+
50+
TEST(poller, add_nullptr)
51+
{
52+
zmq::context_t context;
53+
zmq::socket_t socket{context, zmq::socket_type::router};
54+
zmq::poller_t<> poller;
55+
ASSERT_NO_THROW(poller.add(socket, ZMQ_POLLIN, nullptr));
56+
}
57+
58+
TEST(poller, add_non_nullptr)
59+
{
60+
zmq::context_t context;
61+
zmq::socket_t socket{context, zmq::socket_type::router};
62+
zmq::poller_t<> poller;
63+
int i;
64+
ASSERT_NO_THROW(poller.add(socket, ZMQ_POLLIN, &i));
65+
}
66+
67+
TEST(poller, add_handler_invalid_events_type)
68+
{
69+
/// \todo is it good that this is accepted? should probably already be
70+
/// checked by zmq_poller_add/modify in libzmq:
71+
/// https://github.com/zeromq/libzmq/issues/3088
72+
zmq::context_t context;
73+
zmq::socket_t socket{context, zmq::socket_type::router};
74+
zmq::poller_t<> poller;
75+
short invalid_events_type = 2 << 10;
76+
ASSERT_NO_THROW(poller.add(socket, invalid_events_type, nullptr));
77+
}
78+
79+
TEST(poller, add_handler_twice_throws)
80+
{
81+
zmq::context_t context;
82+
zmq::socket_t socket{context, zmq::socket_type::router};
83+
zmq::poller_t<> poller;
84+
poller.add(socket, ZMQ_POLLIN, nullptr);
85+
/// \todo the actual error code should be checked
86+
ASSERT_THROW(poller.add(socket, ZMQ_POLLIN, nullptr), zmq::error_t);
87+
}
88+
89+
TEST(poller, wait_with_no_handlers_throws)
90+
{
91+
zmq::poller_t<> poller;
92+
std::vector<zmq_poller_event_t> events;
93+
/// \todo the actual error code should be checked
94+
ASSERT_THROW(poller.wait_all(events, std::chrono::milliseconds{10}), zmq::error_t);
95+
}
96+
97+
TEST(poller, remove_unregistered_throws)
98+
{
99+
zmq::context_t context;
100+
zmq::socket_t socket{context, zmq::socket_type::router};
101+
zmq::poller_t<> poller;
102+
/// \todo the actual error code should be checked
103+
ASSERT_THROW(poller.remove(socket), zmq::error_t);
104+
}
105+
106+
TEST(poller, remove_registered_empty)
107+
{
108+
zmq::context_t context;
109+
zmq::socket_t socket{context, zmq::socket_type::router};
110+
zmq::poller_t<> poller;
111+
poller.add(socket, ZMQ_POLLIN, nullptr);
112+
ASSERT_NO_THROW(poller.remove(socket));
113+
}
114+
115+
TEST(poller, remove_registered_non_empty)
116+
{
117+
zmq::context_t context;
118+
zmq::socket_t socket{context, zmq::socket_type::router};
119+
zmq::poller_t<> poller;
120+
poller.add(socket, ZMQ_POLLIN, nullptr);
121+
ASSERT_NO_THROW(poller.remove(socket));
122+
}
123+
124+
TEST(poller, poll_basic)
125+
{
126+
common_server_client_setup s;
127+
128+
ASSERT_NO_THROW(s.client.send("Hi"));
129+
130+
zmq::poller_t<int> poller;
131+
std::vector<zmq_poller_event_t> events{1};
132+
int i = 0;
133+
ASSERT_NO_THROW(poller.add(s.server, ZMQ_POLLIN, &i));
134+
ASSERT_EQ(1, poller.wait_all(events, std::chrono::milliseconds{-1}));
135+
ASSERT_EQ(s.server, events[0].socket);
136+
ASSERT_EQ(&i, events[0].user_data);
137+
}
138+
139+
TEST(poller, add_invalid_socket_throws)
140+
{
141+
zmq::context_t context;
142+
zmq::poller_t<> poller;
143+
zmq::socket_t a {context, zmq::socket_type::router};
144+
zmq::socket_t b {std::move (a)};
145+
ASSERT_THROW (poller.add (a, ZMQ_POLLIN, nullptr),
146+
zmq::error_t);
147+
}
148+
149+
TEST(poller, remove_invalid_socket_throws)
150+
{
151+
zmq::context_t context;
152+
zmq::socket_t socket {context, zmq::socket_type::router};
153+
zmq::poller_t<> poller;
154+
ASSERT_NO_THROW (poller.add (socket, ZMQ_POLLIN, nullptr));
155+
std::vector<zmq::socket_t> sockets;
156+
sockets.emplace_back (std::move (socket));
157+
ASSERT_THROW (poller.remove (socket), zmq::error_t);
158+
ASSERT_NO_THROW (poller.remove (sockets[0]));
159+
}
160+
161+
TEST(poller, modify_empty_throws)
162+
{
163+
zmq::context_t context;
164+
zmq::socket_t socket {context, zmq::socket_type::push};
165+
zmq::poller_t<> poller;
166+
ASSERT_THROW (poller.modify (socket, ZMQ_POLLIN), zmq::error_t);
167+
}
168+
169+
TEST(poller, modify_invalid_socket_throws)
170+
{
171+
zmq::context_t context;
172+
zmq::socket_t a {context, zmq::socket_type::push};
173+
zmq::socket_t b {std::move (a)};
174+
zmq::poller_t<> poller;
175+
ASSERT_THROW (poller.modify (a, ZMQ_POLLIN), zmq::error_t);
176+
}
177+
178+
TEST(poller, modify_not_added_throws)
179+
{
180+
zmq::context_t context;
181+
zmq::socket_t a {context, zmq::socket_type::push};
182+
zmq::socket_t b {context, zmq::socket_type::push};
183+
zmq::poller_t<> poller;
184+
ASSERT_NO_THROW (poller.add (a, ZMQ_POLLIN, nullptr));
185+
ASSERT_THROW (poller.modify (b, ZMQ_POLLIN), zmq::error_t);
186+
}
187+
188+
TEST(poller, modify_simple)
189+
{
190+
zmq::context_t context;
191+
zmq::socket_t a {context, zmq::socket_type::push};
192+
zmq::poller_t<> poller;
193+
ASSERT_NO_THROW (poller.add (a, ZMQ_POLLIN, nullptr));
194+
ASSERT_NO_THROW (poller.modify (a, ZMQ_POLLIN|ZMQ_POLLOUT));
195+
}
196+
197+
TEST(poller, poll_client_server)
198+
{
199+
// Setup server and client
200+
common_server_client_setup s;
201+
202+
// Setup poller
203+
zmq::poller_t<> poller;
204+
ASSERT_NO_THROW(poller.add(s.server, ZMQ_POLLIN, s.server));
205+
206+
// client sends message
207+
ASSERT_NO_THROW(s.client.send("Hi"));
208+
209+
// wait for message and verify events
210+
std::vector<zmq_poller_event_t> events(1);
211+
ASSERT_EQ(1, poller.wait_all(events, std::chrono::milliseconds{500}));
212+
ASSERT_EQ(ZMQ_POLLIN, events[0].events);
213+
214+
// Modify server socket with pollout flag
215+
ASSERT_NO_THROW(poller.modify(s.server, ZMQ_POLLIN | ZMQ_POLLOUT));
216+
ASSERT_EQ(1, poller.wait_all(events, std::chrono::milliseconds{500}));
217+
ASSERT_EQ(ZMQ_POLLIN | ZMQ_POLLOUT, events[0].events);
218+
}
219+
220+
TEST(poller, wait_one_return)
221+
{
222+
// Setup server and client
223+
common_server_client_setup s;
224+
225+
// Setup poller
226+
zmq::poller_t<> poller;
227+
ASSERT_NO_THROW(poller.add(s.server, ZMQ_POLLIN, nullptr));
228+
229+
// client sends message
230+
ASSERT_NO_THROW(s.client.send("Hi"));
231+
232+
// wait for message and verify events
233+
std::vector<zmq_poller_event_t> events(1);
234+
ASSERT_EQ(1, poller.wait_all(events, std::chrono::milliseconds{500}));
235+
}
236+
237+
TEST(poller, wait_on_move_constructed_poller)
238+
{
239+
common_server_client_setup s;
240+
ASSERT_NO_THROW (s.client.send ("Hi"));
241+
zmq::poller_t<> a;
242+
ASSERT_NO_THROW (a.add (s.server, ZMQ_POLLIN, nullptr));
243+
zmq::poller_t<> b {std::move (a)};
244+
std::vector<zmq_poller_event_t> events(1);
245+
/// \todo the actual error code should be checked
246+
ASSERT_THROW(a.wait_all (events, std::chrono::milliseconds{10}), zmq::error_t);
247+
ASSERT_EQ (1, b.wait_all (events, std::chrono::milliseconds {-1}));
248+
}
249+
250+
TEST(poller, wait_on_move_assigned_poller)
251+
{
252+
common_server_client_setup s;
253+
ASSERT_NO_THROW (s.client.send ("Hi"));
254+
zmq::poller_t<> a;
255+
ASSERT_NO_THROW (a.add (s.server, ZMQ_POLLIN, nullptr));
256+
zmq::poller_t<> b;
257+
b = {std::move (a)};
258+
/// \todo the actual error code should be checked
259+
std::vector<zmq_poller_event_t> events(1);
260+
ASSERT_THROW(a.wait_all (events, std::chrono::milliseconds{10}), zmq::error_t);
261+
ASSERT_EQ (1, b.wait_all (events, std::chrono::milliseconds {-1}));
262+
}
263+
264+
TEST(poller, remove_from_handler)
265+
{
266+
constexpr auto ITER_NO = 10;
267+
268+
// Setup servers and clients
269+
std::vector<common_server_client_setup> setup_list;
270+
for (auto i = 0; i < ITER_NO; ++i)
271+
setup_list.emplace_back (common_server_client_setup{});
272+
273+
// Setup poller
274+
zmq::poller_t<> poller;
275+
for (auto i = 0; i < ITER_NO; ++i) {
276+
ASSERT_NO_THROW(poller.add(setup_list[i].server, ZMQ_POLLIN, nullptr));
277+
}
278+
// Clients send messages
279+
for (auto & s : setup_list) {
280+
ASSERT_NO_THROW(s.client.send("Hi"));
281+
}
282+
283+
// Wait for all servers to receive a message
284+
for (auto & s : setup_list) {
285+
zmq::pollitem_t items [] = { { s.server, 0, ZMQ_POLLIN, 0 } };
286+
zmq::poll (&items [0], 1);
287+
}
288+
289+
// Fire all handlers in one wait
290+
std::vector<zmq_poller_event_t> events(ITER_NO);
291+
ASSERT_EQ(ITER_NO, poller.wait_all (events, std::chrono::milliseconds{-1}));
292+
}
293+
294+
#endif

0 commit comments

Comments
 (0)