Skip to content

Commit eddeaf4

Browse files
albestroalbestro
committed
fix CHECK_THROWS_AS usage
"Note that the exception type is extended with const& and you should not include it yourself." according to https://github.com/catchorg/Catch2/blob/devel/docs/assertions.md#exceptions
1 parent b6420aa commit eddeaf4

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

‎tests/active_poller.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ TEST_CASE("add null handler fails", "[active_poller]")
9393
zmq::active_poller_t active_poller;
9494
zmq::active_poller_t::handler_type handler;
9595
CHECK_THROWS_AS(active_poller.add(socket, zmq::event_flags::pollin, handler),
96-
const std::invalid_argument &);
96+
std::invalid_argument);
9797
}
9898

9999
#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 0)
@@ -107,7 +107,7 @@ TEST_CASE("add handler invalid events type", "[active_poller]")
107107
CHECK_THROWS_AS(
108108
active_poller.add(socket, static_cast<zmq::event_flags>(invalid_events_type),
109109
no_op_handler),
110-
const zmq::error_t &);
110+
zmq::error_t);
111111
CHECK(active_poller.empty());
112112
CHECK(0u == active_poller.size());
113113
}
@@ -243,7 +243,7 @@ TEST_CASE("add invalid socket throws", "[active_poller]")
243243
zmq::socket_t a{context, zmq::socket_type::router};
244244
zmq::socket_t b{std::move(a)};
245245
CHECK_THROWS_AS(active_poller.add(a, zmq::event_flags::pollin, no_op_handler),
246-
const zmq::error_t &);
246+
zmq::error_t);
247247
}
248248

249249
TEST_CASE("remove invalid socket throws", "[active_poller]")
@@ -256,7 +256,7 @@ TEST_CASE("remove invalid socket throws", "[active_poller]")
256256
CHECK(1u == active_poller.size());
257257
std::vector<zmq::socket_t> sockets;
258258
sockets.emplace_back(std::move(socket));
259-
CHECK_THROWS_AS(active_poller.remove(socket), const zmq::error_t &);
259+
CHECK_THROWS_AS(active_poller.remove(socket), zmq::error_t);
260260
CHECK(1u == active_poller.size());
261261
}
262262

@@ -276,7 +276,7 @@ TEST_CASE("modify empty throws", "[active_poller]")
276276
zmq::socket_t socket{context, zmq::socket_type::push};
277277
zmq::active_poller_t active_poller;
278278
CHECK_THROWS_AS(active_poller.modify(socket, zmq::event_flags::pollin),
279-
const zmq::error_t &);
279+
zmq::error_t);
280280
}
281281

282282
TEST_CASE("modify invalid socket throws", "[active_poller]")
@@ -286,7 +286,7 @@ TEST_CASE("modify invalid socket throws", "[active_poller]")
286286
zmq::socket_t b{std::move(a)};
287287
zmq::active_poller_t active_poller;
288288
CHECK_THROWS_AS(active_poller.modify(a, zmq::event_flags::pollin),
289-
const zmq::error_t &);
289+
zmq::error_t);
290290
}
291291

292292
TEST_CASE("modify not added throws", "[active_poller]")
@@ -297,7 +297,7 @@ TEST_CASE("modify not added throws", "[active_poller]")
297297
zmq::active_poller_t active_poller;
298298
CHECK_NOTHROW(active_poller.add(a, zmq::event_flags::pollin, no_op_handler));
299299
CHECK_THROWS_AS(active_poller.modify(b, zmq::event_flags::pollin),
300-
const zmq::error_t &);
300+
zmq::error_t);
301301
}
302302

303303
TEST_CASE("modify simple", "[active_poller]")

‎tests/codec_multipart.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ TEST_CASE("multipart codec decode bad data overflow", "[codec_multipart]")
6969

7070
CHECK_THROWS_AS(
7171
multipart_t::decode(wrong_size),
72-
const std::out_of_range&);
72+
std::out_of_range);
7373
}
7474

7575
TEST_CASE("multipart codec decode bad data extra data", "[codec_multipart]")
@@ -83,7 +83,7 @@ TEST_CASE("multipart codec decode bad data extra data", "[codec_multipart]")
8383

8484
CHECK_THROWS_AS(
8585
multipart_t::decode(wrong_size),
86-
const std::out_of_range&);
86+
std::out_of_range);
8787
}
8888

8989

‎tests/context.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ TEST_CASE("context set/get options", "[context]")
7575

7676
CHECK_THROWS_AS(
7777
context.set(static_cast<zmq::ctxopt>(-42), 5),
78-
const zmq::error_t &);
78+
zmq::error_t);
7979

8080
CHECK_THROWS_AS(
8181
context.get(static_cast<zmq::ctxopt>(-42)),
82-
const zmq::error_t &);
82+
zmq::error_t);
8383
}
8484
#endif

