summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/core/io/test_resource.h4
-rw-r--r--tests/core/math/test_math_funcs.h2
-rw-r--r--tests/core/variant/test_dictionary.h2
-rw-r--r--tests/core/variant/test_variant_utility.h141
-rw-r--r--tests/scene/test_arraymesh.h2
-rw-r--r--tests/scene/test_code_edit.h226
-rw-r--r--tests/servers/rendering/test_shader_preprocessor.h6
-rw-r--r--tests/test_main.cpp5
8 files changed, 361 insertions, 27 deletions
diff --git a/tests/core/io/test_resource.h b/tests/core/io/test_resource.h
index 8fc2a2f040..9ddb51220b 100644
--- a/tests/core/io/test_resource.h
+++ b/tests/core/io/test_resource.h
@@ -139,7 +139,7 @@ TEST_CASE("[Resource] Breaking circular references on save") {
loaded_resource_c_binary->get_name() == "C",
"The loaded child resource name should be equal to the expected value.");
CHECK_MESSAGE(
- !loaded_resource_c_binary->get_meta("next"),
+ !loaded_resource_c_binary->has_meta("next"),
"The loaded child resource circular reference should be NULL.");
const Ref<Resource> &loaded_resource_a_text = ResourceLoader::load(save_path_text);
@@ -155,7 +155,7 @@ TEST_CASE("[Resource] Breaking circular references on save") {
loaded_resource_c_text->get_name() == "C",
"The loaded child resource name should be equal to the expected value.");
CHECK_MESSAGE(
- !loaded_resource_c_text->get_meta("next"),
+ !loaded_resource_c_text->has_meta("next"),
"The loaded child resource circular reference should be NULL.");
// Break circular reference to avoid memory leak
diff --git a/tests/core/math/test_math_funcs.h b/tests/core/math/test_math_funcs.h
index e3504ef1e5..d046656b0f 100644
--- a/tests/core/math/test_math_funcs.h
+++ b/tests/core/math/test_math_funcs.h
@@ -54,6 +54,8 @@ TEST_CASE("[Math] C++ macros") {
CHECK(SIGN(-5) == -1.0);
CHECK(SIGN(0) == 0.0);
CHECK(SIGN(5) == 1.0);
+ // Check that SIGN(NAN) returns 0.0.
+ CHECK(SIGN(NAN) == 0.0);
}
TEST_CASE("[Math] Power of two functions") {
diff --git a/tests/core/variant/test_dictionary.h b/tests/core/variant/test_dictionary.h
index 4571de6487..5bc56075da 100644
--- a/tests/core/variant/test_dictionary.h
+++ b/tests/core/variant/test_dictionary.h
@@ -90,7 +90,7 @@ TEST_CASE("[Dictionary] Assignment using bracket notation ([])") {
CHECK(int(map[false]) == 128);
// Ensure read-only maps aren't modified by non-existing keys.
- const auto length = map.size();
+ const int length = map.size();
map.make_read_only();
CHECK(int(map["This key does not exist"].get_type()) == Variant::NIL);
CHECK(map.size() == length);
diff --git a/tests/core/variant/test_variant_utility.h b/tests/core/variant/test_variant_utility.h
new file mode 100644
index 0000000000..93458b63f4
--- /dev/null
+++ b/tests/core/variant/test_variant_utility.h
@@ -0,0 +1,141 @@
+/**************************************************************************/
+/* test_variant_utility.h */
+/**************************************************************************/
+/* This file is part of: */
+/* GODOT ENGINE */
+/* https://godotengine.org */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
+/* */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the */
+/* "Software"), to deal in the Software without restriction, including */
+/* without limitation the rights to use, copy, modify, merge, publish, */
+/* distribute, sublicense, and/or sell copies of the Software, and to */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions: */
+/* */
+/* The above copyright notice and this permission notice shall be */
+/* included in all copies or substantial portions of the Software. */
+/* */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
+/**************************************************************************/
+
+#ifndef TEST_VARIANT_UTILITY_H
+#define TEST_VARIANT_UTILITY_H
+
+#include "core/variant/variant_utility.h"
+
+#include "tests/test_macros.h"
+
+namespace TestVariantUtility {
+
+TEST_CASE("[VariantUtility] Type conversion") {
+ Variant converted;
+ converted = VariantUtilityFunctions::type_convert("Hi!", Variant::Type::NIL);
+ CHECK(converted.get_type() == Variant::Type::NIL);
+ CHECK(converted == Variant());
+
+ converted = VariantUtilityFunctions::type_convert("Hi!", Variant::Type::INT);
+ CHECK(converted.get_type() == Variant::Type::INT);
+ CHECK(converted == Variant(0));
+
+ converted = VariantUtilityFunctions::type_convert("123", Variant::Type::INT);
+ CHECK(converted.get_type() == Variant::Type::INT);
+ CHECK(converted == Variant(123));
+
+ converted = VariantUtilityFunctions::type_convert(123, Variant::Type::STRING);
+ CHECK(converted.get_type() == Variant::Type::STRING);
+ CHECK(converted == Variant("123"));
+
+ converted = VariantUtilityFunctions::type_convert(123.4, Variant::Type::INT);
+ CHECK(converted.get_type() == Variant::Type::INT);
+ CHECK(converted == Variant(123));
+
+ converted = VariantUtilityFunctions::type_convert(5, Variant::Type::VECTOR2);
+ CHECK(converted.get_type() == Variant::Type::VECTOR2);
+ CHECK(converted == Variant(Vector2(0, 0)));
+
+ converted = VariantUtilityFunctions::type_convert(Vector3(1, 2, 3), Variant::Type::VECTOR2);
+ CHECK(converted.get_type() == Variant::Type::VECTOR2);
+ CHECK(converted == Variant(Vector2(1, 2)));
+
+ converted = VariantUtilityFunctions::type_convert(Vector2(1, 2), Variant::Type::VECTOR4);
+ CHECK(converted.get_type() == Variant::Type::VECTOR4);
+ CHECK(converted == Variant(Vector4(1, 2, 0, 0)));
+
+ converted = VariantUtilityFunctions::type_convert(Vector4(1.2, 3.4, 5.6, 7.8), Variant::Type::VECTOR3I);
+ CHECK(converted.get_type() == Variant::Type::VECTOR3I);
+ CHECK(converted == Variant(Vector3i(1, 3, 5)));
+
+ {
+ Basis basis = Basis::from_scale(Vector3(1.2, 3.4, 5.6));
+ Transform3D transform = Transform3D(basis, Vector3());
+
+ converted = VariantUtilityFunctions::type_convert(transform, Variant::Type::BASIS);
+ CHECK(converted.get_type() == Variant::Type::BASIS);
+ CHECK(converted == basis);
+
+ converted = VariantUtilityFunctions::type_convert(basis, Variant::Type::TRANSFORM3D);
+ CHECK(converted.get_type() == Variant::Type::TRANSFORM3D);
+ CHECK(converted == transform);
+
+ converted = VariantUtilityFunctions::type_convert(basis, Variant::Type::STRING);
+ CHECK(converted.get_type() == Variant::Type::STRING);
+ CHECK(converted == Variant("[X: (1.2, 0, 0), Y: (0, 3.4, 0), Z: (0, 0, 5.6)]"));
+ }
+
+ {
+ Array arr;
+ arr.push_back(1.2);
+ arr.push_back(3.4);
+ arr.push_back(5.6);
+
+ PackedFloat64Array packed;
+ packed.push_back(1.2);
+ packed.push_back(3.4);
+ packed.push_back(5.6);
+
+ converted = VariantUtilityFunctions::type_convert(arr, Variant::Type::PACKED_FLOAT64_ARRAY);
+ CHECK(converted.get_type() == Variant::Type::PACKED_FLOAT64_ARRAY);
+ CHECK(converted == packed);
+
+ converted = VariantUtilityFunctions::type_convert(packed, Variant::Type::ARRAY);
+ CHECK(converted.get_type() == Variant::Type::ARRAY);
+ CHECK(converted == arr);
+ }
+
+ {
+ // Check that using Variant::call_utility_function also works.
+ Vector<const Variant *> args;
+ Variant data_arg = "Hi!";
+ args.push_back(&data_arg);
+ Variant type_arg = Variant::Type::NIL;
+ args.push_back(&type_arg);
+ Callable::CallError call_error;
+ Variant::call_utility_function("type_convert", &converted, (const Variant **)args.ptr(), 2, call_error);
+ CHECK(converted.get_type() == Variant::Type::NIL);
+ CHECK(converted == Variant());
+
+ type_arg = Variant::Type::INT;
+ Variant::call_utility_function("type_convert", &converted, (const Variant **)args.ptr(), 2, call_error);
+ CHECK(converted.get_type() == Variant::Type::INT);
+ CHECK(converted == Variant(0));
+
+ data_arg = "123";
+ Variant::call_utility_function("type_convert", &converted, (const Variant **)args.ptr(), 2, call_error);
+ CHECK(converted.get_type() == Variant::Type::INT);
+ CHECK(converted == Variant(123));
+ }
+}
+
+} // namespace TestVariantUtility
+
+#endif // TEST_VARIANT_UTILITY_H
diff --git a/tests/scene/test_arraymesh.h b/tests/scene/test_arraymesh.h
index 0e97e7d75f..1623b41300 100644
--- a/tests/scene/test_arraymesh.h
+++ b/tests/scene/test_arraymesh.h
@@ -195,7 +195,7 @@ TEST_CASE("[SceneTree][ArrayMesh] Surface metadata tests.") {
}
SUBCASE("Returns correct format for the mesh") {
- auto format = RS::ARRAY_FORMAT_BLEND_SHAPE_MASK | RS::ARRAY_FORMAT_TEX_UV | RS::ARRAY_FORMAT_INDEX;
+ int format = RS::ARRAY_FORMAT_BLEND_SHAPE_MASK | RS::ARRAY_FORMAT_TEX_UV | RS::ARRAY_FORMAT_INDEX;
CHECK((mesh->surface_get_format(0) & format) != 0);
CHECK((mesh->surface_get_format(1) & format) != 0);
}
diff --git a/tests/scene/test_code_edit.h b/tests/scene/test_code_edit.h
index d6858fbcb4..8576b38ce2 100644
--- a/tests/scene/test_code_edit.h
+++ b/tests/scene/test_code_edit.h
@@ -2839,6 +2839,194 @@ TEST_CASE("[SceneTree][CodeEdit] folding") {
memdelete(code_edit);
}
+TEST_CASE("[SceneTree][CodeEdit] region folding") {
+ CodeEdit *code_edit = memnew(CodeEdit);
+ SceneTree::get_singleton()->get_root()->add_child(code_edit);
+ code_edit->grab_focus();
+
+ SUBCASE("[CodeEdit] region folding") {
+ code_edit->set_line_folding_enabled(true);
+
+ // Region tag detection.
+ code_edit->set_text("#region region_name\nline2\n#endregion");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ CHECK(code_edit->is_line_code_region_start(0));
+ CHECK_FALSE(code_edit->is_line_code_region_start(1));
+ CHECK_FALSE(code_edit->is_line_code_region_start(2));
+ CHECK_FALSE(code_edit->is_line_code_region_end(0));
+ CHECK_FALSE(code_edit->is_line_code_region_end(1));
+ CHECK(code_edit->is_line_code_region_end(2));
+
+ // Region tag customization.
+ code_edit->set_text("#region region_name\nline2\n#endregion\n#open region_name\nline2\n#close");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ CHECK(code_edit->is_line_code_region_start(0));
+ CHECK(code_edit->is_line_code_region_end(2));
+ CHECK_FALSE(code_edit->is_line_code_region_start(3));
+ CHECK_FALSE(code_edit->is_line_code_region_end(5));
+ code_edit->set_code_region_tags("open", "close");
+ CHECK_FALSE(code_edit->is_line_code_region_start(0));
+ CHECK_FALSE(code_edit->is_line_code_region_end(2));
+ CHECK(code_edit->is_line_code_region_start(3));
+ CHECK(code_edit->is_line_code_region_end(5));
+ code_edit->set_code_region_tags("region", "endregion");
+
+ // Setting identical start and end region tags should fail.
+ CHECK(code_edit->get_code_region_start_tag() == "region");
+ CHECK(code_edit->get_code_region_end_tag() == "endregion");
+ ERR_PRINT_OFF;
+ code_edit->set_code_region_tags("same_tag", "same_tag");
+ ERR_PRINT_ON;
+ CHECK(code_edit->get_code_region_start_tag() == "region");
+ CHECK(code_edit->get_code_region_end_tag() == "endregion");
+
+ // Region creation with selection adds start / close region lines.
+ code_edit->set_text("line1\nline2\nline3");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->select(1, 0, 1, 4);
+ code_edit->create_code_region();
+ CHECK(code_edit->is_line_code_region_start(1));
+ CHECK(code_edit->get_line(2).contains("line2"));
+ CHECK(code_edit->is_line_code_region_end(3));
+
+ // Region creation without any selection has no effect.
+ code_edit->set_text("line1\nline2\nline3");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->create_code_region();
+ CHECK(code_edit->get_text() == "line1\nline2\nline3");
+
+ // Region creation with multiple selections.
+ code_edit->set_text("line1\nline2\nline3");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->select(0, 0, 0, 4, 0);
+ code_edit->add_caret(2, 5);
+ code_edit->select(2, 0, 2, 5, 1);
+ code_edit->create_code_region();
+ CHECK(code_edit->get_text() == "#region New Code Region\nline1\n#endregion\nline2\n#region New Code Region\nline3\n#endregion");
+
+ // Two selections on the same line create only one region.
+ code_edit->set_text("test line1\ntest line2\ntest line3");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->select(0, 0, 1, 2, 0);
+ code_edit->add_caret(1, 4);
+ code_edit->select(1, 4, 2, 5, 1);
+ code_edit->create_code_region();
+ CHECK(code_edit->get_text() == "#region New Code Region\ntest line1\ntest line2\ntest line3\n#endregion");
+
+ // Region tag with // comment delimiter.
+ code_edit->set_text("//region region_name\nline2\n//endregion");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("//", "");
+ CHECK(code_edit->is_line_code_region_start(0));
+ CHECK(code_edit->is_line_code_region_end(2));
+
+ // Creating region with no valid one line comment delimiter has no effect.
+ code_edit->set_text("line1\nline2\nline3");
+ code_edit->clear_comment_delimiters();
+ code_edit->create_code_region();
+ CHECK(code_edit->get_text() == "line1\nline2\nline3");
+ code_edit->add_comment_delimiter("/*", "*/");
+ code_edit->create_code_region();
+ CHECK(code_edit->get_text() == "line1\nline2\nline3");
+
+ // Choose one line comment delimiter.
+ code_edit->set_text("//region region_name\nline2\n//endregion");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("/*", "*/");
+ code_edit->add_comment_delimiter("//", "");
+ CHECK(code_edit->is_line_code_region_start(0));
+ CHECK(code_edit->is_line_code_region_end(2));
+
+ // Update code region delimiter when removing comment delimiter.
+ code_edit->set_text("//region region_name\nline2\n//endregion\n#region region_name\nline2\n#endregion");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("//", "");
+ code_edit->add_comment_delimiter("#", "");
+ CHECK(code_edit->is_line_code_region_start(0));
+ CHECK(code_edit->is_line_code_region_end(2));
+ CHECK_FALSE(code_edit->is_line_code_region_start(3));
+ CHECK_FALSE(code_edit->is_line_code_region_end(5));
+ code_edit->remove_comment_delimiter("//");
+ CHECK_FALSE(code_edit->is_line_code_region_start(0));
+ CHECK_FALSE(code_edit->is_line_code_region_end(2));
+ CHECK(code_edit->is_line_code_region_start(3));
+ CHECK(code_edit->is_line_code_region_end(5));
+
+ // Update code region delimiter when clearing comment delimiters.
+ code_edit->set_text("//region region_name\nline2\n//endregion");
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("//", "");
+ CHECK(code_edit->is_line_code_region_start(0));
+ CHECK(code_edit->is_line_code_region_end(2));
+ code_edit->clear_comment_delimiters();
+ CHECK_FALSE(code_edit->is_line_code_region_start(0));
+ CHECK_FALSE(code_edit->is_line_code_region_end(2));
+
+ // Fold region.
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->set_text("#region region_name\nline2\nline3\n#endregion\nvisible line");
+ CHECK(code_edit->can_fold_line(0));
+ for (int i = 1; i < 5; i++) {
+ CHECK_FALSE(code_edit->can_fold_line(i));
+ }
+ for (int i = 0; i < 5; i++) {
+ CHECK_FALSE(code_edit->is_line_folded(i));
+ }
+ code_edit->fold_line(0);
+ CHECK(code_edit->is_line_folded(0));
+ CHECK(code_edit->get_next_visible_line_offset_from(1, 1) == 4);
+
+ // Region with no end can't be folded.
+ ERR_PRINT_OFF;
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->set_text("#region region_name\nline2\nline3\n#bad_end_tag\nvisible line");
+ CHECK_FALSE(code_edit->can_fold_line(0));
+ ERR_PRINT_ON;
+
+ // Bad nested region can't be folded.
+ ERR_PRINT_OFF;
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->set_text("#region without end\n#region region2\nline3\n#endregion\n#no_end");
+ CHECK_FALSE(code_edit->can_fold_line(0));
+ CHECK(code_edit->can_fold_line(1));
+ ERR_PRINT_ON;
+
+ // Nested region folding.
+ ERR_PRINT_OFF;
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->set_text("#region region1\n#region region2\nline3\n#endregion\n#endregion");
+ CHECK(code_edit->can_fold_line(0));
+ CHECK(code_edit->can_fold_line(1));
+ code_edit->fold_line(1);
+ CHECK(code_edit->get_next_visible_line_offset_from(2, 1) == 3);
+ code_edit->fold_line(0);
+ CHECK(code_edit->get_next_visible_line_offset_from(1, 1) == 4);
+ ERR_PRINT_ON;
+
+ // Unfolding a line inside a region unfold whole region.
+ code_edit->clear_comment_delimiters();
+ code_edit->add_comment_delimiter("#", "");
+ code_edit->set_text("#region region\ninside\nline3\n#endregion\nvisible");
+ code_edit->fold_line(0);
+ CHECK(code_edit->is_line_folded(0));
+ CHECK(code_edit->get_next_visible_line_offset_from(1, 1) == 4);
+ code_edit->unfold_line(1);
+ CHECK_FALSE(code_edit->is_line_folded(0));
+ }
+
+ memdelete(code_edit);
+}
+
TEST_CASE("[SceneTree][CodeEdit] completion") {
CodeEdit *code_edit = memnew(CodeEdit);
SceneTree::get_singleton()->get_root()->add_child(code_edit);
@@ -3446,7 +3634,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
}
SUBCASE("[CodeEdit] autocomplete suggestion order") {
- /* Favorize less fragmented suggestion. */
+ /* Prefer less fragmented suggestion. */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
@@ -3456,7 +3644,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
code_edit->confirm_code_completion();
CHECK(code_edit->get_line(0) == "test");
- /* Favorize suggestion starting from the string to complete (matching start). */
+ /* Prefer suggestion starting with the string to complete (matching start). */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
@@ -3466,7 +3654,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
code_edit->confirm_code_completion();
CHECK(code_edit->get_line(0) == "test");
- /* Favorize less fragment to matching start. */
+ /* Prefer less fragment over matching start. */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
@@ -3476,37 +3664,37 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
code_edit->confirm_code_completion();
CHECK(code_edit->get_line(0) == "stest");
- /* Favorize closer location. */
+ /* Prefer good capitalization. */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "test", "test");
- code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "test_bis", "test_bis", Color(1, 1, 1), Ref<Resource>(), Variant::NIL, CodeEdit::LOCATION_LOCAL);
+ code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "Test", "Test");
code_edit->update_code_completion_options();
code_edit->confirm_code_completion();
- CHECK(code_edit->get_line(0) == "test_bis");
+ CHECK(code_edit->get_line(0) == "test");
- /* Favorize matching start to location. */
+ /* Prefer matching start over good capitalization. */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
- code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "test", "test");
- code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "stest_bis", "test_bis", Color(1, 1, 1), Ref<Resource>(), Variant::NIL, CodeEdit::LOCATION_LOCAL);
+ code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "Test", "Test");
+ code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "stest_bis", "test_bis");
code_edit->update_code_completion_options();
code_edit->confirm_code_completion();
- CHECK(code_edit->get_line(0) == "test");
+ CHECK(code_edit->get_line(0) == "Test");
- /* Favorize good capitalization. */
+ /* Prefer closer location. */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "test", "test");
- code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "Test", "Test");
+ code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "test_bis", "test_bis", Color(1, 1, 1), Ref<Resource>(), Variant::NIL, CodeEdit::LOCATION_LOCAL);
code_edit->update_code_completion_options();
code_edit->confirm_code_completion();
- CHECK(code_edit->get_line(0) == "test");
+ CHECK(code_edit->get_line(0) == "test_bis");
- /* Favorize location to good capitalization. */
+ /* Prefer good capitalization over location. */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
@@ -3514,9 +3702,9 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "Test", "Test", Color(1, 1, 1), Ref<Resource>(), Variant::NIL, CodeEdit::LOCATION_LOCAL);
code_edit->update_code_completion_options();
code_edit->confirm_code_completion();
- CHECK(code_edit->get_line(0) == "Test");
+ CHECK(code_edit->get_line(0) == "test");
- /* Favorize string to complete being closest to the start of the suggestion (closest to start). */
+ /* Prefer the start of the string to complete being closest to the start of the suggestion (closest to start). */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
@@ -3526,12 +3714,12 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
code_edit->confirm_code_completion();
CHECK(code_edit->get_line(0) == "stest");
- /* Favorize good capitalization to closest to start. */
+ /* Prefer location over closest to start. */
code_edit->clear();
code_edit->insert_text_at_caret("te");
code_edit->set_caret_column(2);
- code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "sTest", "stest");
- code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "sstest", "sstest");
+ code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "stest", "stest");
+ code_edit->add_code_completion_option(CodeEdit::CodeCompletionKind::KIND_VARIABLE, "sstest", "sstest", Color(1, 1, 1), Ref<Resource>(), Variant::NIL, CodeEdit::LOCATION_LOCAL);
code_edit->update_code_completion_options();
code_edit->confirm_code_completion();
CHECK(code_edit->get_line(0) == "sstest");
diff --git a/tests/servers/rendering/test_shader_preprocessor.h b/tests/servers/rendering/test_shader_preprocessor.h
index d65eb522e8..e12da8a2db 100644
--- a/tests/servers/rendering/test_shader_preprocessor.h
+++ b/tests/servers/rendering/test_shader_preprocessor.h
@@ -66,7 +66,7 @@ String remove_spaces(String &p_str) {
for (int n = 0; n < p_str.size(); n++) {
// These test cases only use ASCII.
- auto c = static_cast<unsigned char>(p_str[n]);
+ unsigned char c = static_cast<unsigned char>(p_str[n]);
if (std::isblank(c)) {
has_removed = true;
} else {
@@ -92,7 +92,7 @@ String remove_spaces(String &p_str) {
String compact_spaces(String &p_str) {
Vector<String> lines = p_str.split("\n", false);
erase_all_empty(lines);
- for (auto &line : lines) {
+ for (String &line : lines) {
line = remove_spaces(line);
}
return String("\n").join(lines);
@@ -294,7 +294,7 @@ TEST_CASE("[ShaderPreprocessor] Concatenation sorting network") {
CHECK_SHADER_EQ(result, expected);
}
-TEST_CASE("[ShaderPreprocessor] Undefined behaviour") {
+TEST_CASE("[ShaderPreprocessor] Undefined behavior") {
// None of these are valid concatenation, nor valid shader code.
// Don't care about results, just make sure there's no crash.
const String filename("somefile.gdshader");
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index a4306db6f4..a43dfaa57f 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -89,6 +89,7 @@
#include "tests/core/variant/test_array.h"
#include "tests/core/variant/test_dictionary.h"
#include "tests/core/variant/test_variant.h"
+#include "tests/core/variant/test_variant_utility.h"
#include "tests/scene/test_animation.h"
#include "tests/scene/test_arraymesh.h"
#include "tests/scene/test_audio_stream_wav.h"
@@ -238,7 +239,9 @@ struct GodotTestCaseListener : public doctest::IReporter {
RenderingServerDefault::get_singleton()->set_render_loop_enabled(false);
// ThemeDB requires RenderingServer to initialize the default theme.
- // So we have to do this for each test case.
+ // 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();
physics_server_3d = PhysicsServer3DManager::get_singleton()->new_default_server();