Skip to content

Commit c2e595b

Browse files
gummifgummif
committed
Problem: Compiler warning in tests
Solution: Fix some compiler warnings
1 parent 5c95a07 commit c2e595b

File tree

3 files changed

+29
-33
lines changed

3 files changed

+29
-33
lines changed

‎tests/active_poller.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ TEST_CASE("add handler invalid events type", "[active_poller]")
9292
zmq::active_poller_t active_poller;
9393
zmq::active_poller_t::handler_t handler;
9494
short invalid_events_type = 2 << 10;
95-
CHECK_THROWS_AS(active_poller.add(socket, invalid_events_type, handler), zmq::error_t);
95+
CHECK_THROWS_AS(active_poller.add(socket, invalid_events_type, handler), const zmq::error_t&);
9696
CHECK(active_poller.empty());
9797
CHECK(0u == active_poller.size());
9898
}
@@ -106,14 +106,14 @@ TEST_CASE("add handler twice throws", "[active_poller]")
106106
zmq::active_poller_t::handler_t handler;
107107
active_poller.add(socket, ZMQ_POLLIN, handler);
108108
/// \todo the actual error code should be checked
109-
CHECK_THROWS_AS(active_poller.add(socket, ZMQ_POLLIN, handler), zmq::error_t);
109+
CHECK_THROWS_AS(active_poller.add(socket, ZMQ_POLLIN, handler), const zmq::error_t&);
110110
}
111111

112112
TEST_CASE("wait with no handlers throws", "[active_poller]")
113113
{
114114
zmq::active_poller_t active_poller;
115115
/// \todo the actual error code should be checked
116-
CHECK_THROWS_AS(active_poller.wait(std::chrono::milliseconds{10}), zmq::error_t);
116+
CHECK_THROWS_AS(active_poller.wait(std::chrono::milliseconds{10}), const zmq::error_t&);
117117
}
118118

119119
TEST_CASE("remove unregistered throws", "[active_poller]")
@@ -122,7 +122,7 @@ TEST_CASE("remove unregistered throws", "[active_poller]")
122122
zmq::socket_t socket{context, zmq::socket_type::router};
123123
zmq::active_poller_t active_poller;
124124
/// \todo the actual error code should be checked
125-
CHECK_THROWS_AS(active_poller.remove(socket), zmq::error_t);
125+
CHECK_THROWS_AS(active_poller.remove(socket), const zmq::error_t&);
126126
}
127127

128128
TEST_CASE("remove registered empty", "[active_poller]")
@@ -216,7 +216,7 @@ TEST_CASE("add invalid socket throws", "[active_poller]")
216216
zmq::socket_t a{context, zmq::socket_type::router};
217217
zmq::socket_t b{std::move(a)};
218218
CHECK_THROWS_AS(active_poller.add(a, ZMQ_POLLIN, zmq::active_poller_t::handler_t{}),
219-
zmq::error_t);
219+
const zmq::error_t&);
220220
}
221221

222222
TEST_CASE("remove invalid socket throws", "[active_poller]")
@@ -229,7 +229,7 @@ TEST_CASE("remove invalid socket throws", "[active_poller]")
229229
CHECK(1u == active_poller.size());
230230
std::vector<zmq::socket_t> sockets;
231231
sockets.emplace_back(std::move(socket));
232-
CHECK_THROWS_AS(active_poller.remove(socket), zmq::error_t);
232+
CHECK_THROWS_AS(active_poller.remove(socket), const zmq::error_t&);
233233
CHECK(1u == active_poller.size());
234234
}
235235

@@ -248,7 +248,7 @@ TEST_CASE("modify empty throws", "[active_poller]")
248248
zmq::context_t context;
249249
zmq::socket_t socket{context, zmq::socket_type::push};
250250
zmq::active_poller_t active_poller;
251-
CHECK_THROWS_AS(active_poller.modify(socket, ZMQ_POLLIN), zmq::error_t);
251+
CHECK_THROWS_AS(active_poller.modify(socket, ZMQ_POLLIN), const zmq::error_t&);
252252
}
253253

254254
TEST_CASE("modify invalid socket throws", "[active_poller]")
@@ -257,7 +257,7 @@ TEST_CASE("modify invalid socket throws", "[active_poller]")
257257
zmq::socket_t a{context, zmq::socket_type::push};
258258
zmq::socket_t b{std::move(a)};
259259
zmq::active_poller_t active_poller;
260-
CHECK_THROWS_AS(active_poller.modify(a, ZMQ_POLLIN), zmq::error_t);
260+
CHECK_THROWS_AS(active_poller.modify(a, ZMQ_POLLIN), const zmq::error_t&);
261261
}
262262

263263
TEST_CASE("modify not added throws", "[active_poller]")
@@ -268,7 +268,7 @@ TEST_CASE("modify not added throws", "[active_poller]")
268268
zmq::active_poller_t active_poller;
269269
CHECK_NOTHROW(
270270
active_poller.add(a, ZMQ_POLLIN, zmq::active_poller_t::handler_t{}));
271-
CHECK_THROWS_AS(active_poller.modify(b, ZMQ_POLLIN), zmq::error_t);
271+
CHECK_THROWS_AS(active_poller.modify(b, ZMQ_POLLIN), const zmq::error_t&);
272272
}
273273

