From 2658ac271376142fe3fbf13971b994f607ba055c Mon Sep 17 00:00:00 2001
From: Mateusz Szczygielski <112629916+msz-rai@users.noreply.github.com>
Date: Wed, 29 Mar 2023 21:23:31 +0100
Subject: [PATCH] Make v13 build and pass tests on Windows (#123)

* Fix subStr to work on Linux & Windows

* Disable loggingTests on Windows (incorrect linking)

* Fix whitespaces
---
 test/CMakeLists.txt          |  2 +-
 test/src/apiSurfaceTests.cpp | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2d4de839..eb23667c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,6 @@ set(RGL_TEST_FILES
         src/apiReadmeExample.cpp
         src/gaussianStressTest.cpp
         src/apiSurfaceTests.cpp
-        src/loggingTests.cpp
         #    src/features/range.cpp
         #    src/features/mesh.cpp
         #    src/features/transforms.cpp
@@ -19,6 +18,7 @@ set(RGL_TEST_FILES
 # Only Linux
 if ((NOT WIN32))
     list(APPEND RGL_TEST_FILES
+        src/loggingTests.cpp
         src/VArrayTest.cpp
     )
 endif()
diff --git a/test/src/apiSurfaceTests.cpp b/test/src/apiSurfaceTests.cpp
index 1d1dd96f..28bb12a4 100644
--- a/test/src/apiSurfaceTests.cpp
+++ b/test/src/apiSurfaceTests.cpp
@@ -48,11 +48,11 @@ TEST_F(APISurfaceTests, rgl_mesh_create_destroy)
 	ASSERT_RGL_SUCCESS(rgl_mesh_destroy(mesh));
 
 	// Double destroy
-	EXPECT_RGL_INVALID_OBJECT(rgl_mesh_destroy(mesh), "Object does not exist: Mesh");
+	EXPECT_RGL_INVALID_OBJECT(rgl_mesh_destroy(mesh), "Mesh");
 
 	// Invalid destroy
 	EXPECT_RGL_INVALID_ARGUMENT(rgl_mesh_destroy(nullptr), "mesh != nullptr");
-	EXPECT_RGL_INVALID_OBJECT(rgl_mesh_destroy((rgl_mesh_t) 0x1234), "Object does not exist: Mesh 0x1234");
+	EXPECT_RGL_INVALID_OBJECT(rgl_mesh_destroy((rgl_mesh_t) 0x1234), "Mesh 0x1234");
 }
 
 TEST_F(APISurfaceTests, rgl_mesh_update_vertices)
@@ -66,7 +66,7 @@ TEST_F(APISurfaceTests, rgl_mesh_update_vertices)
 	EXPECT_RGL_INVALID_ARGUMENT(rgl_mesh_update_vertices(mesh, VERTICES, ARRAY_SIZE(VERTICES) + 1),
 	                            "vertex counts do not match");
 	EXPECT_RGL_INVALID_OBJECT(rgl_mesh_update_vertices((rgl_mesh_t) 0x1234, VERTICES, ARRAY_SIZE(VERTICES)),
-	                          "Object does not exist: Mesh 0x1234");
+	                          "Mesh 0x1234");
 
 	// Correct update_vertices
 	EXPECT_RGL_SUCCESS(rgl_mesh_update_vertices(mesh, VERTICES, ARRAY_SIZE(VERTICES)));
@@ -80,8 +80,8 @@ TEST_F(APISurfaceTests, rgl_entity_create_destroy)
 	// Invalid args, note: scene can be nullptr here.
 	EXPECT_RGL_INVALID_ARGUMENT(rgl_entity_create(nullptr, nullptr, nullptr), "entity != nullptr");
 	EXPECT_RGL_INVALID_ARGUMENT(rgl_entity_create(&entity, nullptr, nullptr), "mesh != nullptr");
-	EXPECT_RGL_INVALID_OBJECT(rgl_entity_create(&entity, (rgl_scene_t) 0x1234, mesh), "Object does not exist: Scene 0x1234");
-	EXPECT_RGL_INVALID_OBJECT(rgl_entity_create(&entity, nullptr, (rgl_mesh_t) 0x1234), "Object does not exist: Mesh 0x1234");
+	EXPECT_RGL_INVALID_OBJECT(rgl_entity_create(&entity, (rgl_scene_t) 0x1234, mesh), "Scene 0x1234");
+	EXPECT_RGL_INVALID_OBJECT(rgl_entity_create(&entity, nullptr, (rgl_mesh_t) 0x1234), "Mesh 0x1234");
 
 	// Correct create
 	ASSERT_RGL_SUCCESS(rgl_entity_create(&entity, nullptr, mesh));
@@ -91,11 +91,11 @@ TEST_F(APISurfaceTests, rgl_entity_create_destroy)
 	ASSERT_RGL_SUCCESS(rgl_entity_destroy(entity));
 
 	// Double destroy
-	EXPECT_RGL_INVALID_OBJECT(rgl_entity_destroy(entity), "Object does not exist: Entity");
+	EXPECT_RGL_INVALID_OBJECT(rgl_entity_destroy(entity), "Entity");
 
 	// Invalid destroy
 	EXPECT_RGL_INVALID_ARGUMENT(rgl_entity_destroy(nullptr), "entity != nullptr");
-	EXPECT_RGL_INVALID_OBJECT(rgl_entity_destroy((rgl_entity_t) 0x1234), "Object does not exist: Entity 0x1234");
+	EXPECT_RGL_INVALID_OBJECT(rgl_entity_destroy((rgl_entity_t) 0x1234), "Entity 0x1234");
 }
 
 TEST_F(APISurfaceTests, rgl_entity_set_pose)
@@ -105,7 +105,7 @@ TEST_F(APISurfaceTests, rgl_entity_set_pose)
 	// Invalid args
 	EXPECT_RGL_INVALID_ARGUMENT(rgl_entity_set_pose(nullptr, nullptr), "entity != nullptr");
 	EXPECT_RGL_INVALID_ARGUMENT(rgl_entity_set_pose(entity, nullptr), "transform != nullptr");
-	EXPECT_RGL_INVALID_OBJECT(rgl_entity_set_pose((rgl_entity_t) 0x1234, &identityTestTransform), "Object does not exist: Entity 0x1234");
+	EXPECT_RGL_INVALID_OBJECT(rgl_entity_set_pose((rgl_entity_t) 0x1234, &identityTestTransform), "Entity 0x1234");
 
 	// Correct set_pose
 	EXPECT_RGL_SUCCESS(rgl_entity_set_pose(entity, &identityTestTransform));