godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79980 from bruvzg/fix_test_str_errs 

[String] Fix Unicode parsing error message encoding and related JSON tests.
This commit is contained in:
Rémi Verschelde 2023-08-09 15:20:16 +02:00
parent 3a0086eb6f 84a6f0d232
commit 835957b1fc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/string/ustring.cpp
View File

@ -1750,7 +1750,7 @@ Vector<uint8_t> String::hex_decode() const {
void String::print_unicode_error(const String &p_message, bool p_critical) const { void String::print_unicode_error(const String &p_message, bool p_critical) const {
if (p_critical) { if (p_critical) {
print_error(vformat("Unicode parsing error, some characters were replaced with <20> (U+FFFD): %s", p_message)); print_error(vformat(U"Unicode parsing error, some characters were replaced with <20> (U+FFFD): %s", p_message));
} else { } else {
print_error(vformat("Unicode parsing error: %s", p_message)); print_error(vformat("Unicode parsing error: %s", p_message));
} }

10
tests/core/io/test_json.h
View File

@ -186,20 +186,21 @@ TEST_CASE("[JSON] Parsing escape sequences") {
} }
SUBCASE("Valid unicode escape sequences") { SUBCASE("Valid unicode escape sequences") {
String json_string = "\"\\u0000\""; String json_string = "\"\\u0020\"";
json.parse(json_string); json.parse(json_string);
CHECK_MESSAGE( CHECK_MESSAGE(
json.get_error_line() == 0, json.get_error_line() == 0,
vformat("Parsing valid unicode escape sequence with value `0000` as JSON should parse successfully.")); vformat("Parsing valid unicode escape sequence with value `0020` as JSON should parse successfully."));
String json_value = json.get_data(); String json_value = json.get_data();
CHECK_MESSAGE( CHECK_MESSAGE(
json_value == "\0", json_value == " ",
vformat("Parsing valid unicode escape sequence with value `0000` as JSON should return the expected value.")); vformat("Parsing valid unicode escape sequence with value `0020` as JSON should return the expected value."));
} }
SUBCASE("Invalid escape sequences") { SUBCASE("Invalid escape sequences") {
ERR_PRINT_OFF
for (char32_t i = 0; i < 128; i++) { for (char32_t i = 0; i < 128; i++) {
bool skip = false; bool skip = false;
for (int j = 0; j < valid_escapes.size(); j++) { for (int j = 0; j < valid_escapes.size(); j++) {
@ -228,6 +229,7 @@ TEST_CASE("[JSON] Parsing escape sequences") {
err == ERR_PARSE_ERROR, err == ERR_PARSE_ERROR,
vformat("Parsing invalid escape sequence with ASCII value `%d` as JSON should fail to parse with ERR_PARSE_ERROR.", i)); vformat("Parsing invalid escape sequence with ASCII value `%d` as JSON should fail to parse with ERR_PARSE_ERROR.", i));
} }
ERR_PRINT_ON
} }
} }
} // namespace TestJSON } // namespace TestJSON