274274
TEST_CASE("modify simple", "[active_poller]")
@@ -333,7 +333,7 @@ TEST_CASE("wait on move constructed active_poller", "[active_poller]")
333333
zmq::active_poller_t b{std::move(a)};
334334
CHECK(1u == b.size());
335335
/// \todo the actual error code should be checked
336-
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), zmq::error_t);
336+
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), const zmq::error_t&);
337337
CHECK(b.wait(std::chrono::milliseconds{-1}));
338338
}
339339

@@ -348,7 +348,7 @@ TEST_CASE("wait on move assigned active_poller", "[active_poller]")
348348
b = {std::move(a)};
349349
CHECK(1u == b.size());
350350
/// \todo the actual error code should be checked
351-
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), zmq::error_t);
351+
CHECK_THROWS_AS(a.wait(std::chrono::milliseconds{10}), const zmq::error_t&);
352352
CHECK(b.wait(std::chrono::milliseconds{-1}));
353353
}
354354

@@ -377,17 +377,17 @@ TEST_CASE("received on move constructed active_poller", "[active_poller]")
377377

378378
TEST_CASE("remove from handler", "[active_poller]")
379379
{
380-
constexpr auto ITER_NO = 10;
380+
constexpr size_t ITER_NO = 10;
381381

382382
// Setup servers and clients
383383
std::vector<server_client_setup> setup_list;
384-
for (auto i = 0; i < ITER_NO; ++i)
384+
for (size_t i = 0; i < ITER_NO; ++i)
385385
setup_list.emplace_back(server_client_setup{});
386386

387387
// Setup active_poller
388388
zmq::active_poller_t active_poller;
389389
int count = 0;
390-
for (auto i = 0; i < ITER_NO; ++i) {
390+
for (size_t i = 0; i < ITER_NO; ++i) {
391391
CHECK_NOTHROW(
392392
active_poller.add(setup_list[i].server, ZMQ_POLLIN, [&, i](short events) {
393393
CHECK(events == ZMQ_POLLIN);

‎tests/monitor.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ TEST_CASE("monitor init event count", "[monitor]")
8585
mock_monitor_t monitor;
8686

8787
const int expected_event_count = 2;
88-
int event_count = 0;
89-
auto count_event = [&event_count](const zmq_event_t &, const char *) {
90-
++event_count;
91-
};
92-
9388
monitor.init(s.client, "inproc://foo");
9489

9590
CHECK_FALSE(monitor.check_event(0));
@@ -99,6 +94,7 @@ TEST_CASE("monitor init event count", "[monitor]")
9994
}
10095
CHECK(monitor.connect_delayed == 1);
10196
CHECK(monitor.connected == 1);
97+
CHECK(monitor.total == expected_event_count);
10298
}
10399

104100
TEST_CASE("monitor init abort", "[monitor]")

‎tests/poller.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ TEST_CASE("poller add handler invalid events type", "[poller]")
8787
zmq::socket_t socket{context, zmq::socket_type::router};
8888
zmq::poller_t<> poller;
8989
short invalid_events_type = 2 << 10;
90-
CHECK_THROWS_AS(poller.add(socket, invalid_events_type, nullptr), zmq::error_t);
90+
CHECK_THROWS_AS(poller.add(socket, invalid_events_type, nullptr), const zmq::error_t&);
9191
}
9292
#endif
9393

@@ -98,7 +98,7 @@ TEST_CASE("poller add handler twice throws", "[poller]")
9898
zmq::poller_t<> poller;
9999
poller.add(socket, ZMQ_POLLIN, nullptr);
100100
/// \todo the actual error code should be checked
101-
CHECK_THROWS_AS(poller.add(socket, ZMQ_POLLIN, nullptr), zmq::error_t);
101+
CHECK_THROWS_AS(poller.add(socket, ZMQ_POLLIN, nullptr), const zmq::error_t&);
102102
}
103103

104104
TEST_CASE("poller wait with no handlers throws", "[poller]")
@@ -107,7 +107,7 @@ TEST_CASE("poller wait with no handlers throws", "[poller]")
107107
std::vector<zmq_poller_event_t> events;
108108
/// \todo the actual error code should be checked
109109
CHECK_THROWS_AS(poller.wait_all(events, std::chrono::milliseconds{10}),
110-
zmq::error_t);
110+
const zmq::error_t&);
111111
}
112112

113113
TEST_CASE("poller remove unregistered throws", "[poller]")
@@ -116,7 +116,7 @@ TEST_CASE("poller remove unregistered throws", "[poller]")
116116
zmq::socket_t socket{context, zmq::socket_type::router};
117117
zmq::poller_t<> poller;
118118
/// \todo the actual error code should be checked
119-
CHECK_THROWS_AS(poller.remove(socket), zmq::error_t);
119+
CHECK_THROWS_AS(poller.remove(socket), const zmq::error_t&);
120120
}
121121