‎tests/poller.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ TEST_CASE("poller add handler invalid events type", "[poller]")
109109
short invalid_events_type = 2 << 10;
110110
CHECK_THROWS_AS(
111111
poller.add(socket, static_cast<zmq::event_flags>(invalid_events_type)),
112-
const zmq::error_t&);
112+
zmq::error_t);
113113
}
114114
#endif
115115

@@ -121,7 +121,7 @@ TEST_CASE("poller add handler twice throws", "[poller]")
121121
poller.add(socket, zmq::event_flags::pollin);
122122
/// \todo the actual error code should be checked
123123
CHECK_THROWS_AS(poller.add(socket, zmq::event_flags::pollin),
124-
const zmq::error_t&);
124+
zmq::error_t);
125125
}
126126

127127
TEST_CASE("poller wait with no handlers throws", "[poller]")
@@ -130,7 +130,7 @@ TEST_CASE("poller wait with no handlers throws", "[poller]")
130130
std::vector<zmq::poller_event<>> events;
131131
/// \todo the actual error code should be checked
132132
CHECK_THROWS_AS(poller.wait_all(events, std::chrono::milliseconds{10}),
133-
const zmq::error_t&);
133+
zmq::error_t);
134134
}
135135

136136
#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3)
@@ -153,7 +153,7 @@ TEST_CASE("poller remove unregistered throws", "[poller]")
153153
zmq::socket_t socket{context, zmq::socket_type::router};
154154
zmq::poller_t<> poller;
155155
/// \todo the actual error code should be checked
156-
CHECK_THROWS_AS(poller.remove(socket), const zmq::error_t&);
156+
CHECK_THROWS_AS(poller.remove(socket), zmq::error_t);
157157
}
158158

159159
TEST_CASE("poller remove registered empty", "[poller]")
@@ -198,7 +198,7 @@ TEST_CASE("poller add invalid socket throws", "[poller]")
198198
zmq::poller_t<> poller;
199199
zmq::socket_t a{context, zmq::socket_type::router};
200200
zmq::socket_t b{std::move(a)};
201-
CHECK_THROWS_AS(poller.add(a, zmq::event_flags::pollin), const zmq::error_t&);
201+
CHECK_THROWS_AS(poller.add(a, zmq::event_flags::pollin), zmq::error_t);
202202
}
203203

204204
TEST_CASE("poller remove invalid socket throws", "[poller]")
@@ -209,7 +209,7 @@ TEST_CASE("poller remove invalid socket throws", "[poller]")
209209
CHECK_NOTHROW(poller.add(socket, zmq::event_flags::pollin));
210210
std::vector<zmq::socket_t> sockets;
211211
sockets.emplace_back(std::move(socket));
212-
CHECK_THROWS_AS(poller.remove(socket), const zmq::error_t&);
212+
CHECK_THROWS_AS(poller.remove(socket), zmq::error_t);
213213
CHECK_NOTHROW(poller.remove(sockets[0]));
214214
}
215215

@@ -219,7 +219,7 @@ TEST_CASE("poller modify empty throws", "[poller]")
219219
zmq::socket_t socket{context, zmq::socket_type::push};
220220
zmq::poller_t<> poller;
221221
CHECK_THROWS_AS(poller.modify(socket, zmq::event_flags::pollin),
222-
const zmq::error_t&);
222+
zmq::error_t);
223223
}
224224

225225
TEST_CASE("poller modify invalid socket throws", "[poller]")
@@ -228,7 +228,7 @@ TEST_CASE("poller modify invalid socket throws", "[poller]")
228228
zmq::socket_t a{context, zmq::socket_type::push};
229229
zmq::socket_t b{std::move(a)};
230230
zmq::poller_t<> poller;
231-
CHECK_THROWS_AS(poller.modify(a, zmq::event_flags::pollin), const zmq::error_t&);
231+
CHECK_THROWS_AS(poller.modify(a, zmq::event_flags::pollin), zmq::error_t);
232232
}
233233

234234
TEST_CASE("poller modify not added throws", "[poller]")
@@ -238,7 +238,7 @@ TEST_CASE("poller modify not added throws", "[poller]")
238238
zmq::socket_t b{context, zmq::socket_type::push};
239239
zmq::poller_t<> poller;
240240
CHECK_NOTHROW(poller.add(a, zmq::event_flags::pollin));
241-
CHECK_THROWS_AS(poller.modify(b, zmq::event_flags::pollin), const zmq::error_t&);
241+
CHECK_THROWS_AS(poller.modify(b, zmq::event_flags::pollin), zmq::error_t);
242242
}
243243

244244
TEST_CASE("poller modify simple", "[poller]")
@@ -304,7 +304,7 @@ TEST_CASE("poller wait on move constructed", "[poller]")
304304
std::vector<zmq::poller_event<>> events(1);
305305
/// \todo the actual error code should be checked
306306
CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}),
307-
const zmq::error_t&);
307+
zmq::error_t);
308308
CHECK(1 == b.wait_all(events, std::chrono::milliseconds{-1}));
309309
}
310310

