summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2020-12-28 13:23:25 +0100
committerGitHub <noreply@github.com>2020-12-28 13:23:25 +0100
commitbe509bf5e4d00b33f2867e6d06a23285b2a8fd29 (patch)
tree975e0a7384bc6fc7cf5b73b9ddc1e8eef13579d8 /tests
parent886571e0fc54914f161ab3f1ccf9bfe40411bc20 (diff)
parent5b937d493f0046543a77a0be7920ad39f1e5fc3c (diff)
Merge pull request #44401 from madmiraal/rename-empty-is_empty
Rename empty() to is_empty()
Diffstat (limited to 'tests')
-rw-r--r--tests/test_class_db.h4
-rw-r--r--tests/test_list.h10
-rw-r--r--tests/test_math.cpp2
-rw-r--r--tests/test_shader_lang.cpp2
-rw-r--r--tests/test_string.h8
5 files changed, 13 insertions, 13 deletions
diff --git a/tests/test_class_db.h b/tests/test_class_db.h
index 9a30891c16..f95b98be15 100644
--- a/tests/test_class_db.h
+++ b/tests/test_class_db.h
@@ -397,7 +397,7 @@ void validate_method(const Context &p_context, const ExposedClass &p_class, cons
String type_error_msg;
bool arg_defval_assignable_to_type = arg_default_value_is_assignable_to_type(p_context, arg.defval, arg.type, &type_error_msg);
String err_msg = vformat("Invalid default value for parameter '%s' of method '%s.%s'.", arg.name, p_class.name, p_method.name);
- if (!type_error_msg.empty()) {
+ if (!type_error_msg.is_empty()) {
err_msg += " " + type_error_msg;
}
TEST_COND(!arg_defval_assignable_to_type, err_msg.utf8().get_data());
@@ -538,7 +538,7 @@ void add_exposed_classes(Context &r_context) {
int argc = method_info.arguments.size();
- if (method_info.name.empty()) {
+ if (method_info.name.is_empty()) {
continue;
}
diff --git a/tests/test_list.h b/tests/test_list.h
index 8d29bd907f..99d52bb9d1 100644
--- a/tests/test_list.h
+++ b/tests/test_list.h
@@ -57,7 +57,7 @@ TEST_CASE("[List] Push/pop back") {
CHECK(n->get() == "C");
CHECK(list.size() == 3);
- CHECK(!list.empty());
+ CHECK(!list.is_empty());
String v;
v = list.back()->get();
@@ -71,7 +71,7 @@ TEST_CASE("[List] Push/pop back") {
CHECK(v == "A");
CHECK(list.size() == 0);
- CHECK(list.empty());
+ CHECK(list.is_empty());
CHECK(list.back() == nullptr);
CHECK(list.front() == nullptr);
@@ -89,7 +89,7 @@ TEST_CASE("[List] Push/pop front") {
CHECK(n->get() == "C");
CHECK(list.size() == 3);
- CHECK(!list.empty());
+ CHECK(!list.is_empty());
String v;
v = list.front()->get();
@@ -103,7 +103,7 @@ TEST_CASE("[List] Push/pop front") {
CHECK(v == "A");
CHECK(list.size() == 0);
- CHECK(list.empty());
+ CHECK(list.is_empty());
CHECK(list.back() == nullptr);
CHECK(list.front() == nullptr);
@@ -252,7 +252,7 @@ TEST_CASE("[List] Clear") {
list.clear();
CHECK(list.size() == 0);
- CHECK(list.empty());
+ CHECK(list.is_empty());
}
TEST_CASE("[List] Invert") {
diff --git a/tests/test_math.cpp b/tests/test_math.cpp
index a7f99e5401..3d97c8bc45 100644
--- a/tests/test_math.cpp
+++ b/tests/test_math.cpp
@@ -513,7 +513,7 @@ MainLoop *test() {
List<String> cmdlargs = OS::get_singleton()->get_cmdline_args();
- if (cmdlargs.empty()) {
+ if (cmdlargs.is_empty()) {
//try editor!
return nullptr;
}
diff --git a/tests/test_shader_lang.cpp b/tests/test_shader_lang.cpp
index e79c83b001..2233b4464e 100644
--- a/tests/test_shader_lang.cpp
+++ b/tests/test_shader_lang.cpp
@@ -308,7 +308,7 @@ static Error recreate_code(void *p_str, SL::ShaderNode *p_program) {
MainLoop *test() {
List<String> cmdlargs = OS::get_singleton()->get_cmdline_args();
- if (cmdlargs.empty()) {
+ if (cmdlargs.is_empty()) {
//try editor!
print_line("usage: godot -test shader_lang <shader>");
return nullptr;
diff --git a/tests/test_string.h b/tests/test_string.h
index 3c5d4a2f01..910ff6361e 100644
--- a/tests/test_string.h
+++ b/tests/test_string.h
@@ -244,11 +244,11 @@ TEST_CASE("[String] Testing size and length of string") {
}
TEST_CASE("[String] Testing for empty string") {
- CHECK(!String("Mellon").empty());
+ CHECK(!String("Mellon").is_empty());
// do this more than once, to check for string corruption
- CHECK(String("").empty());
- CHECK(String("").empty());
- CHECK(String("").empty());
+ CHECK(String("").is_empty());
+ CHECK(String("").is_empty());
+ CHECK(String("").is_empty());
}
TEST_CASE("[String] Test chr") {