122122
TEST_CASE("poller remove registered empty", "[poller]")
@@ -159,7 +159,7 @@ TEST_CASE("poller add invalid socket throws", "[poller]")
159159
zmq::poller_t<> poller;
160160
zmq::socket_t a{context, zmq::socket_type::router};
161161
zmq::socket_t b{std::move(a)};
162-
CHECK_THROWS_AS(poller.add(a, ZMQ_POLLIN, nullptr), zmq::error_t);
162+
CHECK_THROWS_AS(poller.add(a, ZMQ_POLLIN, nullptr), const zmq::error_t&);
163163
}
164164

165165
TEST_CASE("poller remove invalid socket throws", "[poller]")
@@ -170,7 +170,7 @@ TEST_CASE("poller remove invalid socket throws", "[poller]")
170170
CHECK_NOTHROW(poller.add(socket, ZMQ_POLLIN, nullptr));
171171
std::vector<zmq::socket_t> sockets;
172172
sockets.emplace_back(std::move(socket));
173-
CHECK_THROWS_AS(poller.remove(socket), zmq::error_t);
173+
CHECK_THROWS_AS(poller.remove(socket), const zmq::error_t&);
174174
CHECK_NOTHROW(poller.remove(sockets[0]));
175175
}
176176

@@ -179,7 +179,7 @@ TEST_CASE("poller modify empty throws", "[poller]")
179179
zmq::context_t context;
180180
zmq::socket_t socket{context, zmq::socket_type::push};
181181
zmq::poller_t<> poller;
182-
CHECK_THROWS_AS(poller.modify(socket, ZMQ_POLLIN), zmq::error_t);
182+
CHECK_THROWS_AS(poller.modify(socket, ZMQ_POLLIN), const zmq::error_t&);
183183
}
184184

185185
TEST_CASE("poller modify invalid socket throws", "[poller]")
@@ -188,7 +188,7 @@ TEST_CASE("poller modify invalid socket throws", "[poller]")
188188
zmq::socket_t a{context, zmq::socket_type::push};
189189
zmq::socket_t b{std::move(a)};
190190
zmq::poller_t<> poller;
191-
CHECK_THROWS_AS(poller.modify(a, ZMQ_POLLIN), zmq::error_t);
191+
CHECK_THROWS_AS(poller.modify(a, ZMQ_POLLIN), const zmq::error_t&);
192192
}
193193

194194
TEST_CASE("poller modify not added throws", "[poller]")
@@ -198,7 +198,7 @@ TEST_CASE("poller modify not added throws", "[poller]")
198198
zmq::socket_t b{context, zmq::socket_type::push};
199199
zmq::poller_t<> poller;
200200
CHECK_NOTHROW(poller.add(a, ZMQ_POLLIN, nullptr));
201-
CHECK_THROWS_AS(poller.modify(b, ZMQ_POLLIN), zmq::error_t);
201+
CHECK_THROWS_AS(poller.modify(b, ZMQ_POLLIN), const zmq::error_t&);
202202
}
203203

204204
TEST_CASE("poller modify simple", "[poller]")
@@ -259,7 +259,7 @@ TEST_CASE("poller wait on move constructed", "[poller]")
259259
zmq::poller_t<> b{std::move(a)};
260260
std::vector<zmq_poller_event_t> events(1);
261261
/// \todo the actual error code should be checked
262-
CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}), zmq::error_t);
262+
CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}), const zmq::error_t&);
263263
CHECK(1 == b.wait_all(events, std::chrono::milliseconds{-1}));
264264
}
265265

@@ -273,22 +273,22 @@ TEST_CASE("poller wait on move assigned", "[poller]")
273273
b = {std::move(a)};
274274
/// \todo the TEST_CASE error code should be checked
275275
std::vector<zmq_poller_event_t> events(1);
276-
CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}), zmq::error_t);
276+
CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}), const zmq::error_t&);
277277
CHECK(1 == b.wait_all(events, std::chrono::milliseconds{-1}));
278278
}
279279

280280
TEST_CASE("poller remove from handler", "[poller]")
281281
{
282-
constexpr auto ITER_NO = 10;
282+
constexpr size_t ITER_NO = 10;
283283

284284
// Setup servers and clients
285285
std::vector<common_server_client_setup> setup_list;
286-
for (auto i = 0; i < ITER_NO; ++i)
286+
for (size_t i = 0; i < ITER_NO; ++i)
287287
setup_list.emplace_back(common_server_client_setup{});
288288

289289
// Setup poller
290290
zmq::poller_t<> poller;
291-
for (auto i = 0; i < ITER_NO; ++i) {
291+
for (size_t i = 0; i < ITER_NO; ++i) {
292292
CHECK_NOTHROW(poller.add(setup_list[i].server, ZMQ_POLLIN, nullptr));
293293
}
294294
// Clients send messages

0 commit comments

Comments
 (0)