4 files changed, 35 insertions, 19 deletions

diff --git a/tests/core/math/test_aabb.h b/tests/core/math/test_aabb.h
index b838bed171..f5076ce1ed 100644
--- a/tests/core/math/test_aabb.h
+++ b/tests/core/math/test_aabb.h
@@ -349,14 +349,27 @@ TEST_CASE("[AABB] Has point") {
 			aabb.has_point(Vector3(2, 3, 0)),
 			"has_point() with contained point should return the expected value.");
 	CHECK_MESSAGE(
+			!aabb.has_point(Vector3(-20, 0, 0)),
+			"has_point() with non-contained point should return the expected value.");
+
+	CHECK_MESSAGE(
 			aabb.has_point(Vector3(-1.5, 3, 0)),
-			"has_point() with contained point on negative edge should return the expected value.");
+			"has_point() with positive size should include point on near face (X axis).");
 	CHECK_MESSAGE(
 			aabb.has_point(Vector3(2.5, 3, 0)),
-			"has_point() with contained point on positive edge should return the expected value.");
+			"has_point() with positive size should include point on far face (X axis).");
 	CHECK_MESSAGE(
-			!aabb.has_point(Vector3(-20, 0, 0)),
-			"has_point() with non-contained point should return the expected value.");
+			aabb.has_point(Vector3(0, 2, 0)),
+			"has_point() with positive size should include point on near face (Y axis).");
+	CHECK_MESSAGE(
+			aabb.has_point(Vector3(0, 7, 0)),
+			"has_point() with positive size should include point on far face (Y axis).");
+	CHECK_MESSAGE(
+			aabb.has_point(Vector3(0, 3, -2.5)),
+			"has_point() with positive size should include point on near face (Z axis).");
+	CHECK_MESSAGE(
+			aabb.has_point(Vector3(0, 3, 3.5)),
+			"has_point() with positive size should include point on far face (Z axis).");
 }
 
 TEST_CASE("[AABB] Expanding") {
diff --git a/tests/core/templates/test_oa_hash_map.cpp b/tests/core/templates/test_oa_hash_map.cpp
index 904c01642d..f7b2b7cdb0 100644
--- a/tests/core/templates/test_oa_hash_map.cpp
+++ b/tests/core/templates/test_oa_hash_map.cpp
@@ -55,7 +55,10 @@ struct CountedItem {
 		count++;
 	}
 
-	CountedItem &operator=(const CountedItem &p_other) = default;
+	void operator=(const CountedItem &p_other) {
+		id = p_other.id;
+		count++;
+	}
 
 	~CountedItem() {
 		CRASH_COND(destroyed);
diff --git a/tests/scene/test_curve.h b/tests/scene/test_curve.h
index 60eafad460..4ee1a1c15c 100644
--- a/tests/scene/test_curve.h
+++ b/tests/scene/test_curve.h
@@ -219,35 +219,33 @@ TEST_CASE("[Curve] Custom curve with linear tangents") {
 
 TEST_CASE("[Curve2D] Linear sampling should return exact value") {
 	Ref<Curve2D> curve = memnew(Curve2D);
-	int len = 2048;
+	real_t len = 2048.0;
 
 	curve->add_point(Vector2(0, 0));
-	curve->add_point(Vector2((float)len, 0));
+	curve->add_point(Vector2(len, 0));
 
-	float baked_length = curve->get_baked_length();
-	CHECK((float)len == baked_length);
+	real_t baked_length = curve->get_baked_length();
+	CHECK(len == baked_length);
 
 	for (int i = 0; i < len; i++) {
-		float expected = (float)i;
-		Vector2 pos = curve->interpolate_baked(expected);
-		CHECK_MESSAGE(pos.x == expected, "interpolate_baked should return exact value");
+		Vector2 pos = curve->interpolate_baked(i);
+		CHECK_MESSAGE(pos.x == i, "interpolate_baked should return exact value");
 	}
 }
 
 TEST_CASE("[Curve3D] Linear sampling should return exact value") {
 	Ref<Curve3D> curve = memnew(Curve3D);
-	int len = 2048;
+	real_t len = 2048.0;
 
 	curve->add_point(Vector3(0, 0, 0));
-	curve->add_point(Vector3((float)len, 0, 0));
+	curve->add_point(Vector3(len, 0, 0));
 
-	float baked_length = curve->get_baked_length();
-	CHECK((float)len == baked_length);
+	real_t baked_length = curve->get_baked_length();
+	CHECK(len == baked_length);
 
 	for (int i = 0; i < len; i++) {
-		float expected = (float)i;
-		Vector3 pos = curve->interpolate_baked(expected);
-		CHECK_MESSAGE(pos.x == expected, "interpolate_baked should return exact value");
+		Vector3 pos = curve->interpolate_baked(i);
+		CHECK_MESSAGE(pos.x == i, "interpolate_baked should return exact value");
 	}
 }
 
diff --git a/tests/servers/test_shader_lang.cpp b/tests/servers/test_shader_lang.cpp
index 0591bf6adf..f4a32c6723 100644
--- a/tests/servers/test_shader_lang.cpp
+++ b/tests/servers/test_shader_lang.cpp
@@ -261,6 +261,8 @@ static String dump_node_code(SL::Node *p_node, int p_level) {
 					}
 					code += ")";
 					break;
+				case SL::OP_EMPTY:
+					break;
 				default: {
 					code = "(" + dump_node_code(onode->arguments[0], p_level) + _opstr(onode->op) + dump_node_code(onode->arguments[1], p_level) + ")";
 					break;