2 files changed, 11 insertions, 83 deletions

diff --git a/modules/gdscript/tests/scripts/utils.notest.gd b/modules/gdscript/tests/scripts/utils.notest.gd
index fb20817117..781843b8e2 100644
--- a/modules/gdscript/tests/scripts/utils.notest.gd
+++ b/modules/gdscript/tests/scripts/utils.notest.gd
@@ -17,7 +17,7 @@ static func get_type(property: Dictionary, is_return: bool = false) -> String:
 		TYPE_OBJECT:
 			if not str(property.class_name).is_empty():
 				return property.class_name
-	return variant_get_type_name(property.type)
+	return type_string(property.type)
 
 
 static func get_property_signature(property: Dictionary, is_static: bool = false) -> String:
@@ -66,88 +66,6 @@ static func get_method_signature(method: Dictionary, is_signal: bool = false) ->
 	return result
 
 
-static func variant_get_type_name(type: Variant.Type) -> String:
-	match type:
-		TYPE_NIL:
-			return "Nil" # `Nil` in core, `null` in GDScript.
-		TYPE_BOOL:
-			return "bool"
-		TYPE_INT:
-			return "int"
-		TYPE_FLOAT:
-			return "float"
-		TYPE_STRING:
-			return "String"
-		TYPE_VECTOR2:
-			return "Vector2"
-		TYPE_VECTOR2I:
-			return "Vector2i"
-		TYPE_RECT2:
-			return "Rect2"
-		TYPE_RECT2I:
-			return "Rect2i"
-		TYPE_VECTOR3:
-			return "Vector3"
-		TYPE_VECTOR3I:
-			return "Vector3i"
-		TYPE_TRANSFORM2D:
-			return "Transform2D"
-		TYPE_VECTOR4:
-			return "Vector4"
-		TYPE_VECTOR4I:
-			return "Vector4i"
-		TYPE_PLANE:
-			return "Plane"
-		TYPE_QUATERNION:
-			return "Quaternion"
-		TYPE_AABB:
-			return "AABB"
-		TYPE_BASIS:
-			return "Basis"
-		TYPE_TRANSFORM3D:
-			return "Transform3D"
-		TYPE_PROJECTION:
-			return "Projection"
-		TYPE_COLOR:
-			return "Color"
-		TYPE_STRING_NAME:
-			return "StringName"
-		TYPE_NODE_PATH:
-			return "NodePath"
-		TYPE_RID:
-			return "RID"
-		TYPE_OBJECT:
-			return "Object"
-		TYPE_CALLABLE:
-			return "Callable"
-		TYPE_SIGNAL:
-			return "Signal"
-		TYPE_DICTIONARY:
-			return "Dictionary"
-		TYPE_ARRAY:
-			return "Array"
-		TYPE_PACKED_BYTE_ARRAY:
-			return "PackedByteArray"
-		TYPE_PACKED_INT32_ARRAY:
-			return "PackedInt32Array"
-		TYPE_PACKED_INT64_ARRAY:
-			return "PackedInt64Array"
-		TYPE_PACKED_FLOAT32_ARRAY:
-			return "PackedFloat32Array"
-		TYPE_PACKED_FLOAT64_ARRAY:
-			return "PackedFloat64Array"
-		TYPE_PACKED_STRING_ARRAY:
-			return "PackedStringArray"
-		TYPE_PACKED_VECTOR2_ARRAY:
-			return "PackedVector2Array"
-		TYPE_PACKED_VECTOR3_ARRAY:
-			return "PackedVector3Array"
-		TYPE_PACKED_COLOR_ARRAY:
-			return "PackedColorArray"
-	push_error("Argument `type` is invalid. Use `TYPE_*` constants.")
-	return "<invalid type>"
-
-
 static func get_property_hint_name(hint: PropertyHint) -> String:
 	match hint:
 		PROPERTY_HINT_NONE:
diff --git a/modules/gdscript/tests/test_gdscript.cpp b/modules/gdscript/tests/test_gdscript.cpp
index b86a8b3cb1..467bedc4b2 100644
--- a/modules/gdscript/tests/test_gdscript.cpp
+++ b/modules/gdscript/tests/test_gdscript.cpp
@@ -223,6 +223,16 @@ void test(TestType p_type) {
 	// Initialize the language for the test routine.
 	init_language(fa->get_path_absolute().get_base_dir());
 
+	// Load global classes.
+	TypedArray<Dictionary> script_classes = ProjectSettings::get_singleton()->get_global_class_list();
+	for (int i = 0; i < script_classes.size(); i++) {
+		Dictionary c = script_classes[i];
+		if (!c.has("class") || !c.has("language") || !c.has("path") || !c.has("base")) {
+			continue;
+		}
+		ScriptServer::add_global_class(c["class"], c["base"], c["language"], c["path"]);
+	}
+
 	Vector<uint8_t> buf;
 	uint64_t flen = fa->get_length();
 	buf.resize(flen + 1);