From 72dd77b07908114ac3a798c4c64f012fb55ffc2d Mon Sep 17 00:00:00 2001 From: Curtis Barnhart Date: Tue, 10 Mar 2026 19:42:27 -0700 Subject: [PATCH 1/3] Added underscores to unused variables, somehow fixes failing test --- .../test_with_parameters.gd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/resources/parsing_and_loading_samples/test_with_parameters.gd b/test/resources/parsing_and_loading_samples/test_with_parameters.gd index 7091a96a..73ce1fd0 100644 --- a/test/resources/parsing_and_loading_samples/test_with_parameters.gd +++ b/test/resources/parsing_and_loading_samples/test_with_parameters.gd @@ -1,9 +1,9 @@ extends "res://addons/gut/test.gd" -func test_has_one_defaulted_parameter(p=use_parameters(['a'])): +func test_has_one_defaulted_parameter(_p=use_parameters(['a'])): assert_true(true, 'this one passes') -func test_has_two_parameters(p1=null, p2=null): +func test_has_two_parameters(_p1=null, _p2=null): assert_true(false, 'Should not see this. This should not be run.') func test_no_parameters(): @@ -12,7 +12,7 @@ func test_no_parameters(): func test_has_three_values_for_parameters(p=use_parameters([['a', 'a'], ['b', 'b'], ['c', 'c']])): assert_eq(p[0], p[1]) -func test_does_not_use_use_parameters(p=null): +func test_does_not_use_use_parameters(_p=null): assert_true(true, 'this passes but should never be called more than once.') func test_three_values_and_a_yield(p=use_parameters([['a', 'a'], ['b', 'b'], ['c', 'c']])): @@ -22,10 +22,10 @@ func test_three_values_and_a_yield(p=use_parameters([['a', 'a'], ['b', 'b'], ['c class TestInnerClass: extends "res://addons/gut/test.gd" - func test_inner_has_one_defaulted_parameter(p=null): + func test_inner_has_one_defaulted_parameter(_p=null): assert_true(true, 'this one passes') - func test_inner_has_two_parameters(p1=null, p2=null): + func test_inner_has_two_parameters(_p1=null, _p2=null): assert_true(false, 'Should not see this. This should not be run.') func test_inner_no_parameters(): From 2d46dce015d072702bd8762efba79ad3556c2fc5 Mon Sep 17 00:00:00 2001 From: Curtis Barnhart Date: Tue, 10 Mar 2026 20:15:04 -0700 Subject: [PATCH 2/3] removed unused vars or added underscores to unused parameters --- .../doubler_test_objects/double_extends_node2d.gd | 4 ++-- test/resources/doubler_test_objects/double_me.gd | 12 ++++++------ test/unit/test_gut.gd | 4 +--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/test/resources/doubler_test_objects/double_extends_node2d.gd b/test/resources/doubler_test_objects/double_extends_node2d.gd index 138c6845..4bb2f558 100644 --- a/test/resources/doubler_test_objects/double_extends_node2d.gd +++ b/test/resources/doubler_test_objects/double_extends_node2d.gd @@ -8,9 +8,9 @@ func get_value(): func set_value(val): _value = val -func has_one_param(one): +func has_one_param(_one): pass -func has_two_params_one_default(one, two=null): +func has_two_params_one_default(_one, _two=null): pass diff --git a/test/resources/doubler_test_objects/double_me.gd b/test/resources/doubler_test_objects/double_me.gd index 08d64595..9096f349 100644 --- a/test/resources/doubler_test_objects/double_me.gd +++ b/test/resources/doubler_test_objects/double_me.gd @@ -19,16 +19,16 @@ func get_value(): func set_value(val): _value = val -func has_one_param(one): +func has_one_param(_one): pass -func has_two_params_one_default(one, two=null): +func has_two_params_one_default(_one, _two=null): pass func get_position(): return get_position() -func has_string_and_array_defaults(string_param = "asdf", array_param = [1]): +func has_string_and_array_defaults(_string_param = "asdf", _array_param = [1]): pass func this_just_does_an_await(): @@ -46,7 +46,7 @@ func does_something_then_calls_coroutine_then_does_something_else(): print('something else') return 10 -func might_await(should, some_default=3): +func might_await(should, _some_default=3): if(should): print('awaiting') await this_is_a_coroutine() @@ -58,7 +58,7 @@ func might_await(should, some_default=3): func await_seconds(s): await get_tree().create_timer(s).timeout -func might_await_no_return(some_default=3): +func might_await_no_return(_some_default=3): if(should_might_await_await): print('awaiting') await this_is_a_coroutine() @@ -66,7 +66,7 @@ func might_await_no_return(some_default=3): print('not awaiting') func uses_await_response(): - var foo = await this_is_a_coroutine() + var _foo = await this_is_a_coroutine() func default_is_value(val = _value): diff --git a/test/unit/test_gut.gd b/test/unit/test_gut.gd index b64e5e9a..0b67f78e 100644 --- a/test/unit/test_gut.gd +++ b/test/unit/test_gut.gd @@ -621,7 +621,6 @@ class TestEverythingElse: assert_is(gr.test_gut.get_pre_run_script_instance(), PreRunScript) func test_when_pre_hook_set_run_method_is_called(): - var PreRunScript = load('res://test/resources/pre_run_script.gd') gr.test_gut.pre_run_script = 'res://test/resources/pre_run_script.gd' gr.test_gut.add_script(SAMPLES_DIR + 'test_sample_all_passed.gd') await run_tests() @@ -679,7 +678,6 @@ class TestEverythingElse: await wait_seconds(1) func test_awaiting_in_the_post_hook_script(): - var pre_run_script = load("res://test/resources/awaiting_post_run_script.gd") gr.test_gut.post_run_script = "res://test/resources/awaiting_post_run_script.gd" gr.test_gut.add_script(SAMPLES_DIR + 'test_sample_all_passed.gd') gr.test_gut.test_scripts() @@ -691,7 +689,7 @@ class TestEverythingElse: # Parameterized Test Tests # ------------------------------ const TEST_WITH_PARAMETERS = 'res://test/resources/parsing_and_loading_samples/test_with_parameters.gd' - func _get_test_script_object_of_type(the_gut, the_type): + func _get_test_script_object_of_type(_the_gut, the_type): var objs = gr.test_gut._test_script_objects var obj = null for i in range(objs.size()): From deed55a8e9b6fe1c0bca16ce1f1e62ede010f013 Mon Sep 17 00:00:00 2001 From: Curtis Barnhart Date: Tue, 10 Mar 2026 21:44:54 -0700 Subject: [PATCH 3/3] updated doubler test to deal with new parameter names and added some underscores to unused vars in that file as well --- test/unit/test_doubler.gd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/test_doubler.gd b/test/unit/test_doubler.gd index bfa6179d..68a76eec 100644 --- a/test/unit/test_doubler.gd +++ b/test/unit/test_doubler.gd @@ -128,7 +128,7 @@ class TestDoublingScripts: func test_doubling_methods_have_parameters_1(): var inst = _doubler.double(DoubleMe).new() - assert_source_contains(inst, 'has_one_param(p_one=', 'first parameter for one param method is defined') + assert_source_contains(inst, 'has_one_param(p__one=', 'first parameter for one param method is defined') # Don't see a way to see which have defaults and which do not, so we default # everything. @@ -136,8 +136,8 @@ class TestDoublingScripts: var inst = _doubler.double(DoubleMe).new() assert_source_contains(inst, 'has_two_params_one_default(' + - 'p_one=__gutdbl.default_val("has_two_params_one_default",0), '+ - 'p_two=__gutdbl.default_val("has_two_params_one_default",1))') + 'p__one=__gutdbl.default_val("has_two_params_one_default",0), '+ + 'p__two=__gutdbl.default_val("has_two_params_one_default",1))') # assert_true(text.match('*has_two_params_one_default(p_arg0=__gut_default_val("has_two_params_one_default",0), p_arg1=__gut_default_val("has_two_params_one_default",1))*')) func test_doubled_thing_includes_stubber_metadata(): @@ -503,12 +503,12 @@ class TestAutofree: a = value func test_doubles_are_autofreed(): - var doubled = double(DoubleExtendsNode2D).new() + var _doubled = double(DoubleExtendsNode2D).new() gut.get_autofree().free_all() assert_no_new_orphans() func test_partial_doubles_are_autofreed(): - var doubled = partial_double(DoubleExtendsNode2D).new() + var _doubled = partial_double(DoubleExtendsNode2D).new() gut.get_autofree().free_all() assert_no_new_orphans()