From c06db7d9c5a796a54f7f073ae97b1a796a77676c Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 22 Apr 2017 12:58:14 +0200
Subject: [PATCH] SDK: Fix unit tests

---
 tests/SDK/NDK/BaseSystem.cpp  |  4 ++--
 tests/SDK/NDK/Entity.cpp      | 12 ++++++------
 tests/SDK/NDK/EntityOwner.cpp |  6 +++---
 tests/SDK/NDK/World.cpp       |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/SDK/NDK/BaseSystem.cpp b/tests/SDK/NDK/BaseSystem.cpp
index a202c1f70..3bb0fa9e4 100644
--- a/tests/SDK/NDK/BaseSystem.cpp
+++ b/tests/SDK/NDK/BaseSystem.cpp
@@ -38,7 +38,7 @@ SCENARIO("BaseSystem", "[NDK][BASESYSTEM]")
 
 		WHEN("We add an entity")
 		{
-			const Ndk::EntityHandle& entity = world.CreateEntity();
+			Ndk::EntityHandle entity = world.CreateEntity();
 			entity->AddComponent<Ndk::VelocityComponent>();
 
 			THEN("System should have it")
@@ -50,7 +50,7 @@ SCENARIO("BaseSystem", "[NDK][BASESYSTEM]")
 
 		WHEN("We add an entity with excluded component")
 		{
-			const Ndk::EntityHandle& entity = world.CreateEntity();
+			Ndk::EntityHandle entity = world.CreateEntity();
 			entity->AddComponent<Ndk::VelocityComponent>();
 			entity->AddComponent<Ndk::NodeComponent>();
 
diff --git a/tests/SDK/NDK/Entity.cpp b/tests/SDK/NDK/Entity.cpp
index cf02370ec..dd3216fb0 100644
--- a/tests/SDK/NDK/Entity.cpp
+++ b/tests/SDK/NDK/Entity.cpp
@@ -57,18 +57,18 @@ SCENARIO("Entity", "[NDK][ENTITY]")
 	{
 		Ndk::World world;
 		Ndk::BaseSystem& system = world.AddSystem<UpdateSystem>();
-		const Ndk::EntityHandle& entity = world.CreateEntity();
+		Ndk::EntityHandle entity = world.CreateEntity();
 
 		WHEN("We add our UpdateComponent")
 		{
 			UpdatableComponent& updatableComponent = entity->AddComponent<UpdatableComponent>();
-			REQUIRE(!updatableComponent.IsUpdated());
+			CHECK(!updatableComponent.IsUpdated());
 
 			THEN("Update the world should update the entity's component")
 			{
 				world.Update(1.f);
 				UpdatableComponent& updatableComponentGet = entity->GetComponent<UpdatableComponent>();
-				REQUIRE(updatableComponentGet.IsUpdated());
+				CHECK(updatableComponentGet.IsUpdated());
 			}
 
 			THEN("Update the world should not update the entity's component if it's disabled")
@@ -76,14 +76,14 @@ SCENARIO("Entity", "[NDK][ENTITY]")
 				entity->Enable(false);
 				world.Update(1.f);
 				UpdatableComponent& updatableComponentGet = entity->GetComponent<UpdatableComponent>();
-				REQUIRE(!updatableComponentGet.IsUpdated());
+				CHECK(!updatableComponentGet.IsUpdated());
 			}
 
 			THEN("We can remove its component")
 			{
 				entity->RemoveComponent(Ndk::GetComponentIndex<UpdatableComponent>());
 				world.Update(1.f);
-				REQUIRE(!entity->HasComponent<UpdatableComponent>());
+				CHECK(!entity->HasComponent<UpdatableComponent>());
 			}
 		}
 
@@ -94,7 +94,7 @@ SCENARIO("Entity", "[NDK][ENTITY]")
 
 			THEN("It's no more valid")
 			{
-				REQUIRE(!world.IsEntityValid(entity));
+				CHECK(!world.IsEntityValid(entity));
 			}
 		}
 	}
diff --git a/tests/SDK/NDK/EntityOwner.cpp b/tests/SDK/NDK/EntityOwner.cpp
index eb9a29edf..df5130c2a 100644
--- a/tests/SDK/NDK/EntityOwner.cpp
+++ b/tests/SDK/NDK/EntityOwner.cpp
@@ -7,7 +7,7 @@ SCENARIO("EntityOwner", "[NDK][ENTITYOWNER]")
 	GIVEN("A world & an entity")
 	{
 		Ndk::World world;
-		const Ndk::EntityHandle& entity = world.CreateEntity();
+		Ndk::EntityHandle entity = world.CreateEntity();
 
 		WHEN("We set the ownership of the entity to our owner")
 		{
@@ -15,14 +15,14 @@ SCENARIO("EntityOwner", "[NDK][ENTITYOWNER]")
 
 			THEN("Entity is still valid")
 			{
-				REQUIRE(entity.IsValid());
+				CHECK(entity.IsValid());
 			}
 
 			THEN("Resetting or getting out of scope is no more valid")
 			{
 				entityOwner.Reset();
 				world.Update(1.f);
-				REQUIRE(!entity.IsValid());
+				CHECK(!entity.IsValid());
 			}
 		}
 	}
diff --git a/tests/SDK/NDK/World.cpp b/tests/SDK/NDK/World.cpp
index 85ee241b4..d46b6621b 100644
--- a/tests/SDK/NDK/World.cpp
+++ b/tests/SDK/NDK/World.cpp
@@ -79,7 +79,7 @@ SCENARIO("World", "[NDK][WORLD]")
 		AND_WHEN("We update our world with our entity")
 		{
 			REQUIRE(&world.GetSystem(UpdateSystem::systemIndex) == &world.GetSystem<UpdateSystem>());
-			const Ndk::EntityHandle& entity = world.CreateEntity();
+			Ndk::EntityHandle entity = world.CreateEntity();
 			UpdatableComponent& component = entity->AddComponent<UpdatableComponent>();
 
 			THEN("Our entity component must be updated")