asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #89194 from miv391/fix-string-begins-with

Browse source 
Fix `String::begins_with` when both strings are empty
This commit is contained in:
Rémi Verschelde 2024-03-05 23:44:46 +01:00
commit dc55f8b6b2
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 42 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/string/ustring.cpp
View file

@ -3329,10 +3329,14 @@ bool String::begins_with(const String &p_string) const {
bool String::begins_with(const char *p_string) const {
int l = length();
if (l == 0 || !p_string) {
if (!p_string) {
return false;
}
if (l == 0) {
return *p_string == 0;
}
const char32_t *str = &operator[](0);
int i = 0;

63
tests/core/string/test_string.h
View file

@ -642,48 +642,59 @@ struct test_27_data {
TEST_CASE("[String] Begins with") {
test_27_data tc[] = {
// Test cases for true:
{ "res://foobar", "res://", true },
{ "abc", "abc", true },
{ "abc", "", true },
{ "", "", true },
// Test cases for false:
{ "res", "res://", false },
{ "abc", "abc", true }
{ "abcdef", "foo", false },
{ "abc", "ax", false },
{ "", "abc", false }
};
size_t count = sizeof(tc) / sizeof(tc[0]);
bool state = true;
for (size_t i = 0; state && i < count; ++i) {
for (size_t i = 0; i < count; ++i) {
String s = tc[i].data;
state = s.begins_with(tc[i].part) == tc[i].expected;
if (state) {
String sb = tc[i].part;
state = s.begins_with(sb) == tc[i].expected;
}
CHECK(state);
if (!state) {
break;
}
};
CHECK(state);
CHECK_MESSAGE(state, "first check failed at: ", i);
String sb = tc[i].part;
state = s.begins_with(sb) == tc[i].expected;
CHECK_MESSAGE(state, "second check failed at: ", i);
}
// Test "const char *" version also with nullptr.
String s("foo");
state = s.begins_with(nullptr) == false;
CHECK_MESSAGE(state, "nullptr check failed");
String empty("");
state = empty.begins_with(nullptr) == false;
CHECK_MESSAGE(state, "nullptr check with empty string failed");
}
TEST_CASE("[String] Ends with") {
test_27_data tc[] = {
// test cases for true:
{ "res://foobar", "foobar", true },
{ "abc", "abc", true },
{ "abc", "", true },
{ "", "", true },
// test cases for false:
{ "res", "res://", false },
{ "abc", "abc", true }
{ "", "abc", false },
{ "abcdef", "foo", false },
{ "abc", "xc", false }
};
size_t count = sizeof(tc) / sizeof(tc[0]);
bool state = true;
for (size_t i = 0; state && i < count; ++i) {
for (size_t i = 0; i < count; ++i) {
String s = tc[i].data;
state = s.ends_with(tc[i].part) == tc[i].expected;
if (state) {
String sb = tc[i].part;
state = s.ends_with(sb) == tc[i].expected;
}
CHECK(state);
if (!state) {
break;
}
};
CHECK(state);
String sb = tc[i].part;
bool state = s.ends_with(sb) == tc[i].expected;
CHECK_MESSAGE(state, "check failed at: ", i);
}
}
TEST_CASE("[String] format") {