@@ -319,7 +319,7 @@ TEST_CASE("poller wait on move assigned", "[poller]")
319319
/// \todo the TEST_CASE error code should be checked
320320
std::vector<zmq::poller_event<>> events(1);
321321
CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}),
322-
const zmq::error_t&);
322+
zmq::error_t);
323323
CHECK(1 == b.wait_all(events, std::chrono::milliseconds{-1}));
324324
}
325325

‎tests/recv_multipart.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ TEST_CASE("recv_multipart test", "[recv_multipart]")
5252
std::vector<zmq::message_t> msgs;
5353
CHECK_THROWS_AS(
5454
zmq::recv_multipart(zmq::socket_ref(), std::back_inserter(msgs)),
55-
const zmq::error_t &);
55+
zmq::error_t);
5656
}
5757
}
5858

@@ -90,7 +90,7 @@ TEST_CASE("recv_multipart_n test", "[recv_multipart]")
9090
std::array<zmq::message_t, 1> msgs;
9191
CHECK_THROWS_AS(
9292
zmq::recv_multipart_n(output, msgs.data(), msgs.size()),
93-
const std::runtime_error&);
93+
std::runtime_error);
9494
}
9595
SECTION("recv 0") {
9696
input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
@@ -99,7 +99,7 @@ TEST_CASE("recv_multipart_n test", "[recv_multipart]")
9999
std::array<zmq::message_t, 1> msgs;
100100
CHECK_THROWS_AS(
101101
zmq::recv_multipart_n(output, msgs.data(), 0),
102-
const std::runtime_error&);
102+
std::runtime_error);
103103
}
104104
SECTION("send 2 messages") {
105105
input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
@@ -132,7 +132,7 @@ TEST_CASE("recv_multipart_n test", "[recv_multipart]")
132132
std::array<zmq::message_t, 1> msgs;
133133
CHECK_THROWS_AS(
134134
zmq::recv_multipart_n(zmq::socket_ref(), msgs.data(), msgs.size()),
135-
const zmq::error_t &);
135+
zmq::error_t);
136136
}
137137
}
138138

‎tests/send_multipart.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ TEST_CASE("send_multipart test", "[send_multipart]")
115115
SECTION("send with invalid socket") {
116116
std::vector<zmq::message_t> msgs(1);
117117
CHECK_THROWS_AS(zmq::send_multipart(zmq::socket_ref(), msgs),
118-
const zmq::error_t &);
118+
zmq::error_t);
119119
}
120120
}
121121
#endif

‎tests/socket.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ TEST_CASE("socket options", "[socket]")
5858
socket.set(zmq::sockopt::immediate, false);
5959
CHECK(socket.get(zmq::sockopt::immediate) == false);
6060
// unit out of range
61-
CHECK_THROWS_AS(socket.set(zmq::sockopt::immediate, 80), const zmq::error_t &);
61+
CHECK_THROWS_AS(socket.set(zmq::sockopt::immediate, 80), zmq::error_t);
6262
#endif
6363
#ifdef ZMQ_LINGER
6464
socket.set(zmq::sockopt::linger, 55);
@@ -83,7 +83,7 @@ TEST_CASE("socket options", "[socket]")
8383
std::string id_ret_small(3, ' ');
8484
// truncated
8585
CHECK_THROWS_AS(socket.get(zmq::sockopt::routing_id, zmq::buffer(id_ret_small)),
86-
const zmq::error_t &);
86+
zmq::error_t);
8787
#endif
8888
}
8989

@@ -543,7 +543,7 @@ TEST_CASE("socket send exception", "[socket]")
543543
s.bind("inproc://test");
544544

545545
std::vector<char> buf(4);
546-
CHECK_THROWS_AS(s.send(zmq::buffer(buf)), const zmq::error_t &);
546+
CHECK_THROWS_AS(s.send(zmq::buffer(buf)), zmq::error_t);
547547
}
548548

549549
TEST_CASE("socket recv none", "[socket]")
@@ -631,7 +631,7 @@ TEST_CASE("socket recv dontwait", "[socket]")
631631
zmq::message_t msg;
632632
auto resm = s.recv(msg, flags);
633633
CHECK(!resm);
634-
CHECK_THROWS_AS(resm.value(), const std::exception &);
634+
CHECK_THROWS_AS(resm.value(), std::exception);
635635
CHECK(msg.size() == 0);
636636
}
637637

@@ -642,7 +642,7 @@ TEST_CASE("socket recv exception", "[socket]")
642642
s.bind("inproc://test");
643643

644644
std::vector<char> buf(4);
645-
CHECK_THROWS_AS(s.recv(zmq::buffer(buf)), const zmq::error_t &);
645+
CHECK_THROWS_AS(s.recv(zmq::buffer(buf)), zmq::error_t);
646646
}
647647

648648
TEST_CASE("socket proxy", "[socket]")

0 commit comments

Comments
 (0)