From 3a50c1e553e3c8a97e281030c48fd8f73efae548 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 29 Jul 2016 13:38:00 +0200 Subject: [PATCH] UnitTests: Fix blocking case Former-commit-id: b504a619172a7c4c57d07d168fe4ae33bbd98210 [formerly 054c9b2c1261c438b74722be9f345417e64f3611] Former-commit-id: 498b99790dc187ace705a57cd9fdcec43ac1345d --- tests/Engine/Graphics/Model.cpp | 5 ++++- tests/Engine/Network/TCP.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/Engine/Graphics/Model.cpp b/tests/Engine/Graphics/Model.cpp index d67a261bb..b363a0be2 100644 --- a/tests/Engine/Graphics/Model.cpp +++ b/tests/Engine/Graphics/Model.cpp @@ -9,8 +9,11 @@ SCENARIO("Model", "[GRAPHICS][MODEL]") { THEN("These results are expected") { + Nz::ModelParameters params; + params.mesh.optimizeIndexBuffers = false; + Nz::ModelRef model = Nz::Model::New(); - REQUIRE(model->LoadFromFile("resources/Engine/Graphics/dragon_recon/dragon_vrip_res4.obj")); + REQUIRE(model->LoadFromFile("resources/Engine/Graphics/dragon_recon/dragon_vrip_res4.obj", params)); REQUIRE(model->GetMaterialCount() == 2); REQUIRE(model->GetSkin() == 0); diff --git a/tests/Engine/Network/TCP.cpp b/tests/Engine/Network/TCP.cpp index 63b4fe2df..a613cf0c6 100644 --- a/tests/Engine/Network/TCP.cpp +++ b/tests/Engine/Network/TCP.cpp @@ -18,6 +18,8 @@ SCENARIO("TCP", "[NETWORK][TCP]") Nz::UInt16 port = dis(gen); Nz::TcpServer server; + server.EnableBlocking(false); + REQUIRE(server.Listen(Nz::NetProtocol_IPv4, port) == Nz::SocketState_Bound); Nz::IpAddress serverIP = server.GetBoundAddress(); REQUIRE(serverIP.IsValid());