Commit 06caf345 authored by Dominik Charousset's avatar Dominik Charousset

Fix unit tests on Windows

parent 50fee462
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/detail/convert_ip_endpoint.hpp" #include "caf/detail/convert_ip_endpoint.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include <cstring> #include <cstring>
#include "caf/detail/socket_sys_includes.hpp" #include "caf/detail/socket_sys_includes.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/endpoint_manager.hpp" #include "caf/net/endpoint_manager.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/byte.hpp" #include "caf/byte.hpp"
#include "caf/detail/scope_guard.hpp" #include "caf/detail/scope_guard.hpp"
#include "caf/make_actor.hpp" #include "caf/make_actor.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/ip.hpp" #include "caf/net/ip.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/ip_address.hpp" #include "caf/ip_address.hpp"
#include "caf/ipv4_address.hpp" #include "caf/ipv4_address.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/multiplexer.hpp" #include "caf/net/multiplexer.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include <new> #include <new>
#include <tuple> #include <tuple>
#include <vector> #include <vector>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#define CAF_SUITE net.basp.ping_pong #define CAF_SUITE net.basp.ping_pong
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "caf/net/backend/test.hpp" #include "caf/net/backend/test.hpp"
...@@ -152,7 +153,7 @@ behavior pong_actor(event_based_actor* self) { ...@@ -152,7 +153,7 @@ behavior pong_actor(event_based_actor* self) {
}; };
} }
struct fixture : planet_driver { struct fixture : host_fixture, planet_driver {
fixture() : earth(*this), mars(*this) { fixture() : earth(*this), mars(*this) {
auto sockets = unbox(make_stream_socket_pair()); auto sockets = unbox(make_stream_socket_pair());
earth.backend().emplace(mars.id(), sockets.first, sockets.second); earth.backend().emplace(mars.id(), sockets.first, sockets.second);
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/network_socket.hpp" #include "caf/net/network_socket.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
using namespace caf; using namespace caf;
using namespace caf::net; using namespace caf::net;
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/pipe_socket.hpp" #include "caf/net/pipe_socket.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include <vector> #include <vector>
#include "caf/byte.hpp" #include "caf/byte.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/socket.hpp" #include "caf/net/socket.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
using namespace caf; using namespace caf;
using namespace caf::net; using namespace caf::net;
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/basp/application.hpp" #include "caf/net/basp/application.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include <vector> #include <vector>
#include "caf/byte.hpp" #include "caf/byte.hpp"
...@@ -68,7 +67,7 @@ struct config : actor_system_config { ...@@ -68,7 +67,7 @@ struct config : actor_system_config {
} }
}; };
struct fixture : test_coordinator_fixture<config>, host_fixture { struct fixture : host_fixture, test_coordinator_fixture<config> {
fixture() : mars(make_node_id(unbox(make_uri("test:mars")))) { fixture() : mars(make_node_id(unbox(make_uri("test:mars")))) {
auto& mm = sys.network_manager(); auto& mm = sys.network_manager();
mm.mpx()->set_thread_id(); mm.mpx()->set_thread_id();
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/stream_socket.hpp" #include "caf/net/stream_socket.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/byte.hpp" #include "caf/byte.hpp"
#include "caf/span.hpp" #include "caf/span.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/stream_transport.hpp" #include "caf/net/stream_transport.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/binary_deserializer.hpp" #include "caf/binary_deserializer.hpp"
#include "caf/byte.hpp" #include "caf/byte.hpp"
#include "caf/detail/scope_guard.hpp" #include "caf/detail/scope_guard.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/stream_transport.hpp" #include "caf/net/stream_transport.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include <vector> #include <vector>
#include "caf/binary_deserializer.hpp" #include "caf/binary_deserializer.hpp"
......
...@@ -21,10 +21,9 @@ ...@@ -21,10 +21,9 @@
#include "caf/net/tcp_accept_socket.hpp" #include "caf/net/tcp_accept_socket.hpp"
#include "caf/net/tcp_stream_socket.hpp" #include "caf/net/tcp_stream_socket.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/net/socket_guard.hpp" #include "caf/net/socket_guard.hpp"
using namespace caf; using namespace caf;
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/transport_worker.hpp" #include "caf/net/transport_worker.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/byte.hpp" #include "caf/byte.hpp"
#include "caf/detail/scope_guard.hpp" #include "caf/detail/scope_guard.hpp"
#include "caf/make_actor.hpp" #include "caf/make_actor.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/transport_worker_dispatcher.hpp" #include "caf/net/transport_worker_dispatcher.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/make_actor.hpp" #include "caf/make_actor.hpp"
#include "caf/monitorable_actor.hpp" #include "caf/monitorable_actor.hpp"
#include "caf/node_id.hpp" #include "caf/node_id.hpp"
......
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#include "caf/net/udp_datagram_socket.hpp" #include "caf/net/udp_datagram_socket.hpp"
#include "caf/net/test/host_fixture.hpp"
#include "caf/test/dsl.hpp" #include "caf/test/dsl.hpp"
#include "host_fixture.hpp"
#include "caf/detail/net_syscall.hpp" #include "caf/detail/net_syscall.hpp"
#include "caf/detail/socket_sys_includes.hpp" #include "caf/detail/socket_sys_includes.hpp"
#include "caf/ip_address.hpp" #include "caf/ip_address.hpp"
......
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