Skip to content

Commit d2c5fef

Browse files
gummifgummif
committed
Apply clang-format
1 parent c4d4cf7 commit d2c5fef

File tree

1 file changed

+49
-66
lines changed

1 file changed

+49
-66
lines changed

‎tests/active_poller.cpp

Lines changed: 49 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ TEST_CASE("create destroy", "[active_poller]")
1414
}
1515

1616
static_assert(!std::is_copy_constructible<zmq::active_poller_t>::value,
17-
"active_active_poller_t should not be copy-constructible");
17+
"active_active_poller_t should not be copy-constructible");
1818
static_assert(!std::is_copy_assignable<zmq::active_poller_t>::value,
19-
"active_active_poller_t should not be copy-assignable");
19+
"active_active_poller_t should not be copy-assignable");
2020

2121
TEST_CASE("move construct empty", "[active_poller]")
2222
{
@@ -47,9 +47,7 @@ TEST_CASE("move construct non empty", "[active_poller]")
4747
zmq::socket_t socket{context, zmq::socket_type::router};
4848

4949
zmq::active_poller_t a;
50-
a.add(socket, zmq::event_flags::pollin, [](zmq::event_flags)
51-
{
52-
});
50+
a.add(socket, zmq::event_flags::pollin, [](zmq::event_flags) {});
5351
CHECK_FALSE(a.empty());
5452
CHECK(1u == a.size());
5553
zmq::active_poller_t b = std::move(a);
@@ -65,9 +63,7 @@ TEST_CASE("move assign non empty", "[active_poller]")
6563
zmq::socket_t socket{context, zmq::socket_type::router};
6664

6765
zmq::active_poller_t a;
68-
a.add(socket, zmq::event_flags::pollin, [](zmq::event_flags)
69-
{
70-
});
66+
a.add(socket, zmq::event_flags::pollin, [](zmq::event_flags) {});
7167
CHECK_FALSE(a.empty());
7268
CHECK(1u == a.size());
7369
zmq::active_poller_t b;
@@ -97,8 +93,9 @@ TEST_CASE("add handler invalid events type", "[active_poller]")
9793
zmq::active_poller_t::handler_type handler;
9894
short invalid_events_type = 2 << 10;
9995
CHECK_THROWS_AS(
100-
active_poller.add(socket, static_cast<zmq::event_flags>(invalid_events_type),
101-
handler), const zmq::error_t&);
96+
active_poller.add(socket, static_cast<zmq::event_flags>(invalid_events_type),
97+
handler),
98+
const zmq::error_t &);
10299
CHECK(active_poller.empty());
103100
CHECK(0u == active_poller.size());
104101
}
@@ -113,15 +110,15 @@ TEST_CASE("add handler twice throws", "[active_poller]")
113110
active_poller.add(socket, zmq::event_flags::pollin, handler);
114111
/// \todo the actual error code should be checked
115112
CHECK_THROWS_AS(active_poller.add(socket, zmq::event_flags::pollin, handler),
116-
const zmq::error_t&);
113+
const zmq::error_t &);
117114
}
118115

119116
TEST_CASE("wait with no handlers throws", "[active_poller]")
120117
{
121118
zmq::active_poller_t active_poller;
122119
/// \todo the actual error code should be checked
123120
CHECK_THROWS_AS(active_poller.wait(std::chrono::milliseconds{10}),
124-
const zmq::error_t&);
121+
const zmq::error_t &);
125122
}
126123

127124
TEST_CASE("remove unregistered throws", "[active_poller]")
@@ -130,7 +127,7 @@ TEST_CASE("remove unregistered throws", "[active_poller]")
130127
zmq::socket_t socket{context, zmq::socket_type::router};
131128
zmq::active_poller_t active_poller;
132129
/// \todo the actual error code should be checked
133-
CHECK_THROWS_AS(active_poller.remove(socket), const zmq::error_t&);
130+
CHECK_THROWS_AS(active_poller.remove(socket), const zmq::error_t &);
134131
}
135132

136133
TEST_CASE("remove registered empty", "[active_poller]")
@@ -148,18 +145,15 @@ TEST_CASE("remove registered non empty", "[active_poller]")
148145
zmq::context_t context;
149146
zmq::socket_t socket{context, zmq::socket_type::router};
150147
zmq::active_poller_t active_poller;
151-
active_poller.add(socket, zmq::event_flags::pollin, [](zmq::event_flags)
152-
{
153-
});
148+
active_poller.add(socket, zmq::event_flags::pollin, [](zmq::event_flags) {});
154149
CHECK_NOTHROW(active_poller.remove(socket));
155150
}
156151

