From 5775d29ad8d72fddc88ee76b7806db2f0568fcf8 Mon Sep 17 00:00:00 2001 From: Pablo Andres Fuente Date: Thu, 6 Mar 2025 00:40:35 +0100 Subject: [PATCH] Fix `SCRIPT ERROR/ERROR/WARNING` on test output Also "fixing" some GDScript completion tests which where named wrongly. --- .../scripts/completion/argument_options/play_inferred.gd | 2 ++ .../tests/scripts/completion/argument_options/play_typed.gd | 2 ++ .../tests/scripts/completion/argument_options/play_untyped.gd | 2 ++ .../tests/scripts/completion/get_node/literal/dollar.gd | 2 +- .../tests/scripts/completion/get_node/literal/percent.gd | 2 +- .../local_infered.cfg => local_inferred/local_inferred.cfg} | 0 .../local_infered.gd => local_inferred/local_inferred.gd} | 0 .../class_local_inferred_scene.cfg} | 0 .../class_local_inferred_scene.gd} | 0 .../native_local_inferred_scene.cfg} | 0 .../native_local_inferred_scene.gd} | 0 .../member_inferred.cfg} | 0 .../member_infered.gd => member_inferred/member_inferred.gd} | 0 .../class_member_inferred_scene.cfg} | 0 .../class_member_inferred_scene.gd} | 2 +- .../native_member_inferred_scene.cfg} | 0 .../native_member_inferred_scene.gd} | 2 +- .../completion/get_node/member_scene/class_member_scene.gd | 2 +- .../completion/get_node/member_scene/native_member_scene.gd | 2 +- .../member_typehint_scene/native_member_typehint_scene.gd | 2 +- .../class_member_typehint_scene_broad.gd | 2 +- .../native_member_typehint_scene_broad.gd | 2 +- .../class_member_typehint_scene_incompatible.gd | 2 +- .../native_member_typehint_scene_incompatible.gd | 2 +- .../completion/types/local/{infered.cfg => inferred.cfg} | 0 .../completion/types/local/{infered.gd => inferred.gd} | 0 .../completion/types/member/{infered.cfg => inferred.cfg} | 0 .../completion/types/member/{infered.gd => inferred.gd} | 0 modules/gdscript/tests/test_completion.h | 4 ++++ tests/core/templates/test_a_hash_map.h | 4 ++++ tests/scene/test_code_edit.h | 3 ++- tests/scene/test_text_edit.h | 2 ++ tests/test_main.cpp | 2 +- 33 files changed, 30 insertions(+), 13 deletions(-) rename modules/gdscript/tests/scripts/completion/get_node/{local_infered/local_infered.cfg => local_inferred/local_inferred.cfg} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{local_infered/local_infered.gd => local_inferred/local_inferred.gd} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{local_infered_scene/class_local_infered_scene.cfg => local_inferred_scene/class_local_inferred_scene.cfg} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{local_infered_scene/class_local_infered_scene.gd => local_inferred_scene/class_local_inferred_scene.gd} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{local_infered_scene/native_local_infered_scene.cfg => local_inferred_scene/native_local_inferred_scene.cfg} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{local_infered_scene/native_local_infered_scene.gd => local_inferred_scene/native_local_inferred_scene.gd} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{member_infered/member_infered.cfg => member_inferred/member_inferred.cfg} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{member_infered/member_infered.gd => member_inferred/member_inferred.gd} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{member_infered_scene/class_member_infered_scene.cfg => member_inferred_scene/class_member_inferred_scene.cfg} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{member_infered_scene/class_member_infered_scene.gd => member_inferred_scene/class_member_inferred_scene.gd} (66%) rename modules/gdscript/tests/scripts/completion/get_node/{member_infered_scene/native_member_infered_scene.cfg => member_inferred_scene/native_member_inferred_scene.cfg} (100%) rename modules/gdscript/tests/scripts/completion/get_node/{member_infered_scene/native_member_infered_scene.gd => member_inferred_scene/native_member_inferred_scene.gd} (55%) rename modules/gdscript/tests/scripts/completion/types/local/{infered.cfg => inferred.cfg} (100%) rename modules/gdscript/tests/scripts/completion/types/local/{infered.gd => inferred.gd} (100%) rename modules/gdscript/tests/scripts/completion/types/member/{infered.cfg => inferred.cfg} (100%) rename modules/gdscript/tests/scripts/completion/types/member/{infered.gd => inferred.gd} (100%) diff --git a/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd b/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd index abeadbe5eed..6b4f1b6e835 100644 --- a/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd +++ b/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd @@ -1,3 +1,5 @@ +extends Node + @onready var anim := $AnimationPlayer func test(): diff --git a/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd b/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd index d11f81e9853..4b8b001528e 100644 --- a/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd +++ b/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd @@ -1,3 +1,5 @@ +extends Node + @onready var anim: AnimationPlayer = $AnimationPlayer func test(): diff --git a/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd b/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd index 4ddfd21ac60..fb3fe915fd4 100644 --- a/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd +++ b/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd @@ -1,3 +1,5 @@ +extends Node + @onready var anim = $AnimationPlayer func test(): diff --git a/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd b/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd index dc7cc995541..5586317938e 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd +++ b/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd @@ -1,5 +1,5 @@ extends Node func a(): - %AnimationPlayer.➡ + $UniqueAnimationPlayer.➡ pass diff --git a/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd b/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd index 5586317938e..dc7cc995541 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd +++ b/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd @@ -1,5 +1,5 @@ extends Node func a(): - $UniqueAnimationPlayer.➡ + %AnimationPlayer.➡ pass diff --git a/modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.cfg b/modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.cfg rename to modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.cfg diff --git a/modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.gd b/modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.gd similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.gd rename to modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.gd diff --git a/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.cfg b/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.cfg rename to modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.cfg diff --git a/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.gd b/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.gd similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.gd rename to modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.gd diff --git a/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.cfg b/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.cfg rename to modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.cfg diff --git a/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.gd b/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.gd similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.gd rename to modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.gd diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.cfg b/modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.cfg rename to modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.cfg diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.gd b/modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.gd similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.gd rename to modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.gd diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.cfg b/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.cfg rename to modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.cfg diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.gd b/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.gd similarity index 66% rename from modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.gd rename to modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.gd index 402fd1d275d..877ac442a91 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.cfg b/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.cfg rename to modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.cfg diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.gd b/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.gd similarity index 55% rename from modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.gd rename to modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.gd index 97b288334ed..0b511e4c72c 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd b/modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd index 6188a6e843c..0dad242872f 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd b/modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd index 80b49439532..43e6c3bc78f 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd b/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd index 7f2cb4e8cc7..f4a0c6d7cec 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd b/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd index aac450be9f2..5df4c0ec4c9 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd b/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd index 9eb10e49339..991449d728a 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd b/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd index ff8214c4632..a3cdece9561 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd b/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd index 30cd7d6a21a..b0c99d4e16a 100644 --- a/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd +++ b/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.➡ diff --git a/modules/gdscript/tests/scripts/completion/types/local/infered.cfg b/modules/gdscript/tests/scripts/completion/types/local/inferred.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/types/local/infered.cfg rename to modules/gdscript/tests/scripts/completion/types/local/inferred.cfg diff --git a/modules/gdscript/tests/scripts/completion/types/local/infered.gd b/modules/gdscript/tests/scripts/completion/types/local/inferred.gd similarity index 100% rename from modules/gdscript/tests/scripts/completion/types/local/infered.gd rename to modules/gdscript/tests/scripts/completion/types/local/inferred.gd diff --git a/modules/gdscript/tests/scripts/completion/types/member/infered.cfg b/modules/gdscript/tests/scripts/completion/types/member/inferred.cfg similarity index 100% rename from modules/gdscript/tests/scripts/completion/types/member/infered.cfg rename to modules/gdscript/tests/scripts/completion/types/member/inferred.cfg diff --git a/modules/gdscript/tests/scripts/completion/types/member/infered.gd b/modules/gdscript/tests/scripts/completion/types/member/inferred.gd similarity index 100% rename from modules/gdscript/tests/scripts/completion/types/member/infered.gd rename to modules/gdscript/tests/scripts/completion/types/member/inferred.gd diff --git a/modules/gdscript/tests/test_completion.h b/modules/gdscript/tests/test_completion.h index 844c2675e3e..95201190131 100644 --- a/modules/gdscript/tests/test_completion.h +++ b/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 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) { diff --git a/tests/core/templates/test_a_hash_map.h b/tests/core/templates/test_a_hash_map.h index 4fa6d3bca41..6e60addc604 100644 --- a/tests/core/templates/test_a_hash_map.h +++ b/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 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; diff --git a/tests/scene/test_code_edit.h b/tests/scene/test_code_edit.h index 1c85d3e41c3..de55fc70960 100644 --- a/tests/scene/test_code_edit.h +++ b/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"); diff --git a/tests/scene/test_text_edit.h b/tests/scene/test_text_edit.h index d7192def621..aa7a9bb23c4 100644 --- a/tests/scene/test_text_edit.h +++ b/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); diff --git a/tests/test_main.cpp b/tests/test_main.cpp index c12e9270817..2d8f2c76915 100644 --- a/tests/test_main.cpp +++ b/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();