Fix some tests on running on Windows

msz-rai · msz-rai · commit fd07ecd2dc0b · 2024-03-26T18:29:26.000+01:00
diff --git a/test/src/graph/nodes/CompactByFieldPointsNodeTest.cpp b/test/src/graph/nodes/CompactByFieldPointsNodeTest.cpp
@@ -68,7 +68,7 @@ TEST_F(CompactByFieldPointsNodeTest, valid_argument_node_is_not_nullptr)
 TEST_F(CompactByFieldPointsNodeTest, invalid_pipeline_when_no_input_node)
 {
 	ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactByFieldPointsNode, IS_HIT_I32));
-	EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for IPointsNode");
+	EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for", "IPointsNode");
 }
 
 TEST_F(CompactByFieldPointsNodeTest, invalid_pipeline_when_incorrect_input_node)
@@ -80,7 +80,7 @@ TEST_F(CompactByFieldPointsNodeTest, invalid_pipeline_when_incorrect_input_node)
 
 	ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactByFieldPointsNode, IS_HIT_I32));
 	ASSERT_RGL_SUCCESS(rgl_graph_node_add_child(useRaysNode, compactByFieldPointsNode));
-	EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for IPointsNode");
+	EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for", "IPointsNode");
 }
 
 TEST_P(CompactByFieldPointsNodeTest, points_all_non_hit)
diff --git a/test/src/graph/nodes/RaytraceNodeTest.cpp b/test/src/graph/nodes/RaytraceNodeTest.cpp
@@ -58,7 +58,7 @@ TEST_F(RaytraceNodeTest, config_velocity_invalid_node_object)
 	const rgl_vec3f linearVelocity = {1.0f, 2.0f, 3.0f};
 	const rgl_vec3f angularVelocity = {4.0f, 5.0f, 6.0f};
 	EXPECT_RGL_INVALID_OBJECT(rgl_node_raytrace_configure_velocity((rgl_node_t) 0x1234, &linearVelocity, &angularVelocity),
-	                          "Object does not exist: Node 0x1234");
+	                          "Object does not exist: ", "Node 0x1234");
 }
 
 TEST_F(RaytraceNodeTest, config_velocity_valid_arguments)
@@ -78,7 +78,7 @@ TEST_F(RaytraceNodeTest, config_distortion_invalid_argument_node)
 TEST_F(RaytraceNodeTest, config_distortion_invalid_node_object)
 {
 	EXPECT_RGL_INVALID_OBJECT(rgl_node_raytrace_configure_distortion((rgl_node_t) 0x1234, false),
-	                          "Object does not exist: Node 0x1234");
+	                          "Object does not exist: ", "Node 0x1234");
 }
 
 TEST_F(RaytraceNodeTest, config_distortion_valid_arguments)
@@ -96,7 +96,7 @@ TEST_F(RaytraceNodeTest, config_non_hit_distance_invalid_argument_node)
 TEST_F(RaytraceNodeTest, config_non_hit_distance_invalid_node_object)
 {
 	EXPECT_RGL_INVALID_OBJECT(rgl_node_raytrace_configure_non_hits((rgl_node_t) 0x1234, 0.0f, 0.0f),
-	                          "Object does not exist: Node 0x1234");
+	                          "Object does not exist: ", "Node 0x1234");
 }
 
 TEST_F(RaytraceNodeTest, config_non_hit_distance_valid_arguments)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ TEST_F(CompactByFieldPointsNodeTest, valid_argument_node_is_not_nullptr)`
`68`	`68`	`TEST_F(CompactByFieldPointsNodeTest, invalid_pipeline_when_no_input_node)`
`69`	`69`	`{`
`70`	`70`	`ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactByFieldPointsNode, IS_HIT_I32));`
`71`		`- EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for IPointsNode");`
	`71`	`+ EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for", "IPointsNode");`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`TEST_F(CompactByFieldPointsNodeTest, invalid_pipeline_when_incorrect_input_node)`
`@@ -80,7 +80,7 @@ TEST_F(CompactByFieldPointsNodeTest, invalid_pipeline_when_incorrect_input_node)`
`80`	`80`
`81`	`81`	`ASSERT_RGL_SUCCESS(rgl_node_points_compact_by_field(&compactByFieldPointsNode, IS_HIT_I32));`
`82`	`82`	`ASSERT_RGL_SUCCESS(rgl_graph_node_add_child(useRaysNode, compactByFieldPointsNode));`
`83`		`- EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for IPointsNode");`
	`83`	`+ EXPECT_RGL_INVALID_PIPELINE(rgl_graph_run(compactByFieldPointsNode), "looked for", "IPointsNode");`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`TEST_P(CompactByFieldPointsNodeTest, points_all_non_hit)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ TEST_F(RaytraceNodeTest, config_velocity_invalid_node_object)`
`58`	`58`	`const rgl_vec3f linearVelocity = {1.0f, 2.0f, 3.0f};`
`59`	`59`	`const rgl_vec3f angularVelocity = {4.0f, 5.0f, 6.0f};`
`60`	`60`	`EXPECT_RGL_INVALID_OBJECT(rgl_node_raytrace_configure_velocity((rgl_node_t) 0x1234, &linearVelocity, &angularVelocity),`
`61`		`- "Object does not exist: Node 0x1234");`
	`61`	`+ "Object does not exist: ", "Node 0x1234");`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`TEST_F(RaytraceNodeTest, config_velocity_valid_arguments)`
`@@ -78,7 +78,7 @@ TEST_F(RaytraceNodeTest, config_distortion_invalid_argument_node)`
`78`	`78`	`TEST_F(RaytraceNodeTest, config_distortion_invalid_node_object)`
`79`	`79`	`{`
`80`	`80`	`EXPECT_RGL_INVALID_OBJECT(rgl_node_raytrace_configure_distortion((rgl_node_t) 0x1234, false),`
`81`		`- "Object does not exist: Node 0x1234");`
	`81`	`+ "Object does not exist: ", "Node 0x1234");`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`TEST_F(RaytraceNodeTest, config_distortion_valid_arguments)`
`@@ -96,7 +96,7 @@ TEST_F(RaytraceNodeTest, config_non_hit_distance_invalid_argument_node)`
`96`	`96`	`TEST_F(RaytraceNodeTest, config_non_hit_distance_invalid_node_object)`
`97`	`97`	`{`
`98`	`98`	`EXPECT_RGL_INVALID_OBJECT(rgl_node_raytrace_configure_non_hits((rgl_node_t) 0x1234, 0.0f, 0.0f),`
`99`		`- "Object does not exist: Node 0x1234");`
	`99`	`+ "Object does not exist: ", "Node 0x1234");`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`TEST_F(RaytraceNodeTest, config_non_hit_distance_valid_arguments)`