157152
namespace
158153
{
159154
struct server_client_setup : common_server_client_setup
160155
{
161-
zmq::active_poller_t::handler_type handler = [&](zmq::event_flags e)
162-
{
156+
zmq::active_poller_t::handler_type handler = [&](zmq::event_flags e) {
163157
events = e;
164158
};
165159

@@ -178,12 +172,11 @@ TEST_CASE("poll basic", "[active_poller]")
178172

179173
zmq::active_poller_t active_poller;
180174
bool message_received = false;
181-
zmq::active_poller_t::handler_type handler = [&message_received
182-
](zmq::event_flags events)
183-
{
184-
CHECK(zmq::event_flags::none != (events & zmq::event_flags::pollin));
185-
message_received = true;
186-
};
175+
zmq::active_poller_t::handler_type handler =
176+
[&message_received](zmq::event_flags events) {
177+
CHECK(zmq::event_flags::none != (events & zmq::event_flags::pollin));
178+
message_received = true;
179+
};
187180
CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin, handler));
188181
CHECK(1 == active_poller.wait(std::chrono::milliseconds{-1}));
189182
CHECK(message_received);
@@ -200,8 +193,7 @@ TEST_CASE("client server", "[active_poller]")
200193
// Setup active_poller
201194
zmq::active_poller_t active_poller;
202195
zmq::event_flags events;
203-
zmq::active_poller_t::handler_type handler = [&](zmq::event_flags e)
204-
{
196+
zmq::active_poller_t::handler_type handler = [&](zmq::event_flags e) {
205197
if (zmq::event_flags::none != (e & zmq::event_flags::pollin)) {
206198
zmq::message_t zmq_msg;
207199
CHECK_NOTHROW(s.server.recv(zmq_msg)); // get message
@@ -224,9 +216,8 @@ TEST_CASE("client server", "[active_poller]")
224216

225217
// Re-add server socket with pollout flag
226218
CHECK_NOTHROW(active_poller.remove(s.server));
227-
CHECK_NOTHROW(
228-
active_poller.add(s.server, zmq::event_flags::pollin | zmq::event_flags::
229-
pollout, handler));
219+
CHECK_NOTHROW(active_poller.add(
220+
s.server, zmq::event_flags::pollin | zmq::event_flags::pollout, handler));
230221
CHECK(1 == active_poller.wait(std::chrono::milliseconds{-1}));
231222
CHECK(events == zmq::event_flags::pollout);
232223
}
@@ -237,24 +228,22 @@ TEST_CASE("add invalid socket throws", "[active_poller]")
237228
zmq::active_poller_t active_poller;
238229
zmq::socket_t a{context, zmq::socket_type::router};
239230
zmq::socket_t b{std::move(a)};
240-
CHECK_THROWS_AS(
241-
active_poller.add(a, zmq::event_flags::pollin, zmq::active_poller_t::
242-
handler_type{}),
243-
const zmq::error_t&);
231+
CHECK_THROWS_AS(active_poller.add(a, zmq::event_flags::pollin,
232+
zmq::active_poller_t::handler_type{}),
233+
const zmq::error_t &);
244234
}
245235

246236
TEST_CASE("remove invalid socket throws", "[active_poller]")
247237
{
248238
zmq::context_t context;
249239
zmq::socket_t socket{context, zmq::socket_type::router};
250240
zmq::active_poller_t active_poller;
251-
CHECK_NOTHROW(
252-
active_poller.add(socket, zmq::event_flags::pollin, zmq::active_poller_t::
253-
handler_type{}));
241+
CHECK_NOTHROW(active_poller.add(socket, zmq::event_flags::pollin,
242+
zmq::active_poller_t::handler_type{}));
254243
CHECK(1u == active_poller.size());
255244
std::vector<zmq::socket_t> sockets;
256245
sockets.emplace_back(std::move(socket));
257-
CHECK_THROWS_AS(active_poller.remove(socket), const zmq::error_t&);
246+
CHECK_THROWS_AS(active_poller.remove(socket), const zmq::error_t &);
258247
CHECK(1u == active_poller.size());
259248
}
260249

@@ -274,7 +263,7 @@ TEST_CASE("modify empty throws", "[active_poller]")
274263
zmq::socket_t socket{context, zmq::socket_type::push};
275264
zmq::active_poller_t active_poller;
276265
CHECK_THROWS_AS(active_poller.modify(socket, zmq::event_flags::pollin),
277-
const zmq::error_t&);
266+
const zmq::error_t &);
278267
}
279268

280269
TEST_CASE("modify invalid socket throws", "[active_poller]")
@@ -284,7 +273,7 @@ TEST_CASE("modify invalid socket throws", "[active_poller]")
284273
zmq::socket_t b{std::move(a)};
285274
zmq::active_poller_t active_poller;
286275
CHECK_THROWS_AS(active_poller.modify(a, zmq::event_flags::pollin),
287-
const zmq::error_t&);
276+
const zmq::error_t &);
288277
}
289278

290279
TEST_CASE("modify not added throws", "[active_poller]")
@@ -293,24 +282,21 @@ TEST_CASE("modify not added throws", "[active_poller]")
293282
zmq::socket_t a{context, zmq::socket_type::push};
294283
zmq::socket_t b{context, zmq::socket_type::push};
295284
zmq::active_poller_t active_poller;
296-
CHECK_NOTHROW(
297-
active_poller.add(a, zmq::event_flags::pollin, zmq::active_poller_t::
298-
handler_type{}));
285+
CHECK_NOTHROW(active_poller.add(a, zmq::event_flags::pollin,
286+
zmq::active_poller_t::handler_type{}));
299287
CHECK_THROWS_AS(active_poller.modify(b, zmq::event_flags::pollin),
300-
const zmq::error_t&);
288+
const zmq::error_t &);
301289
}
302290

