From c6ca09dc6f0fdf693c2a4445e556861691a81152 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 15 Sep 2021 19:09:34 +0200 Subject: Add more integration tests to the GDScript test suite This also fixes a typo in the `bitwise_float_right_operand.gd` test. --- .../gdscript/tests/scripts/parser/errors/brace_syntax.gd | 3 +++ .../gdscript/tests/scripts/parser/errors/brace_syntax.out | 2 ++ .../tests/scripts/parser/errors/invalid_escape_sequence.gd | 2 ++ .../tests/scripts/parser/errors/invalid_escape_sequence.out | 2 ++ .../tests/scripts/parser/errors/invalid_ternary_operator.gd | 5 +++++ .../scripts/parser/errors/invalid_ternary_operator.out | 2 ++ .../tests/scripts/parser/errors/vcs_conflict_marker.gd | 13 +++++++++++++ .../tests/scripts/parser/errors/vcs_conflict_marker.out | 2 ++ 8 files changed, 31 insertions(+) create mode 100644 modules/gdscript/tests/scripts/parser/errors/brace_syntax.gd create mode 100644 modules/gdscript/tests/scripts/parser/errors/brace_syntax.out create mode 100644 modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.gd create mode 100644 modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.out create mode 100644 modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.gd create mode 100644 modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.out create mode 100644 modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.gd create mode 100644 modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.out (limited to 'modules/gdscript/tests/scripts/parser/errors') diff --git a/modules/gdscript/tests/scripts/parser/errors/brace_syntax.gd b/modules/gdscript/tests/scripts/parser/errors/brace_syntax.gd new file mode 100644 index 0000000000..ab66537c93 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/brace_syntax.gd @@ -0,0 +1,3 @@ +func test() { + print("Hello world!"); +} diff --git a/modules/gdscript/tests/scripts/parser/errors/brace_syntax.out b/modules/gdscript/tests/scripts/parser/errors/brace_syntax.out new file mode 100644 index 0000000000..2f37a740ab --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/brace_syntax.out @@ -0,0 +1,2 @@ +GDTEST_PARSER_ERROR +Expected ":" after function declaration. diff --git a/modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.gd b/modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.gd new file mode 100644 index 0000000000..3b52f6e324 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.gd @@ -0,0 +1,2 @@ +func test(): + var escape = "invalid escape \h <- here" diff --git a/modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.out b/modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.out new file mode 100644 index 0000000000..32b4d004db --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/invalid_escape_sequence.out @@ -0,0 +1,2 @@ +GDTEST_PARSER_ERROR +Invalid escape in string. diff --git a/modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.gd b/modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.gd new file mode 100644 index 0000000000..c835ce15e1 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.gd @@ -0,0 +1,5 @@ +func test(): + var amount = 50 + # C-style ternary operator is invalid in GDScript. + # The valid syntax is `"yes" if amount < 60 else "no"`, like in Python. + var ternary = amount < 60 ? "yes" : "no" diff --git a/modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.out b/modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.out new file mode 100644 index 0000000000..ac82d691b7 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/invalid_ternary_operator.out @@ -0,0 +1,2 @@ +GDTEST_PARSER_ERROR +Unexpected "?" in source. If you want a ternary operator, use "truthy_value if true_condition else falsy_value". diff --git a/modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.gd b/modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.gd new file mode 100644 index 0000000000..8850892f2d --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.gd @@ -0,0 +1,13 @@ +# The VCS conflict marker has only 6 `=` signs instead of 7 to prevent editors like +# Visual Studio Code from recognizing it as an actual VCS conflict marker. +# Nonetheless, the GDScript parser is still expected to find and report the VCS +# conflict marker error correctly. + +<<<<<<< HEAD +Hello world +====== +Goodbye +>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086 + +func test(): + pass diff --git a/modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.out b/modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.out new file mode 100644 index 0000000000..df9dab2223 --- /dev/null +++ b/modules/gdscript/tests/scripts/parser/errors/vcs_conflict_marker.out @@ -0,0 +1,2 @@ +GDTEST_PARSER_ERROR +Unexpected "VCS conflict marker" in class body. -- cgit v1.2.3