Skip to content

Commit c4d4cf7

Browse files
sigiesecsigiesec
authored
Merge pull request #417 from gummif/gfa/pre-refactoring
Problem: Warnings and duplication
2 parents a2ef92e + 76e6bac commit c4d4cf7

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

‎tests/active_poller.cpp

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,16 @@ struct server_client_setup : common_server_client_setup
165165

166166
zmq::event_flags events = zmq::event_flags::none;
167167
};
168+
169+
const std::string hi_str = "Hi";
170+
168171
}
169172

170173
TEST_CASE("poll basic", "[active_poller]")
171174
{
172175
server_client_setup s;
173176

174-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
177+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
175178

176179
zmq::active_poller_t active_poller;
177180
bool message_received = false;
@@ -189,7 +192,7 @@ TEST_CASE("poll basic", "[active_poller]")
189192
/// \todo this contains multiple test cases that should be split up
190193
TEST_CASE("client server", "[active_poller]")
191194
{
192-
const std::string send_msg = "Hi";
195+
const std::string send_msg = hi_str;
193196

194197
// Setup server and client
195198
server_client_setup s;
@@ -258,7 +261,7 @@ TEST_CASE("remove invalid socket throws", "[active_poller]")
258261
TEST_CASE("wait on added empty handler", "[active_poller]")
259262
{
260263
server_client_setup s;
261-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
264+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
262265
zmq::active_poller_t active_poller;
263266
zmq::active_poller_t::handler_type handler;
264267
CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin, handler));
@@ -320,7 +323,7 @@ TEST_CASE("poll client server", "[active_poller]")
320323
CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin, s.handler));
321324

322325
// client sends message
323-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
326+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
324327

325328
// wait for message and verify events
326329
CHECK_NOTHROW(active_poller.wait(std::chrono::milliseconds{500}));
@@ -348,7 +351,7 @@ TEST_CASE("wait one return", "[active_poller]")
348351
event_flags) { ++count; }));
349352

350353
// client sends message
351-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
354+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
352355

353356
// wait for message and verify events
354357
CHECK(1 == active_poller.wait(std::chrono::milliseconds{500}));
@@ -358,7 +361,7 @@ TEST_CASE("wait one return", "[active_poller]")
358361
TEST_CASE("wait on move constructed active_poller", "[active_poller]")
359362
{
360363
server_client_setup s;
361-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
364+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
362365
zmq::active_poller_t a;
363366
zmq::active_poller_t::handler_type handler;
364367
CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin, handler));
@@ -372,7 +375,7 @@ TEST_CASE("wait on move constructed active_poller", "[active_poller]")
372375
TEST_CASE("wait on move assigned active_poller", "[active_poller]")
373376
{
374377
server_client_setup s;
375-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
378+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
376379
zmq::active_poller_t a;
377380
zmq::active_poller_t::handler_type handler;
378381
CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin, handler));
@@ -395,14 +398,14 @@ TEST_CASE("received on move constructed active_poller", "[active_poller]")
395398
a.add(s.server, zmq::event_flags::pollin, [&count](zmq::event_flags) { ++
396399
count; }));
397400
// client sends message
398-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
401+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
399402
// wait for message and verify it is received
400403
CHECK(1 == a.wait(std::chrono::milliseconds{500}));
401404
CHECK(1u == count);
402405
// Move construct active_poller b
403406
zmq::active_poller_t b{std::move(a)};
404407
// client sends message again
405-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
408+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
406409
// wait for message and verify it is received
407410
CHECK(1 == b.wait(std::chrono::milliseconds{500}));
408411
CHECK(2u == count);
@@ -434,7 +437,7 @@ TEST_CASE("remove from handler", "[active_poller]")
434437
CHECK(ITER_NO == active_poller.size());
435438
// Clients send messages
436439
for (auto &s : setup_list) {
437-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
440+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
438441
}
439442

440443
// Wait for all servers to receive a message

‎tests/context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ TEST_CASE("context - use socket after shutdown", "[context]")
5555
{
5656
sock.connect("inproc://test");
5757
zmq::message_t msg;
58-
sock.recv(msg, zmq::recv_flags::dontwait);
58+
(void)sock.recv(msg, zmq::recv_flags::dontwait);
5959
REQUIRE(false);
6060
}
6161
catch (const zmq::error_t& e)

‎tests/poller.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,13 @@ TEST_CASE("poller remove registered non empty", "[poller]")
161161
CHECK_NOTHROW(poller.remove(socket));
162162
}
163163

164+
const std::string hi_str = "Hi";
165+
164166
TEST_CASE("poller poll basic", "[poller]")
165167
{
166168
common_server_client_setup s;
167169

168-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
170+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
169171

170172
zmq::poller_t<int> poller;
171173
std::vector<zmq::poller_event<int>> events{1};
@@ -245,7 +247,7 @@ TEST_CASE("poller poll client server", "[poller]")
245247
CHECK_NOTHROW(poller.add(s.server, zmq::event_flags::pollin, &s.server));
246248

247249
// client sends message
248-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
250+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
249251

250252
// wait for message and verify events
251253
std::vector<zmq::poller_event<zmq::socket_t>> events(1);
@@ -271,7 +273,7 @@ TEST_CASE("poller wait one return", "[poller]")
271273
CHECK_NOTHROW(poller.add(s.server, zmq::event_flags::pollin));
272274

273275
// client sends message
274-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
276+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
275277

276278
// wait for message and verify events
277279
std::vector<zmq::poller_event<>> events(1);
@@ -281,7 +283,7 @@ TEST_CASE("poller wait one return", "[poller]")
281283
TEST_CASE("poller wait on move constructed", "[poller]")
282284
{
283285
common_server_client_setup s;
284-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
286+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
285287
zmq::poller_t<> a;
286288
CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin));
287289
zmq::poller_t<> b{std::move(a)};
@@ -295,7 +297,7 @@ TEST_CASE("poller wait on move constructed", "[poller]")
295297
TEST_CASE("poller wait on move assigned", "[poller]")
296298
{
297299
common_server_client_setup s;
298-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
300+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
299301
zmq::poller_t<> a;
300302
CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin));
301303
zmq::poller_t<> b;
@@ -323,7 +325,7 @@ TEST_CASE("poller remove from handler", "[poller]")
323325
}
324326
// Clients send messages
325327
for (auto &s : setup_list) {
326-
CHECK_NOTHROW(s.client.send(zmq::message_t{"Hi"}, zmq::send_flags::none));
328+
CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
327329
}
328330

329331
// Wait for all servers to receive a message

0 commit comments

Comments
 (0)