From a0dbdcc3abbd3e6307c6e68d0e60f8c0fa31d576 Mon Sep 17 00:00:00 2001
From: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>
Date: Mon, 6 May 2024 16:20:20 +0200
Subject: Replace `find` with `contains/has` where applicable

* Replaces `find(...) != -1` with `contains` for `String`
* Replaces `find(...) == -1` with `!contains` for `String`
* Replaces `find(...) != -1` with `has` for containers
* Replaces `find(...) == -1` with `!has` for containers
---
 tests/core/object/test_class_db.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests/core/object/test_class_db.h')

diff --git a/tests/core/object/test_class_db.h b/tests/core/object/test_class_db.h
index fb62d0f056..381d759e5b 100644
--- a/tests/core/object/test_class_db.h
+++ b/tests/core/object/test_class_db.h
@@ -195,12 +195,12 @@ struct Context {
 	}
 
 	bool has_type(const TypeReference &p_type_ref) const {
-		if (builtin_types.find(p_type_ref.name) >= 0) {
+		if (builtin_types.has(p_type_ref.name)) {
 			return true;
 		}
 
 		if (p_type_ref.is_enum) {
-			if (enum_types.find(p_type_ref.name) >= 0) {
+			if (enum_types.has(p_type_ref.name)) {
 				return true;
 			}
 
@@ -355,7 +355,7 @@ void validate_property(const Context &p_context, const ExposedClass &p_class, co
 			const ArgumentData &idx_arg = getter->arguments.front()->get();
 			if (idx_arg.type.name != p_context.names_cache.int_type) {
 				// If not an int, it can be an enum
-				TEST_COND(p_context.enum_types.find(idx_arg.type.name) < 0,
+				TEST_COND(!p_context.enum_types.has(idx_arg.type.name),
 						"Invalid type '", idx_arg.type.name, "' for index argument of property getter: '", p_class.name, ".", String(p_prop.name), "'.");
 			}
 		}
@@ -367,7 +367,7 @@ void validate_property(const Context &p_context, const ExposedClass &p_class, co
 			if (idx_arg.type.name != p_context.names_cache.int_type) {
 				// Assume the index parameter is an enum
 				// If not an int, it can be an enum
-				TEST_COND(p_context.enum_types.find(idx_arg.type.name) < 0,
+				TEST_COND(!p_context.enum_types.has(idx_arg.type.name),
 						"Invalid type '", idx_arg.type.name, "' for index argument of property setter: '", p_class.name, ".", String(p_prop.name), "'.");
 			}
 		}
@@ -736,7 +736,7 @@ void add_exposed_classes(Context &r_context) {
 
 			for (const StringName &E : K.value.constants) {
 				const StringName &constant_name = E;
-				TEST_FAIL_COND(String(constant_name).find("::") != -1,
+				TEST_FAIL_COND(String(constant_name).contains("::"),
 						"Enum constant contains '::', check bindings to remove the scope: '",
 						String(class_name), ".", String(enum_.name), ".", String(constant_name), "'.");
 				int64_t *value = class_info->constant_map.getptr(constant_name);
@@ -758,7 +758,7 @@ void add_exposed_classes(Context &r_context) {
 
 		for (const String &E : constants) {
 			const String &constant_name = E;
-			TEST_FAIL_COND(constant_name.find("::") != -1,
+			TEST_FAIL_COND(constant_name.contains("::"),
 					"Constant contains '::', check bindings to remove the scope: '",
 					String(class_name), ".", constant_name, "'.");
 			int64_t *value = class_info->constant_map.getptr(StringName(E));
-- 
cgit v1.2.3