summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/tests
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-01-29 21:00:26 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-01-29 21:00:26 +0100
commit745f8e112fcf5d61e0fc377bdbc2539dd6b16ef9 (patch)
tree63a2f13488c63482fdb0619778f6dd76ae525381 /modules/gdscript/tests
parentfa48a51183567934984b381ad8ec281cb24d66ba (diff)
downloadredot-engine-745f8e112fcf5d61e0fc377bdbc2539dd6b16ef9.tar.gz
Revert "Add UID support to GDScript files"
This reverts commit c7f68a27ec4b825302998eeb5a400f869cd21cf7. We still think GDScript files need UIDs to allow safe refactoring, but we're still debating what form those should take exactly. So far there seems to be agreement that it shouldn't be done via an annotation as implemented here, so we're reverting this one for now, to revisit the feature in a future PR.
Diffstat (limited to 'modules/gdscript/tests')
-rw-r--r--modules/gdscript/tests/scripts/parser/errors/uid_duplicate.gd5
-rw-r--r--modules/gdscript/tests/scripts/parser/errors/uid_duplicate.out2
-rw-r--r--modules/gdscript/tests/scripts/parser/errors/uid_invalid.gd4
-rw-r--r--modules/gdscript/tests/scripts/parser/errors/uid_invalid.out2
-rw-r--r--modules/gdscript/tests/scripts/parser/errors/uid_too_late.gd5
-rw-r--r--modules/gdscript/tests/scripts/parser/errors/uid_too_late.out2
-rw-r--r--modules/gdscript/tests/scripts/parser/features/uid.gd5
-rw-r--r--modules/gdscript/tests/scripts/parser/features/uid.out1
-rw-r--r--modules/gdscript/tests/test_gdscript_uid.h115
9 files changed, 0 insertions, 141 deletions
diff --git a/modules/gdscript/tests/scripts/parser/errors/uid_duplicate.gd b/modules/gdscript/tests/scripts/parser/errors/uid_duplicate.gd
deleted file mode 100644
index 4ded8e65db..0000000000
--- a/modules/gdscript/tests/scripts/parser/errors/uid_duplicate.gd
+++ /dev/null
@@ -1,5 +0,0 @@
-@uid("uid://c4ckv3ryprcn4")
-@uid("uid://c4ckv3ryprcn4")
-
-func test():
- pass
diff --git a/modules/gdscript/tests/scripts/parser/errors/uid_duplicate.out b/modules/gdscript/tests/scripts/parser/errors/uid_duplicate.out
deleted file mode 100644
index be1061401a..0000000000
--- a/modules/gdscript/tests/scripts/parser/errors/uid_duplicate.out
+++ /dev/null
@@ -1,2 +0,0 @@
-GDTEST_PARSER_ERROR
-"@uid" annotation can only be used once.
diff --git a/modules/gdscript/tests/scripts/parser/errors/uid_invalid.gd b/modules/gdscript/tests/scripts/parser/errors/uid_invalid.gd
deleted file mode 100644
index 114d5b7e98..0000000000
--- a/modules/gdscript/tests/scripts/parser/errors/uid_invalid.gd
+++ /dev/null
@@ -1,4 +0,0 @@
-@uid("not a valid uid")
-
-func test():
- pass
diff --git a/modules/gdscript/tests/scripts/parser/errors/uid_invalid.out b/modules/gdscript/tests/scripts/parser/errors/uid_invalid.out
deleted file mode 100644
index 83f9f63cbf..0000000000
--- a/modules/gdscript/tests/scripts/parser/errors/uid_invalid.out
+++ /dev/null
@@ -1,2 +0,0 @@
-GDTEST_PARSER_ERROR
-The annotated UID is invalid.
diff --git a/modules/gdscript/tests/scripts/parser/errors/uid_too_late.gd b/modules/gdscript/tests/scripts/parser/errors/uid_too_late.gd
deleted file mode 100644
index 2b332447b7..0000000000
--- a/modules/gdscript/tests/scripts/parser/errors/uid_too_late.gd
+++ /dev/null
@@ -1,5 +0,0 @@
-extends Object
-@uid("uid://c4ckv3ryprcn4")
-
-func test():
- pass
diff --git a/modules/gdscript/tests/scripts/parser/errors/uid_too_late.out b/modules/gdscript/tests/scripts/parser/errors/uid_too_late.out
deleted file mode 100644
index 328459923f..0000000000
--- a/modules/gdscript/tests/scripts/parser/errors/uid_too_late.out
+++ /dev/null
@@ -1,2 +0,0 @@
-GDTEST_PARSER_ERROR
-Annotation "@uid" must be at the top of the script, before "extends" and "class_name".
diff --git a/modules/gdscript/tests/scripts/parser/features/uid.gd b/modules/gdscript/tests/scripts/parser/features/uid.gd
deleted file mode 100644
index 4070500608..0000000000
--- a/modules/gdscript/tests/scripts/parser/features/uid.gd
+++ /dev/null
@@ -1,5 +0,0 @@
-@uid("uid://c4ckv3ryprcn4")
-extends Object
-
-func test():
- pass
diff --git a/modules/gdscript/tests/scripts/parser/features/uid.out b/modules/gdscript/tests/scripts/parser/features/uid.out
deleted file mode 100644
index d73c5eb7cd..0000000000
--- a/modules/gdscript/tests/scripts/parser/features/uid.out
+++ /dev/null
@@ -1 +0,0 @@
-GDTEST_OK
diff --git a/modules/gdscript/tests/test_gdscript_uid.h b/modules/gdscript/tests/test_gdscript_uid.h
deleted file mode 100644
index 918fe65890..0000000000
--- a/modules/gdscript/tests/test_gdscript_uid.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**************************************************************************/
-/* test_gdscript_uid.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_GDSCRIPT_UID_H
-#define TEST_GDSCRIPT_UID_H
-
-#ifdef TOOLS_ENABLED
-
-#include "core/io/resource_saver.h"
-#include "core/os/os.h"
-#include "gdscript_test_runner.h"
-
-#include "../gdscript.h"
-#include "tests/test_macros.h"
-
-namespace GDScriptTests {
-
-static HashMap<String, ResourceUID::ID> id_cache;
-
-ResourceUID::ID _resource_saver_get_resource_id_for_path(const String &p_path, bool p_generate) {
- return ResourceUID::get_singleton()->text_to_id("uid://baba");
-}
-
-static void test_script(const String &p_source, const String &p_target_source) {
- const String script_path = OS::get_singleton()->get_cache_path().path_join("script.gd");
-
- Ref<GDScript> script;
- script.instantiate();
- script->set_source_code(p_source);
- ResourceSaver::save(script, script_path);
-
- Ref<FileAccess> fa = FileAccess::open(script_path, FileAccess::READ);
- CHECK_EQ(fa->get_as_text(), p_target_source);
-}
-
-TEST_SUITE("[Modules][GDScript][UID]") {
- TEST_CASE("[ResourceSaver] Adding UID line to script") {
- init_language("modules/gdscript/tests/scripts");
- ResourceSaver::set_get_resource_id_for_path(_resource_saver_get_resource_id_for_path);
-
- const String source = R"(extends Node
-class_name TestClass
-)";
- const String final_source = R"(@uid("uid://baba") # Generated automatically, do not modify.
-extends Node
-class_name TestClass
-)";
-
- // Script has no UID, add it.
- test_script(source, final_source);
- }
-
- TEST_CASE("[ResourceSaver] Updating UID line in script") {
- init_language("modules/gdscript/tests/scripts");
- ResourceSaver::set_get_resource_id_for_path(_resource_saver_get_resource_id_for_path);
-
- const String wrong_id_source = R"(
-
-@uid(
- "uid://dead"
- ) # G
-extends Node
-class_name TestClass
-)";
- const String corrected_id_source = R"(
-
-@uid("uid://baba") # Generated automatically, do not modify.
-extends Node
-class_name TestClass
-)";
- const String correct_id_source = R"(@uid("uid://baba") # G
-extends Node
-class_name TestClass
-)";
-
- // Script has wrong UID saved. Remove it and add a correct one.
- // Inserts in the same line, but multiline annotations are flattened.
- test_script(wrong_id_source, corrected_id_source);
- // The stored UID is correct, so do not modify it.
- test_script(correct_id_source, correct_id_source);
- }
-}
-
-} // namespace GDScriptTests
-
-#endif
-
-#endif // TEST_GDSCRIPT_UID_H