sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

This commit is contained in:
Lynix 2017-05-16 09:25:19 +02:00
parent d516b0907b 999cb13f00
commit 04d1d5f7d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Engine/Network/SocketPoller.cpp
View File

@ -27,7 +27,7 @@ SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]")
WHEN("We register the server socket to the poller") WHEN("We register the server socket to the poller")
{ {
REQUIRE(serverPoller.RegisterSocket(server)); REQUIRE(serverPoller.RegisterSocket(server, Nz::SocketPollEvent_Read));
THEN("The poller should have registered our socket") THEN("The poller should have registered our socket")
{ {
@ -48,7 +48,7 @@ SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]")
WHEN("We register the client socket to the poller") WHEN("We register the client socket to the poller")
{ {
REQUIRE(serverPoller.RegisterSocket(serverToClient)); REQUIRE(serverPoller.RegisterSocket(serverToClient, Nz::SocketPollEvent_Read));
THEN("The poller should have registered our socket") THEN("The poller should have registered our socket")
{ {
@ -65,7 +65,7 @@ SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]")
REQUIRE(serverPoller.Wait(1000)); REQUIRE(serverPoller.Wait(1000));
CHECK(serverPoller.IsReady(serverToClient)); CHECK(serverPoller.IsReadyToRead(serverToClient));
CHECK(serverToClient.Read(buffer.data(), buffer.size()) == sent); CHECK(serverToClient.Read(buffer.data(), buffer.size()) == sent);
@ -73,7 +73,7 @@ SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]")
{ {
REQUIRE_FALSE(serverPoller.Wait(100)); REQUIRE_FALSE(serverPoller.Wait(100));
REQUIRE_FALSE(serverPoller.IsReady(serverToClient)); REQUIRE_FALSE(serverPoller.IsReadyToRead(serverToClient));
} }
} }
} }