3 files changed, 24 insertions, 15 deletions

diff --git a/tests/test_physics_2d.cpp b/tests/test_physics_2d.cpp
index 61b8951afa..f63b866c3e 100644
--- a/tests/test_physics_2d.cpp
+++ b/tests/test_physics_2d.cpp
@@ -248,20 +248,20 @@ protected:
 		return body;
 	}
 
-	void _add_plane(const Vector2 &p_normal, real_t p_d) {
+	void _add_world_boundary(const Vector2 &p_normal, real_t p_d) {
 		PhysicsServer2D *ps = PhysicsServer2D::get_singleton();
 
 		Array arr;
 		arr.push_back(p_normal);
 		arr.push_back(p_d);
 
-		RID plane = ps->world_margin_shape_create();
-		ps->shape_set_data(plane, arr);
+		RID world_boundary = ps->world_boundary_shape_create();
+		ps->shape_set_data(world_boundary, arr);
 
 		RID plane_body = ps->body_create();
 		ps->body_set_mode(plane_body, PhysicsServer2D::BODY_MODE_STATIC);
 		ps->body_set_space(plane_body, space);
-		ps->body_add_shape(plane_body, plane);
+		ps->body_add_shape(plane_body, world_boundary);
 	}
 
 	void _add_concave(const Vector<Vector2> &p_points, const Transform2D &p_xform = Transform2D()) {
@@ -381,9 +381,9 @@ public:
 		}
 
 		_add_concave(parr);
-		//_add_plane(Vector2(0.0,-1).normalized(),-300);
-		//_add_plane(Vector2(1,0).normalized(),50);
-		//_add_plane(Vector2(-1,0).normalized(),-600);
+		//_add_world_boundary(Vector2(0.0,-1).normalized(),-300);
+		//_add_world_boundary(Vector2(1,0).normalized(),50);
+		//_add_world_boundary(Vector2(-1,0).normalized(),-600);
 	}
 
 	virtual bool process(double p_time) override {
diff --git a/tests/test_physics_3d.cpp b/tests/test_physics_3d.cpp
index ed49b60c71..3d1dad6545 100644
--- a/tests/test_physics_3d.cpp
+++ b/tests/test_physics_3d.cpp
@@ -100,18 +100,17 @@ protected:
 		return body;
 	}
 
-	RID create_static_plane(const Plane &p_plane) {
+	RID create_world_boundary(const Plane &p_plane) {
 		PhysicsServer3D *ps = PhysicsServer3D::get_singleton();
 
-		RID world_margin_shape = ps->shape_create(PhysicsServer3D::SHAPE_PLANE);
-		ps->shape_set_data(world_margin_shape, p_plane);
+		RID world_boundary_shape = ps->shape_create(PhysicsServer3D::SHAPE_WORLD_BOUNDARY);
+		ps->shape_set_data(world_boundary_shape, p_plane);
 
 		RID b = ps->body_create();
 		ps->body_set_mode(b, PhysicsServer3D::BODY_MODE_STATIC);
 
 		ps->body_set_space(b, space);
-		//todo set space
-		ps->body_add_shape(b, world_margin_shape);
+		ps->body_add_shape(b, world_boundary_shape);
 		return b;
 	}
 
@@ -391,12 +390,12 @@ public:
 			create_body(type, PhysicsServer3D::BODY_MODE_DYNAMIC, t);
 		}
 
-		create_static_plane(Plane(Vector3(0, 1, 0), -1));
+		create_world_boundary(Plane(Vector3(0, 1, 0), -1));
 	}
 
 	void test_activate() {
 		create_body(PhysicsServer3D::SHAPE_BOX, PhysicsServer3D::BODY_MODE_DYNAMIC, Transform3D(Basis(), Vector3(0, 2, 0)), true);
-		create_static_plane(Plane(Vector3(0, 1, 0), -1));
+		create_world_boundary(Plane(Vector3(0, 1, 0), -1));
 	}
 
 	virtual bool process(double p_time) override {
diff --git a/tests/test_string.h b/tests/test_string.h
index bcedaa0db7..c1b7220fdb 100644
--- a/tests/test_string.h
+++ b/tests/test_string.h
@@ -355,13 +355,23 @@ TEST_CASE("[String] Number to string") {
 	CHECK(String::num(-0.0) == "-0"); // Includes sign even for zero.
 	CHECK(String::num(3.141593) == "3.141593");
 	CHECK(String::num(3.141593, 3) == "3.142");
-	CHECK(String::num_real(3.141593) == "3.141593");
 	CHECK(String::num_scientific(30000000) == "3e+07");
 	CHECK(String::num_int64(3141593) == "3141593");
 	CHECK(String::num_int64(0xA141593, 16) == "a141593");
 	CHECK(String::num_int64(0xA141593, 16, true) == "A141593");
 	CHECK(String::num(42.100023, 4) == "42.1"); // No trailing zeros.
 
+	// String::num_real tests.
+	CHECK(String::num_real(3.141593) == "3.141593");
+	CHECK(String::num_real(3.141) == "3.141"); // No trailing zeros.
+#ifdef REAL_T_IS_DOUBLE
+	CHECK_MESSAGE(String::num_real(Math_PI) == "3.14159265358979", "Prints the appropriate amount of digits for real_t = double.");
+	CHECK_MESSAGE(String::num_real(3.1415f) == "3.14149999618530", "Prints more digits of 32-bit float when real_t = double (ones that would be reliable for double).");
+#else
+	CHECK_MESSAGE(String::num_real(Math_PI) == "3.141593", "Prints the appropriate amount of digits for real_t = float.");
+	CHECK_MESSAGE(String::num_real(3.1415f) == "3.1415", "Prints only reliable digits of 32-bit float when real_t = float.");
+#endif // REAL_T_IS_DOUBLE
+
 	// Checks doubles with many decimal places.
 	CHECK(String::num(0.0000012345432123454321, -1) == "0.00000123454321"); // -1 uses 14 as sane default.
 	CHECK(String::num(0.0000012345432123454321) == "0.00000123454321"); // -1 is the default value.