summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/tests/scripts/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gdscript/tests/scripts/runtime')
-rw-r--r--modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.gd14
-rw-r--r--modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.out3
-rw-r--r--modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd28
-rw-r--r--modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out4
4 files changed, 32 insertions, 17 deletions
diff --git a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.gd b/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.gd
deleted file mode 100644
index 55be021a90..0000000000
--- a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.gd
+++ /dev/null
@@ -1,14 +0,0 @@
-# https://github.com/godotengine/godot/issues/60145
-
-func test():
- match "abc":
- &"abc":
- print("String matched StringName")
- _:
- print("no match")
-
- match &"abc":
- "abc":
- print("StringName matched String")
- _:
- print("no match")
diff --git a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.out b/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.out
deleted file mode 100644
index 9d5a18da3d..0000000000
--- a/modules/gdscript/tests/scripts/runtime/features/match_string_stringname_equivalent.out
+++ /dev/null
@@ -1,3 +0,0 @@
-GDTEST_OK
-String matched StringName
-StringName matched String
diff --git a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd
index f8bd46523e..0dd40520b0 100644
--- a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd
+++ b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.gd
@@ -1,4 +1,8 @@
# https://github.com/godotengine/godot/issues/64171
+# https://github.com/godotengine/godot/issues/60145
+
+var s = "abc"
+var sn = &"abc"
func test():
print("Compare ==: ", "abc" == &"abc")
@@ -9,3 +13,27 @@ func test():
print("Concat: ", "abc" + &"def")
print("Concat: ", &"abc" + "def")
print("Concat: ", &"abc" + &"def")
+
+ match "abc":
+ &"abc":
+ print("String matched StringName literal")
+ _:
+ print("no Match")
+
+ match &"abc":
+ "abc":
+ print("StringName matched String literal")
+ _:
+ print("no Match")
+
+ match "abc":
+ sn:
+ print("String matched StringName")
+ _:
+ print("no match")
+
+ match &"abc":
+ s:
+ print("StringName matched String")
+ _:
+ print("no match")
diff --git a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out
index 7e9c364b60..440b613099 100644
--- a/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out
+++ b/modules/gdscript/tests/scripts/runtime/features/string_stringname_equivalent.out
@@ -6,3 +6,7 @@ Compare !=: false
Concat: abcdef
Concat: abcdef
Concat: abcdef
+String matched StringName literal
+StringName matched String literal
+String matched StringName
+StringName matched String