303291
TEST_CASE("modify simple", "[active_poller]")
304292
{
305293
zmq::context_t context;
306294
zmq::socket_t a{context, zmq::socket_type::push};
307295
zmq::active_poller_t active_poller;
296+
CHECK_NOTHROW(active_poller.add(a, zmq::event_flags::pollin,
297+
zmq::active_poller_t::handler_type{}));
308298
CHECK_NOTHROW(
309-
active_poller.add(a, zmq::event_flags::pollin, zmq::active_poller_t::
310-
handler_type{}));
311-
CHECK_NOTHROW(
312-
active_poller.modify(a, zmq::event_flags::pollin | zmq::event_flags::pollout
313-
));
299+
active_poller.modify(a, zmq::event_flags::pollin | zmq::event_flags::pollout));
314300
}
315301

316302
TEST_CASE("poll client server", "[active_poller]")
@@ -330,9 +316,8 @@ TEST_CASE("poll client server", "[active_poller]")
330316
CHECK(s.events == zmq::event_flags::pollin);
331317

332318
// Modify server socket with pollout flag
333-
CHECK_NOTHROW(
334-
active_poller.modify(s.server, zmq::event_flags::pollin | zmq::event_flags::
335-
pollout));
319+
CHECK_NOTHROW(active_poller.modify(s.server, zmq::event_flags::pollin
320+
| zmq::event_flags::pollout));
336321
CHECK(1 == active_poller.wait(std::chrono::milliseconds{500}));
337322
CHECK(s.events == (zmq::event_flags::pollin | zmq::event_flags::pollout));
338323
}
@@ -346,9 +331,8 @@ TEST_CASE("wait one return", "[active_poller]")
346331

347332
// Setup active_poller
348333
zmq::active_poller_t active_poller;
349-
CHECK_NOTHROW(
350-
active_poller.add(s.server, zmq::event_flags::pollin, [&count](zmq::
351-
event_flags) { ++count; }));
334+
CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin,
335+
[&count](zmq::event_flags) { ++count; }));
352336

353337
// client sends message
354338
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
@@ -368,7 +352,7 @@ TEST_CASE("wait on move constructed active_poller", "[active_poller]")
368352
zmq::active_poller_t b{std::move(a)};
369353
CHECK(1u == b.size());
370354
/// \todo the actual error code should be checked
371-
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), const zmq::error_t&);
355+
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), const zmq::error_t &);
372356
CHECK(b.wait(std::chrono::milliseconds{-1}));
373357
}
374358

@@ -383,7 +367,7 @@ TEST_CASE("wait on move assigned active_poller", "[active_poller]")
383367
b = {std::move(a)};
384368
CHECK(1u == b.size());
385369
/// \todo the actual error code should be checked
386-
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), const zmq::error_t&);
370+
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), const zmq::error_t &);
387371
CHECK(b.wait(std::chrono::milliseconds{-1}));
388372
}
389373

@@ -394,9 +378,8 @@ TEST_CASE("received on move constructed active_poller", "[active_poller]")
394378
int count = 0;
395379
// Setup active_poller a
396380
zmq::active_poller_t a;
397-
CHECK_NOTHROW(
398-
a.add(s.server, zmq::event_flags::pollin, [&count](zmq::event_flags) { ++
399-
count; }));
381+
CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin,
382+
[&count](zmq::event_flags) { ++count; }));
400383
// client sends message
401384
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
402385
// wait for message and verify it is received
@@ -425,13 +408,13 @@ TEST_CASE("remove from handler", "[active_poller]")
425408
zmq::active_poller_t active_poller;
426409
int count = 0;
427410
for (size_t i = 0; i < ITER_NO; ++i) {
428-
CHECK_NOTHROW(
429-
active_poller.add(setup_list[i].server, zmq::event_flags::pollin, [&, i](
430-
zmq::event_flags events) {
431-
CHECK(events == zmq::event_flags::pollin);
432-
active_poller.remove(setup_list[ITER_NO - i - 1].server);
433-
CHECK((ITER_NO - i - 1) == active_poller.size());
434-
}));
411+
CHECK_NOTHROW(active_poller.add(
412+
setup_list[i].server, zmq::event_flags::pollin,
413+
[&, i](zmq::event_flags events) {
414+
CHECK(events == zmq::event_flags::pollin);
415+
active_poller.remove(setup_list[ITER_NO - i - 1].server);
416+
CHECK((ITER_NO - i - 1) == active_poller.size());
417+
}));
435418
++count;
436419
}
437420
CHECK(ITER_NO == active_poller.size());

0 commit comments

Comments
 (0)