Browse Source

Fix `SCRIPT ERROR/ERROR/WARNING` on test output

Also "fixing" some GDScript completion tests which
where named wrongly.

(cherry picked from commit 5775d29ad8d72fddc88ee76b7806db2f0568fcf8)
Pablo Andres Fuente 4 months ago
parent
commit
b725a9f285
33 changed files with 30 additions and 13 deletions
  1. 2 0
      modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd
  2. 2 0
      modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd
  3. 2 0
      modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd
  4. 1 1
      modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd
  5. 1 1
      modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd
  6. 0 0
      modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.cfg
  7. 0 0
      modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.gd
  8. 0 0
      modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.cfg
  9. 0 0
      modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.gd
  10. 0 0
      modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.cfg
  11. 0 0
      modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.gd
  12. 0 0
      modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.cfg
  13. 0 0
      modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.gd
  14. 0 0
      modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.cfg
  15. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.gd
  16. 0 0
      modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.cfg
  17. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.gd
  18. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd
  19. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd
  20. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd
  21. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd
  22. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd
  23. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd
  24. 1 1
      modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd
  25. 0 0
      modules/gdscript/tests/scripts/completion/types/local/inferred.cfg
  26. 0 0
      modules/gdscript/tests/scripts/completion/types/local/inferred.gd
  27. 0 0
      modules/gdscript/tests/scripts/completion/types/member/inferred.cfg
  28. 0 0
      modules/gdscript/tests/scripts/completion/types/member/inferred.gd
  29. 4 0
      modules/gdscript/tests/test_completion.h
  30. 4 0
      tests/core/templates/test_a_hash_map.h
  31. 2 1
      tests/scene/test_code_edit.h
  32. 2 0
      tests/scene/test_text_edit.h
  33. 1 1
      tests/test_main.cpp

+ 2 - 0
modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd

@@ -1,3 +1,5 @@
+extends Node
+
 @onready var anim := $AnimationPlayer
 
 func test():

+ 2 - 0
modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd

@@ -1,3 +1,5 @@
+extends Node
+
 @onready var anim: AnimationPlayer = $AnimationPlayer
 
 func test():

+ 2 - 0
modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd

@@ -1,3 +1,5 @@
+extends Node
+
 @onready var anim = $AnimationPlayer
 
 func test():

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd

@@ -1,5 +1,5 @@
 extends Node
 
 func a():
-    %AnimationPlayer.➡
+    $UniqueAnimationPlayer.➡
     pass

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd

@@ -1,5 +1,5 @@
 extends Node
 
 func a():
-    $UniqueAnimationPlayer.➡
+    %AnimationPlayer.➡
     pass

+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.cfg → modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.cfg


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.gd → modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.gd


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.cfg → modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.cfg


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.gd → modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.gd


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.cfg → modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.cfg


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.gd → modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.gd


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.cfg → modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.cfg


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.gd → modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.gd


+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.cfg → modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.cfg


+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.gd → modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test := $A
+@onready var test := $A
 
 func a():
     test.➡

+ 0 - 0
modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.cfg → modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.cfg


+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.gd → modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test := $AnimationPlayer
+@onready var test := $AnimationPlayer
 
 func a():
     test.➡

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test = $A
+@onready var test = $A
 
 func a():
     test.➡

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test = $AnimationPlayer
+@onready var test = $AnimationPlayer
 
 func a():
     test.➡

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test: AnimationPlayer = $AnimationPlayer
+@onready var test: AnimationPlayer = $AnimationPlayer
 
 func a():
     test.➡

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test: Node = $A
+@onready var test: Node = $A
 
 func a():
     test.➡

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test: Node = $AnimationPlayer
+@onready var test: Node = $AnimationPlayer
 
 func a():
     test.➡

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test: Area2D = $A
+@onready var test: Area2D = $A
 
 func a():
     test.➡

+ 1 - 1
modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd

@@ -1,6 +1,6 @@
 extends Node
 
-var test: Area2D = $AnimationPlayer
+@onready var test: Area2D = $AnimationPlayer
 
 func a():
     test.➡

