Commit c2adaf92 authored by Jakob Otto's avatar Jakob Otto

Include review feedback

parent d2968f71
......@@ -222,7 +222,7 @@ CAF_TEST(resolve and proxy communication) {
auto mgr_impl = mgr.downcast<endpoint_manager_impl<transport_type>>();
CAF_CHECK(mgr_impl != nullptr);
auto& transport = mgr_impl->transport();
CAF_CHECK(!transport.add_new_worker(make_node_id(uri), ep));
CAF_CHECK_EQUAL(transport.add_new_worker(make_node_id(uri), ep), none);
run();
mgr->resolve(uri, self);
run();
......
......@@ -163,7 +163,7 @@ CAF_TEST(send and receive) {
byte_buffer read_buf(1024);
auto buf = std::make_shared<byte_buffer>();
auto sockets = unbox(make_stream_socket_pair());
CAF_CHECK(!nonblocking(sockets.second, true));
CAF_CHECK_EQUAL(nonblocking(sockets.second, true), none);
CAF_CHECK_EQUAL(read(sockets.second, read_buf),
sec::unavailable_or_would_block);
auto guard = detail::make_scope_guard([&] { close(sockets.second); });
......@@ -189,7 +189,7 @@ CAF_TEST(resolve and proxy communication) {
byte_buffer read_buf(1024);
auto buf = std::make_shared<byte_buffer>();
auto sockets = unbox(make_stream_socket_pair());
CAF_CHECK(!nonblocking(sockets.second, true));
CAF_CHECK_EQUAL(nonblocking(sockets.second, true), none);
auto guard = detail::make_scope_guard([&] { close(sockets.second); });
auto mgr = make_endpoint_manager(mpx, sys,
dummy_transport{sockets.first, buf});
......
......@@ -207,7 +207,7 @@ CAF_TEST(receive) {
CAF_CHECK_EQUAL(mpx->num_socket_managers(), 1u);
auto buf = std::make_shared<byte_buffer>();
auto sockets = unbox(make_stream_socket_pair());
CAF_CHECK(!nonblocking(sockets.second, true));
CAF_CHECK_EQUAL(nonblocking(sockets.second, true), none);
CAF_CHECK_EQUAL(read(sockets.second, read_buf),
sec::unavailable_or_would_block);
CAF_MESSAGE("adding both endpoint managers");
......
......@@ -189,7 +189,7 @@ CAF_TEST(construction and initialization) {
CAF_TEST(handle_data) {
auto test_span = as_bytes(make_span(hello_test));
CAF_CHECK(!worker.handle_data(transport, test_span));
CAF_CHECK_EQUAL(worker.handle_data(transport, test_span), none);
auto& buf = application_results->data_buffer;
string_view result{reinterpret_cast<char*>(buf.data()), buf.size()};
CAF_CHECK_EQUAL(result, hello_test);
......@@ -209,7 +209,7 @@ CAF_TEST(write_message) {
auto& buf = transport_results->packet_buffer;
binary_deserializer source{sys, buf};
caf::message received_msg;
CAF_CHECK(!source(received_msg));
CAF_CHECK_EQUAL(source(received_msg), none);
CAF_MESSAGE(CAF_ARG(received_msg));
auto received_str = received_msg.get_as<std::string>(0);
string_view result{received_str};
......
......@@ -250,7 +250,8 @@ struct fixture : host_fixture {
};
#define CHECK_HANDLE_DATA(testcase) \
CAF_CHECK(!dispatcher.handle_data(dummy, span<const byte>{}, testcase.ep)); \
CAF_CHECK_EQUAL( \
dispatcher.handle_data(dummy, span<const byte>{}, testcase.ep), none); \
CAF_CHECK_EQUAL(buf->size(), 1u); \
CAF_CHECK_EQUAL(static_cast<byte>(testcase.worker_id), buf->at(0)); \
buf->clear();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment