UnitTests: Choose a random port when testing

Former-commit-id: ce4e1c4b2b65327917bd0cf14b91102bfdab6327 [formerly e4390f995cb6ccb2c5e3b81a56acf0563d8d2679] [formerly a813d71a45dc17042129a31a8537b35ffaf93120 [formerly 683e75adf03f84ce2dc2454b4c22c2a20ca31668]]
Former-commit-id: 65fe6b63137fc3a55439d3ec777147ab51ed259a [formerly 310169d28ca078fdf76307bbf9f0a653c3c85d42]
Former-commit-id: fc03da2c66e08f6d349b5eedae057c5ab371ad9e
This commit is contained in:
Lynix 2016-10-07 15:23:08 +02:00
parent 254f6fc4f9
commit 03e31af828
4 changed files with 20 additions and 10 deletions

View File

@ -40,7 +40,7 @@ SCENARIO("IpAddress", "[NETWORK][IPADDRESS]")
Nz::IpAddress google(8, 8, 8, 8); Nz::IpAddress google(8, 8, 8, 8);
THEN("Google (DNS) is 8.8.8.8") THEN("Google (DNS) is 8.8.8.8")
{ {
REQUIRE(Nz::IpAddress::ResolveAddress(google) == "google-public-dns-a.google.com"); REQUIRE(Nz::IpAddress::ResolveAddress(google) == "google-public-dns-a.google.com");
} }
} }
} }

View File

@ -1,16 +1,19 @@
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Network/NetPacket.hpp>
#include <Nazara/Network/SocketPoller.hpp> #include <Nazara/Network/SocketPoller.hpp>
#include <Nazara/Network/TcpClient.hpp> #include <Nazara/Network/TcpClient.hpp>
#include <Nazara/Network/TcpServer.hpp> #include <Nazara/Network/TcpServer.hpp>
#include <Catch/catch.hpp> #include <Catch/catch.hpp>
#include <random>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Network/NetPacket.hpp>
SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]") SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]")
{ {
GIVEN("A TcpServer and a TcpClient in a selector") GIVEN("A TcpServer and a TcpClient in a selector")
{ {
Nz::UInt16 port = 25664; std::random_device rd;
std::uniform_int_distribution<Nz::UInt16> dis(1025, 65535);
Nz::UInt16 port = dis(rd);
Nz::TcpServer server; Nz::TcpServer server;
server.EnableBlocking(false); server.EnableBlocking(false);

View File

@ -11,7 +11,10 @@ SCENARIO("TCP", "[NETWORK][TCP]")
{ {
GIVEN("Two TCP, one client, one server") GIVEN("Two TCP, one client, one server")
{ {
Nz::UInt16 port = 26456; std::random_device rd;
std::uniform_int_distribution<Nz::UInt16> dis(1025, 65535);
Nz::UInt16 port = dis(rd);
Nz::TcpServer server; Nz::TcpServer server;
server.EnableBlocking(false); server.EnableBlocking(false);

View File

@ -1,14 +1,17 @@
#include <Nazara/Network/UdpSocket.hpp>
#include <Catch/catch.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>
#include <Nazara/Network/UdpSocket.hpp>
#include <Nazara/Network/NetPacket.hpp> #include <Nazara/Network/NetPacket.hpp>
#include <Catch/catch.hpp>
#include <random>
SCENARIO("UdpSocket", "[NETWORK][UDPSOCKET]") SCENARIO("UdpSocket", "[NETWORK][UDPSOCKET]")
{ {
GIVEN("Two UdpSocket, one client, one server") GIVEN("Two UdpSocket, one client, one server")
{ {
Nz::UInt16 port = 64256; std::random_device rd;
std::uniform_int_distribution<Nz::UInt16> dis(1025, 65535);
Nz::UInt16 port = dis(rd);
Nz::UdpSocket server(Nz::NetProtocol_IPv4); Nz::UdpSocket server(Nz::NetProtocol_IPv4);
REQUIRE(server.Bind(port) == Nz::SocketState_Bound); REQUIRE(server.Bind(port) == Nz::SocketState_Bound);
@ -33,6 +36,7 @@ SCENARIO("UdpSocket", "[NETWORK][UDPSOCKET]")
Nz::NetPacket resultPacket; Nz::NetPacket resultPacket;
Nz::IpAddress fromIp; Nz::IpAddress fromIp;
REQUIRE(server.ReceivePacket(&resultPacket, &fromIp)); REQUIRE(server.ReceivePacket(&resultPacket, &fromIp));
Nz::Vector3f result; Nz::Vector3f result;
resultPacket >> result; resultPacket >> result;
REQUIRE(result == vector123); REQUIRE(result == vector123);