+ 0 - 0
modules/gdscript/tests/scripts/completion/types/local/infered.cfg → modules/gdscript/tests/scripts/completion/types/local/inferred.cfg


+ 0 - 0
modules/gdscript/tests/scripts/completion/types/local/infered.gd → modules/gdscript/tests/scripts/completion/types/local/inferred.gd


+ 0 - 0
modules/gdscript/tests/scripts/completion/types/member/infered.cfg → modules/gdscript/tests/scripts/completion/types/member/inferred.cfg


+ 0 - 0
modules/gdscript/tests/scripts/completion/types/member/infered.gd → modules/gdscript/tests/scripts/completion/types/member/inferred.gd


+ 4 - 0
modules/gdscript/tests/test_completion.h

@@ -161,6 +161,8 @@ static void test_directory(const String &p_dir) {
 				owner = scene->get_node(conf.get_value("input", "node_path", "."));
 			}
 
+			// The only requirement is for the script to be parsable, warnings and errors from the analyzer might happen and completion should still work.
+			ERR_PRINT_OFF;
 			if (owner != nullptr) {
 				// Remove the line which contains the sentinel char, to get a valid script.
 				Ref<GDScript> scr;
@@ -184,6 +186,8 @@ static void test_directory(const String &p_dir) {
 			}
 
 			GDScriptLanguage::get_singleton()->complete_code(code, res_path, owner, &options, forced, call_hint);
+			ERR_PRINT_ON;
+
 			String contains_excluded;
 			for (ScriptLanguage::CodeCompletionOption &option : options) {
 				for (const Dictionary &E : exclude) {

+ 4 - 0
tests/core/templates/test_a_hash_map.h

@@ -235,9 +235,13 @@ TEST_CASE("[AHashMap] Insert, iterate and remove many elements") {
 TEST_CASE("[AHashMap] Insert, iterate and remove many strings") {
 	const int elem_max = 432;
 	AHashMap<String, String> map;
+
+	// To not print WARNING: Excessive collision count (NN), is the right hash function being used?
+	ERR_PRINT_OFF;
 	for (int i = 0; i < elem_max; i++) {
 		map.insert(itos(i), itos(i));
 	}
+	ERR_PRINT_ON;
 
 	//insert order should have been kept
 	int idx = 0;

+ 2 - 1
tests/scene/test_code_edit.h

@@ -4492,7 +4492,8 @@ TEST_CASE("[SceneTree][CodeEdit] symbol lookup") {
 
 		Point2 caret_pos = code_edit->get_caret_draw_pos();
 		caret_pos.x += 60;
-		SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::NONE, 0, Key::NONE);
+
+		SEND_GUI_MOUSE_MOTION_EVENT(caret_pos, MouseButtonMask::NONE, Key::NONE);
 		CHECK(code_edit->get_text_for_symbol_lookup() == "this is s" + String::chr(0xFFFF) + "ome text");
 
 		SIGNAL_WATCH(code_edit, "symbol_validate");

+ 2 - 0
tests/scene/test_text_edit.h

@@ -8014,6 +8014,8 @@ TEST_CASE("[SceneTree][TextEdit] gutters") {
 	SIGNAL_WATCH(text_edit, "gutter_removed");
 
 	SUBCASE("[TextEdit] gutter add and remove") {
+		text_edit->set_text("test1\ntest2\ntest3\ntest4");
+
 		text_edit->add_gutter();
 		CHECK(text_edit->get_gutter_count() == 1);
 		CHECK(text_edit->get_gutter_width(0) == 24);

+ 1 - 1
tests/test_main.cpp

@@ -306,7 +306,7 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			// So we have to do this for each test case. Also make sure there is
 			// no residual theme from something else.
 			ThemeDB::get_singleton()->finalize_theme();
-			ThemeDB::get_singleton()->initialize_theme_noproject();
+			ThemeDB::get_singleton()->initialize_theme();
 
 #ifndef _3D_DISABLED
 			physics_server_3d = PhysicsServer3DManager::get_singleton()->new_default_server();