Unverified Commit ec747960 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #1487

Use the Canonical Project Structure for caf_io
parents 2a94cd33 e2924ace
...@@ -352,6 +352,9 @@ function(caf_add_component name) ...@@ -352,6 +352,9 @@ function(caf_add_component name)
$<TARGET_OBJECTS:${obj_lib_target}>) $<TARGET_OBJECTS:${obj_lib_target}>)
target_link_libraries(${test_name} PRIVATE libcaf_test target_link_libraries(${test_name} PRIVATE libcaf_test
${CAF_ADD_COMPONENT_DEPENDENCIES}) ${CAF_ADD_COMPONENT_DEPENDENCIES})
target_include_directories(${test_name} PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}")
add_test(NAME ${test_name} COMMAND ${test_name}) add_test(NAME ${test_name} COMMAND ${test_name})
endif() endif()
endforeach() endforeach()
......
...@@ -18,50 +18,47 @@ caf_add_component( ...@@ -18,50 +18,47 @@ caf_add_component(
HEADERS HEADERS
${CAF_IO_HEADERS} ${CAF_IO_HEADERS}
SOURCES SOURCES
src/detail/prometheus_broker.cpp caf/detail/prometheus_broker.cpp
src/detail/remote_group_module.cpp caf/detail/remote_group_module.cpp
src/detail/socket_guard.cpp caf/detail/socket_guard.cpp
src/io/abstract_broker.cpp caf/io/abstract_broker.cpp
src/io/basp/header.cpp caf/io/basp/header.cpp
src/io/basp/instance.cpp caf/io/basp/instance.cpp
src/io/basp/message_queue.cpp caf/io/basp/message_queue.cpp
src/io/basp/routing_table.cpp caf/io/basp/routing_table.cpp
src/io/basp/worker.cpp caf/io/basp/worker.cpp
src/io/basp_broker.cpp caf/io/basp_broker.cpp
src/io/broker.cpp caf/io/broker.cpp
src/io/connection_helper.cpp caf/io/connection_helper.cpp
src/io/datagram_servant.cpp caf/io/datagram_servant.cpp
src/io/doorman.cpp caf/io/doorman.cpp
src/io/middleman.cpp caf/io/middleman.cpp
src/io/middleman_actor.cpp caf/io/middleman_actor.cpp
src/io/middleman_actor_impl.cpp caf/io/middleman_actor_impl.cpp
src/io/network/acceptor.cpp caf/io/network/acceptor.cpp
src/io/network/acceptor_manager.cpp caf/io/network/acceptor_manager.cpp
src/io/network/datagram_handler.cpp caf/io/network/datagram_handler.cpp
src/io/network/datagram_manager.cpp caf/io/network/datagram_manager.cpp
src/io/network/datagram_servant_impl.cpp caf/io/network/datagram_servant_impl.cpp
src/io/network/default_multiplexer.cpp caf/io/network/default_multiplexer.cpp
src/io/network/doorman_impl.cpp caf/io/network/doorman_impl.cpp
src/io/network/event_handler.cpp caf/io/network/event_handler.cpp
src/io/network/interfaces.cpp caf/io/network/interfaces.cpp
src/io/network/ip_endpoint.cpp caf/io/network/ip_endpoint.cpp
src/io/network/manager.cpp caf/io/network/manager.cpp
src/io/network/multiplexer.cpp caf/io/network/multiplexer.cpp
src/io/network/native_socket.cpp caf/io/network/native_socket.cpp
src/io/network/pipe_reader.cpp caf/io/network/pipe_reader.cpp
src/io/network/protocol.cpp caf/io/network/protocol.cpp
src/io/network/receive_buffer.cpp caf/io/network/receive_buffer.cpp
src/io/network/scribe_impl.cpp caf/io/network/receive_buffer.test.cpp
src/io/network/stream.cpp caf/io/network/scribe_impl.cpp
src/io/network/stream_manager.cpp caf/io/network/stream.cpp
src/io/network/test_multiplexer.cpp caf/io/network/stream_manager.cpp
src/io/scribe.cpp caf/io/network/test_multiplexer.cpp
src/policy/tcp.cpp caf/io/scribe.cpp
src/policy/udp.cpp caf/policy/tcp.cpp
TEST_SOURCES caf/policy/udp.cpp
test/io-test.cpp
TEST_SUITES
io.network.receive_buffer
LEGACY_TEST_SOURCES LEGACY_TEST_SOURCES
test/io-legacy-test.cpp test/io-legacy-test.cpp
LEGACY_TEST_SUITES LEGACY_TEST_SUITES
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "caf/io/network/receive_buffer.hpp" #include "caf/io/network/receive_buffer.hpp"
#include "caf/test/caf_test_main.hpp"
#include "caf/test/test.hpp" #include "caf/test/test.hpp"
#include <algorithm> #include <algorithm>
...@@ -13,8 +14,6 @@ using namespace std::literals; ...@@ -13,8 +14,6 @@ using namespace std::literals;
using caf::io::network::receive_buffer; using caf::io::network::receive_buffer;
SUITE("io.network.receive_buffer") {
TEST("construction") { TEST("construction") {
SECTION("default-constructed buffers are empty") { SECTION("default-constructed buffers are empty") {
receive_buffer uut; receive_buffer uut;
...@@ -176,4 +175,4 @@ TEST("swap exchanges the content of two buffers") { ...@@ -176,4 +175,4 @@ TEST("swap exchanges the content of two buffers") {
check(buf2.data() == buf1_data); check(buf2.data() == buf1_data);
} }
} // SUITE("io.network.receive_buffer") CAF_TEST_MAIN()
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