From 99a282f6319d0c7642f589163b955a636610719a Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Sat, 6 Nov 2021 16:05:33 -0500 Subject: [PATCH] Move and organize tests into subfolders --- tests/SCsub | 5 + tests/{ => core/io}/test_config_file.h | 1 + tests/{ => core/io}/test_file_access.h | 3 +- tests/{ => core/io}/test_image.h | 4 +- tests/{ => core/io}/test_json.h | 0 tests/{ => core/io}/test_marshalls.h | 0 tests/{ => core/io}/test_pck_packer.h | 1 + tests/{ => core/io}/test_resource.h | 0 tests/{ => core/io}/test_xml_parser.h | 3 - tests/{ => core/math}/test_aabb.h | 4 +- tests/{ => core/math}/test_astar.h | 5 - tests/{ => core/math}/test_basis.h | 3 +- tests/{ => core/math}/test_color.h | 2 +- tests/{ => core/math}/test_expression.h | 0 tests/{ => core/math}/test_geometry_2d.h | 1 - tests/{ => core/math}/test_geometry_3d.h | 4 - tests/{ => core/math}/test_math.cpp | 14 +-- tests/{ => core/math}/test_math.h | 2 +- .../math}/test_random_number_generator.h | 0 tests/{ => core/math}/test_rect2.h | 0 tests/{ => core/object}/test_class_db.h | 9 +- tests/{ => core/object}/test_method_bind.h | 4 - tests/{ => core/object}/test_object.h | 4 +- tests/{ => core/string}/test_node_path.h | 2 +- tests/{ => core/string}/test_string.h | 8 -- tests/{ => core/string}/test_translation.h | 3 +- .../{ => core/templates}/test_command_queue.h | 4 +- tests/{ => core/templates}/test_list.h | 0 .../{ => core/templates}/test_local_vector.h | 0 tests/{ => core/templates}/test_lru.h | 1 - .../{ => core/templates}/test_oa_hash_map.cpp | 0 tests/{ => core/templates}/test_oa_hash_map.h | 2 +- .../templates}/test_ordered_hash_map.h | 3 - tests/{ => core/templates}/test_paged_array.h | 0 tests/{ => core/templates}/test_vector.h | 0 tests/{ => core}/test_crypto.h | 1 - tests/{ => core}/test_hashing_context.h | 0 tests/{ => core}/test_time.h | 0 tests/{ => core/variant}/test_array.h | 6 -- tests/{ => core/variant}/test_dictionary.h | 3 - tests/{ => core/variant}/test_variant.h | 0 tests/{ => scene}/test_code_edit.h | 5 - tests/{ => scene}/test_curve.h | 2 +- tests/{ => scene}/test_gradient.h | 2 - tests/{ => scene}/test_gui.cpp | 13 +-- tests/{ => scene}/test_gui.h | 2 +- tests/{ => scene}/test_path_3d.h | 1 - tests/{ => scene}/test_path_follow_2d.h | 1 - tests/{ => scene}/test_path_follow_3d.h | 1 - tests/{ => servers}/test_physics_2d.cpp | 5 - tests/{ => servers}/test_physics_2d.h | 2 +- tests/{ => servers}/test_physics_3d.cpp | 6 +- tests/{ => servers}/test_physics_3d.h | 2 +- tests/{ => servers}/test_render.cpp | 5 - tests/{ => servers}/test_render.h | 4 +- tests/{ => servers}/test_shader_lang.cpp | 5 - tests/{ => servers}/test_shader_lang.h | 2 +- tests/{ => servers}/test_text_server.h | 0 tests/test_macros.h | 6 +- tests/test_main.cpp | 102 +++++++++--------- tests/test_tools.h | 2 - tests/test_utils.cpp | 2 +- tests/test_utils.h | 2 +- 63 files changed, 90 insertions(+), 184 deletions(-) rename tests/{ => core/io}/test_config_file.h (99%) rename tests/{ => core/io}/test_file_access.h (98%) rename tests/{ => core/io}/test_image.h (99%) rename tests/{ => core/io}/test_json.h (100%) rename tests/{ => core/io}/test_marshalls.h (100%) rename tests/{ => core/io}/test_pck_packer.h (99%) rename tests/{ => core/io}/test_resource.h (100%) rename tests/{ => core/io}/test_xml_parser.h (98%) rename tests/{ => core/math}/test_aabb.h (99%) rename tests/{ => core/math}/test_astar.h (99%) rename tests/{ => core/math}/test_basis.h (99%) rename tests/{ => core/math}/test_color.h (99%) rename tests/{ => core/math}/test_expression.h (100%) rename tests/{ => core/math}/test_geometry_2d.h (99%) rename tests/{ => core/math}/test_geometry_3d.h (99%) rename tests/{ => core/math}/test_math.cpp (97%) rename tests/{ => core/math}/test_math.h (98%) rename tests/{ => core/math}/test_random_number_generator.h (100%) rename tests/{ => core/math}/test_rect2.h (100%) rename tests/{ => core/object}/test_class_db.h (99%) rename tests/{ => core/object}/test_method_bind.h (99%) rename tests/{ => core/object}/test_object.h (98%) rename tests/{ => core/string}/test_node_path.h (99%) rename tests/{ => core/string}/test_string.h (99%) rename tests/{ => core/string}/test_translation.h (99%) rename tests/{ => core/templates}/test_command_queue.h (99%) rename tests/{ => core/templates}/test_list.h (100%) rename tests/{ => core/templates}/test_local_vector.h (100%) rename tests/{ => core/templates}/test_lru.h (98%) rename tests/{ => core/templates}/test_oa_hash_map.cpp (100%) rename tests/{ => core/templates}/test_oa_hash_map.h (98%) rename tests/{ => core/templates}/test_ordered_hash_map.h (98%) rename tests/{ => core/templates}/test_paged_array.h (100%) rename tests/{ => core/templates}/test_vector.h (100%) rename tests/{ => core}/test_crypto.h (99%) rename tests/{ => core}/test_hashing_context.h (100%) rename tests/{ => core}/test_time.h (100%) rename tests/{ => core/variant}/test_array.h (98%) rename tests/{ => core/variant}/test_dictionary.h (99%) rename tests/{ => core/variant}/test_variant.h (100%) rename tests/{ => scene}/test_code_edit.h (99%) rename tests/{ => scene}/test_curve.h (99%) rename tests/{ => scene}/test_gradient.h (99%) rename tests/{ => scene}/test_gui.cpp (96%) rename tests/{ => scene}/test_gui.h (98%) rename tests/{ => scene}/test_path_3d.h (99%) rename tests/{ => scene}/test_path_follow_2d.h (99%) rename tests/{ => scene}/test_path_follow_3d.h (99%) rename tests/{ => servers}/test_physics_2d.cpp (99%) rename tests/{ => servers}/test_physics_2d.h (98%) rename tests/{ => servers}/test_physics_3d.cpp (98%) rename tests/{ => servers}/test_physics_3d.h (98%) rename tests/{ => servers}/test_render.cpp (98%) rename tests/{ => servers}/test_render.h (98%) rename tests/{ => servers}/test_shader_lang.cpp (98%) rename tests/{ => servers}/test_shader_lang.h (98%) rename tests/{ => servers}/test_text_server.h (100%) diff --git a/tests/SCsub b/tests/SCsub index 0f3c14f0bd..31466fffc1 100644 --- a/tests/SCsub +++ b/tests/SCsub @@ -22,6 +22,11 @@ if env_tests["platform"] == "windows": if env_tests.msvc: env_tests.Append(CCFLAGS=["/bigobj"]) +env_tests.add_source_files(env.tests_sources, "core/*.cpp") +env_tests.add_source_files(env.tests_sources, "core/math/*.cpp") +env_tests.add_source_files(env.tests_sources, "core/templates/*.cpp") +env_tests.add_source_files(env.tests_sources, "scene/*.cpp") +env_tests.add_source_files(env.tests_sources, "servers/*.cpp") env_tests.add_source_files(env.tests_sources, "*.cpp") lib = env_tests.add_library("tests", env.tests_sources) diff --git a/tests/test_config_file.h b/tests/core/io/test_config_file.h similarity index 99% rename from tests/test_config_file.h rename to tests/core/io/test_config_file.h index e3f40e16fd..f6fbaf9a88 100644 --- a/tests/test_config_file.h +++ b/tests/core/io/test_config_file.h @@ -32,6 +32,7 @@ #define TEST_CONFIG_FILE_H #include "core/io/config_file.h" +#include "core/os/os.h" #include "tests/test_macros.h" diff --git a/tests/test_file_access.h b/tests/core/io/test_file_access.h similarity index 98% rename from tests/test_file_access.h rename to tests/core/io/test_file_access.h index b3da16c1d1..4ffc57afe4 100644 --- a/tests/test_file_access.h +++ b/tests/core/io/test_file_access.h @@ -32,7 +32,8 @@ #define TEST_FILE_ACCESS_H #include "core/io/file_access.h" -#include "test_utils.h" +#include "tests/test_macros.h" +#include "tests/test_utils.h" namespace TestFileAccess { diff --git a/tests/test_image.h b/tests/core/io/test_image.h similarity index 99% rename from tests/test_image.h rename to tests/core/io/test_image.h index 99c2a9380d..c4c5f1e18b 100644 --- a/tests/test_image.h +++ b/tests/core/io/test_image.h @@ -31,10 +31,10 @@ #ifndef TEST_IMAGE_H #define TEST_IMAGE_H -#include "core/io/file_access_pack.h" #include "core/io/image.h" -#include "test_utils.h" +#include "core/os/os.h" +#include "tests/test_utils.h" #include "thirdparty/doctest/doctest.h" namespace TestImage { diff --git a/tests/test_json.h b/tests/core/io/test_json.h similarity index 100% rename from tests/test_json.h rename to tests/core/io/test_json.h diff --git a/tests/test_marshalls.h b/tests/core/io/test_marshalls.h similarity index 100% rename from tests/test_marshalls.h rename to tests/core/io/test_marshalls.h diff --git a/tests/test_pck_packer.h b/tests/core/io/test_pck_packer.h similarity index 99% rename from tests/test_pck_packer.h rename to tests/core/io/test_pck_packer.h index 06e4e64963..ae51d58522 100644 --- a/tests/test_pck_packer.h +++ b/tests/core/io/test_pck_packer.h @@ -35,6 +35,7 @@ #include "core/io/pck_packer.h" #include "core/os/os.h" +#include "tests/test_utils.h" #include "thirdparty/doctest/doctest.h" namespace TestPCKPacker { diff --git a/tests/test_resource.h b/tests/core/io/test_resource.h similarity index 100% rename from tests/test_resource.h rename to tests/core/io/test_resource.h diff --git a/tests/test_xml_parser.h b/tests/core/io/test_xml_parser.h similarity index 98% rename from tests/test_xml_parser.h rename to tests/core/io/test_xml_parser.h index 55de048d6a..2d00f29ddf 100644 --- a/tests/test_xml_parser.h +++ b/tests/core/io/test_xml_parser.h @@ -31,10 +31,7 @@ #ifndef TEST_XML_PARSER_H #define TEST_XML_PARSER_H -#include - #include "core/io/xml_parser.h" -#include "core/string/ustring.h" #include "tests/test_macros.h" diff --git a/tests/test_aabb.h b/tests/core/math/test_aabb.h similarity index 99% rename from tests/test_aabb.h rename to tests/core/math/test_aabb.h index 0312e185a1..b838bed171 100644 --- a/tests/test_aabb.h +++ b/tests/core/math/test_aabb.h @@ -32,10 +32,8 @@ #define TEST_AABB_H #include "core/math/aabb.h" -#include "core/string/print_string.h" -#include "tests/test_macros.h" -#include "thirdparty/doctest/doctest.h" +#include "tests/test_macros.h" namespace TestAABB { diff --git a/tests/test_astar.h b/tests/core/math/test_astar.h similarity index 99% rename from tests/test_astar.h rename to tests/core/math/test_astar.h index 137c477946..2c183374ac 100644 --- a/tests/test_astar.h +++ b/tests/core/math/test_astar.h @@ -32,11 +32,6 @@ #define TEST_ASTAR_H #include "core/math/a_star.h" -#include "core/math/math_funcs.h" -#include "core/os/os.h" - -#include -#include #include "tests/test_macros.h" diff --git a/tests/test_basis.h b/tests/core/math/test_basis.h similarity index 99% rename from tests/test_basis.h rename to tests/core/math/test_basis.h index b254d9fb7f..500c069a33 100644 --- a/tests/test_basis.h +++ b/tests/core/math/test_basis.h @@ -31,9 +31,8 @@ #ifndef TEST_BASIS_H #define TEST_BASIS_H +#include "core/math/basis.h" #include "core/math/random_number_generator.h" -#include "core/os/os.h" -#include "core/string/ustring.h" #include "tests/test_macros.h" diff --git a/tests/test_color.h b/tests/core/math/test_color.h similarity index 99% rename from tests/test_color.h rename to tests/core/math/test_color.h index bffa890ae2..82cf786f7a 100644 --- a/tests/test_color.h +++ b/tests/core/math/test_color.h @@ -33,7 +33,7 @@ #include "core/math/color.h" -#include "thirdparty/doctest/doctest.h" +#include "tests/test_macros.h" namespace TestColor { diff --git a/tests/test_expression.h b/tests/core/math/test_expression.h similarity index 100% rename from tests/test_expression.h rename to tests/core/math/test_expression.h diff --git a/tests/test_geometry_2d.h b/tests/core/math/test_geometry_2d.h similarity index 99% rename from tests/test_geometry_2d.h rename to tests/core/math/test_geometry_2d.h index 25af8c355e..8f6669b572 100644 --- a/tests/test_geometry_2d.h +++ b/tests/core/math/test_geometry_2d.h @@ -32,7 +32,6 @@ #define TEST_GEOMETRY_2D_H #include "core/math/geometry_2d.h" -#include "core/templates/vector.h" #include "thirdparty/doctest/doctest.h" diff --git a/tests/test_geometry_3d.h b/tests/core/math/test_geometry_3d.h similarity index 99% rename from tests/test_geometry_3d.h rename to tests/core/math/test_geometry_3d.h index ae30737fe2..f42003ffcf 100644 --- a/tests/test_geometry_3d.h +++ b/tests/core/math/test_geometry_3d.h @@ -32,11 +32,7 @@ #define TEST_GEOMETRY_3D_H #include "core/math/geometry_3d.h" -#include "core/math/plane.h" -#include "core/math/random_number_generator.h" -#include "core/math/vector3.h" #include "tests/test_macros.h" -#include "vector" namespace TestGeometry3D { TEST_CASE("[Geometry3D] Closest Points Between Segments") { diff --git a/tests/test_math.cpp b/tests/core/math/test_math.cpp similarity index 97% rename from tests/test_math.cpp rename to tests/core/math/test_math.cpp index 72272382ce..6ec9bc2473 100644 --- a/tests/test_math.cpp +++ b/tests/core/math/test_math.cpp @@ -30,23 +30,11 @@ #include "test_math.h" -#include "core/io/file_access.h" -#include "core/math/basis.h" #include "core/math/camera_matrix.h" #include "core/math/delaunay_3d.h" #include "core/math/geometry_2d.h" -#include "core/math/math_funcs.h" -#include "core/math/transform_3d.h" -#include "core/os/keyboard.h" +#include "core/os/main_loop.h" #include "core/os/os.h" -#include "core/string/print_string.h" -#include "core/string/ustring.h" -#include "core/templates/vmap.h" -#include "core/variant/method_ptrcall.h" -#include "core/variant/variant.h" -#include "scene/main/node.h" -#include "scene/resources/texture.h" -#include "servers/rendering/shader_language.h" namespace TestMath { diff --git a/tests/test_math.h b/tests/core/math/test_math.h similarity index 98% rename from tests/test_math.h rename to tests/core/math/test_math.h index 4375925bd5..ab5fb6a050 100644 --- a/tests/test_math.h +++ b/tests/core/math/test_math.h @@ -31,7 +31,7 @@ #ifndef TEST_MATH_H #define TEST_MATH_H -#include "core/os/main_loop.h" +class MainLoop; namespace TestMath { diff --git a/tests/test_random_number_generator.h b/tests/core/math/test_random_number_generator.h similarity index 100% rename from tests/test_random_number_generator.h rename to tests/core/math/test_random_number_generator.h diff --git a/tests/test_rect2.h b/tests/core/math/test_rect2.h similarity index 100% rename from tests/test_rect2.h rename to tests/core/math/test_rect2.h diff --git a/tests/test_class_db.h b/tests/core/object/test_class_db.h similarity index 99% rename from tests/test_class_db.h rename to tests/core/object/test_class_db.h index 4b058a4c67..4b27905485 100644 --- a/tests/test_class_db.h +++ b/tests/core/object/test_class_db.h @@ -31,14 +31,9 @@ #ifndef TEST_CLASS_DB_H #define TEST_CLASS_DB_H -#include "core/register_core_types.h" - +#include "core/core_bind.h" #include "core/core_constants.h" -#include "core/os/os.h" -#include "core/string/string_name.h" -#include "core/string/ustring.h" -#include "core/templates/ordered_hash_map.h" -#include "core/variant/variant.h" +#include "core/object/class_db.h" #include "tests/test_macros.h" diff --git a/tests/test_method_bind.h b/tests/core/object/test_method_bind.h similarity index 99% rename from tests/test_method_bind.h rename to tests/core/object/test_method_bind.h index 879e7949e2..c3a869a8a4 100644 --- a/tests/test_method_bind.h +++ b/tests/core/object/test_method_bind.h @@ -35,10 +35,6 @@ #include "tests/test_macros.h" -#include -#include -#include - namespace TestMethodBind { class MethodBindTester : public Object { diff --git a/tests/test_object.h b/tests/core/object/test_object.h similarity index 98% rename from tests/test_object.h rename to tests/core/object/test_object.h index 8cb7116a20..4109ea521a 100644 --- a/tests/test_object.h +++ b/tests/core/object/test_object.h @@ -32,9 +32,11 @@ #define TEST_OBJECT_H #include "core/core_string_names.h" +#include "core/object/class_db.h" #include "core/object/object.h" +#include "core/object/script_language.h" -#include "thirdparty/doctest/doctest.h" +#include "tests/test_macros.h" // Declared in global namespace because of GDCLASS macro warning (Windows): // "Unqualified friend declaration referring to type outside of the nearest enclosing namespace diff --git a/tests/test_node_path.h b/tests/core/string/test_node_path.h similarity index 99% rename from tests/test_node_path.h rename to tests/core/string/test_node_path.h index f30fe53c5a..0216a30f8f 100644 --- a/tests/test_node_path.h +++ b/tests/core/string/test_node_path.h @@ -33,7 +33,7 @@ #include "core/string/node_path.h" -#include "thirdparty/doctest/doctest.h" +#include "tests/test_macros.h" namespace TestNodePath { diff --git a/tests/test_string.h b/tests/core/string/test_string.h similarity index 99% rename from tests/test_string.h rename to tests/core/string/test_string.h index 28d1089d2f..e5b26cf5a4 100644 --- a/tests/test_string.h +++ b/tests/core/string/test_string.h @@ -31,15 +31,7 @@ #ifndef TEST_STRING_H #define TEST_STRING_H -#include -#include -#include - -#include "core/io/ip_address.h" -#include "core/os/main_loop.h" -#include "core/os/os.h" #include "core/string/ustring.h" -#include "core/variant/variant.h" #include "tests/test_macros.h" diff --git a/tests/test_translation.h b/tests/core/string/test_translation.h similarity index 99% rename from tests/test_translation.h rename to tests/core/string/test_translation.h index 93c53bbbc9..47e06add40 100644 --- a/tests/test_translation.h +++ b/tests/core/string/test_translation.h @@ -39,7 +39,8 @@ #include "editor/import/resource_importer_csv_translation.h" #endif -#include "thirdparty/doctest/doctest.h" +#include "tests/test_macros.h" +#include "tests/test_utils.h" namespace TestTranslation { diff --git a/tests/test_command_queue.h b/tests/core/templates/test_command_queue.h similarity index 99% rename from tests/test_command_queue.h rename to tests/core/templates/test_command_queue.h index f0d4569942..5d228f2bf6 100644 --- a/tests/test_command_queue.h +++ b/tests/core/templates/test_command_queue.h @@ -33,12 +33,10 @@ #include "core/config/project_settings.h" #include "core/math/random_number_generator.h" -#include "core/os/mutex.h" #include "core/os/os.h" -#include "core/os/semaphore.h" #include "core/os/thread.h" #include "core/templates/command_queue_mt.h" -#include "test_macros.h" +#include "tests/test_macros.h" #if !defined(NO_THREADS) diff --git a/tests/test_list.h b/tests/core/templates/test_list.h similarity index 100% rename from tests/test_list.h rename to tests/core/templates/test_list.h diff --git a/tests/test_local_vector.h b/tests/core/templates/test_local_vector.h similarity index 100% rename from tests/test_local_vector.h rename to tests/core/templates/test_local_vector.h diff --git a/tests/test_lru.h b/tests/core/templates/test_lru.h similarity index 98% rename from tests/test_lru.h rename to tests/core/templates/test_lru.h index 2802754729..9359909c53 100644 --- a/tests/test_lru.h +++ b/tests/core/templates/test_lru.h @@ -32,7 +32,6 @@ #define TEST_LRU_H #include "core/templates/lru.h" -#include "core/templates/vector.h" #include "tests/test_macros.h" diff --git a/tests/test_oa_hash_map.cpp b/tests/core/templates/test_oa_hash_map.cpp similarity index 100% rename from tests/test_oa_hash_map.cpp rename to tests/core/templates/test_oa_hash_map.cpp diff --git a/tests/test_oa_hash_map.h b/tests/core/templates/test_oa_hash_map.h similarity index 98% rename from tests/test_oa_hash_map.h rename to tests/core/templates/test_oa_hash_map.h index 9745802cc0..f229ac94ea 100644 --- a/tests/test_oa_hash_map.h +++ b/tests/core/templates/test_oa_hash_map.h @@ -31,7 +31,7 @@ #ifndef TEST_OA_HASH_MAP_H #define TEST_OA_HASH_MAP_H -#include "core/os/main_loop.h" +class MainLoop; namespace TestOAHashMap { diff --git a/tests/test_ordered_hash_map.h b/tests/core/templates/test_ordered_hash_map.h similarity index 98% rename from tests/test_ordered_hash_map.h rename to tests/core/templates/test_ordered_hash_map.h index fbaaa224cf..35ce0fc656 100644 --- a/tests/test_ordered_hash_map.h +++ b/tests/core/templates/test_ordered_hash_map.h @@ -31,10 +31,7 @@ #ifndef TEST_ORDERED_HASH_MAP_H #define TEST_ORDERED_HASH_MAP_H -#include "core/os/os.h" #include "core/templates/ordered_hash_map.h" -#include "core/templates/pair.h" -#include "core/templates/vector.h" #include "tests/test_macros.h" diff --git a/tests/test_paged_array.h b/tests/core/templates/test_paged_array.h similarity index 100% rename from tests/test_paged_array.h rename to tests/core/templates/test_paged_array.h diff --git a/tests/test_vector.h b/tests/core/templates/test_vector.h similarity index 100% rename from tests/test_vector.h rename to tests/core/templates/test_vector.h diff --git a/tests/test_crypto.h b/tests/core/test_crypto.h similarity index 99% rename from tests/test_crypto.h rename to tests/core/test_crypto.h index 8da8c75544..3b909c7df8 100644 --- a/tests/test_crypto.h +++ b/tests/core/test_crypto.h @@ -33,7 +33,6 @@ #include "core/crypto/crypto.h" #include "tests/test_macros.h" -#include namespace TestCrypto { diff --git a/tests/test_hashing_context.h b/tests/core/test_hashing_context.h similarity index 100% rename from tests/test_hashing_context.h rename to tests/core/test_hashing_context.h diff --git a/tests/test_time.h b/tests/core/test_time.h similarity index 100% rename from tests/test_time.h rename to tests/core/test_time.h diff --git a/tests/test_array.h b/tests/core/variant/test_array.h similarity index 98% rename from tests/test_array.h rename to tests/core/variant/test_array.h index 05b4eaea2a..298bd2ff63 100644 --- a/tests/test_array.h +++ b/tests/core/variant/test_array.h @@ -31,13 +31,7 @@ #ifndef TEST_ARRAY_H #define TEST_ARRAY_H -#include "core/object/class_db.h" -#include "core/object/script_language.h" -#include "core/templates/hashfuncs.h" -#include "core/templates/vector.h" #include "core/variant/array.h" -#include "core/variant/container_type_validate.h" -#include "core/variant/variant.h" #include "tests/test_macros.h" #include "tests/test_tools.h" diff --git a/tests/test_dictionary.h b/tests/core/variant/test_dictionary.h similarity index 99% rename from tests/test_dictionary.h rename to tests/core/variant/test_dictionary.h index 64d1d68e21..65079698a3 100644 --- a/tests/test_dictionary.h +++ b/tests/core/variant/test_dictionary.h @@ -31,10 +31,7 @@ #ifndef TEST_DICTIONARY_H #define TEST_DICTIONARY_H -#include "core/templates/ordered_hash_map.h" -#include "core/templates/safe_refcount.h" #include "core/variant/dictionary.h" -#include "core/variant/variant.h" #include "tests/test_macros.h" namespace TestDictionary { diff --git a/tests/test_variant.h b/tests/core/variant/test_variant.h similarity index 100% rename from tests/test_variant.h rename to tests/core/variant/test_variant.h diff --git a/tests/test_code_edit.h b/tests/scene/test_code_edit.h similarity index 99% rename from tests/test_code_edit.h rename to tests/scene/test_code_edit.h index 62235ed0ae..202ba8dca5 100644 --- a/tests/test_code_edit.h +++ b/tests/scene/test_code_edit.h @@ -31,12 +31,7 @@ #ifndef TEST_CODE_EDIT_H #define TEST_CODE_EDIT_H -#include "core/input/input_map.h" -#include "core/object/message_queue.h" -#include "core/os/keyboard.h" -#include "core/string/string_builder.h" #include "scene/gui/code_edit.h" -#include "scene/resources/default_theme/default_theme.h" #include "tests/test_macros.h" diff --git a/tests/test_curve.h b/tests/scene/test_curve.h similarity index 99% rename from tests/test_curve.h rename to tests/scene/test_curve.h index e079905e35..60eafad460 100644 --- a/tests/test_curve.h +++ b/tests/scene/test_curve.h @@ -33,7 +33,7 @@ #include "scene/resources/curve.h" -#include "thirdparty/doctest/doctest.h" +#include "tests/test_macros.h" namespace TestCurve { diff --git a/tests/test_gradient.h b/tests/scene/test_gradient.h similarity index 99% rename from tests/test_gradient.h rename to tests/scene/test_gradient.h index 8eaa6b2b64..fc595b02f2 100644 --- a/tests/test_gradient.h +++ b/tests/scene/test_gradient.h @@ -31,8 +31,6 @@ #ifndef TEST_GRADIENT_H #define TEST_GRADIENT_H -#include "core/math/color.h" -#include "core/object/class_db.h" #include "scene/resources/gradient.h" #include "thirdparty/doctest/doctest.h" diff --git a/tests/test_gui.cpp b/tests/scene/test_gui.cpp similarity index 96% rename from tests/test_gui.cpp rename to tests/scene/test_gui.cpp index 0ec8aa78c4..5bd9390cb7 100644 --- a/tests/test_gui.cpp +++ b/tests/scene/test_gui.cpp @@ -32,29 +32,18 @@ #include "test_gui.h" -#include "core/io/image_loader.h" -#include "core/os/os.h" -#include "core/string/print_string.h" -#include "scene/2d/sprite_2d.h" #include "scene/gui/button.h" -#include "scene/gui/control.h" #include "scene/gui/label.h" #include "scene/gui/line_edit.h" #include "scene/gui/menu_button.h" #include "scene/gui/option_button.h" #include "scene/gui/panel.h" -#include "scene/gui/popup_menu.h" #include "scene/gui/progress_bar.h" #include "scene/gui/rich_text_label.h" #include "scene/gui/scroll_bar.h" #include "scene/gui/spin_box.h" #include "scene/gui/tab_container.h" -#include "scene/gui/texture_rect.h" #include "scene/gui/tree.h" -#include "scene/main/scene_tree.h" - -#include "scene/3d/camera_3d.h" -#include "scene/main/window.h" namespace TestGUI { @@ -267,4 +256,4 @@ MainLoop *test() { } } // namespace TestGUI -#endif +#endif // _3D_DISABLED diff --git a/tests/test_gui.h b/tests/scene/test_gui.h similarity index 98% rename from tests/test_gui.h rename to tests/scene/test_gui.h index e5c40de7e8..84bce620e2 100644 --- a/tests/test_gui.h +++ b/tests/scene/test_gui.h @@ -31,7 +31,7 @@ #ifndef TEST_GUI_H #define TEST_GUI_H -#include "core/os/main_loop.h" +class MainLoop; namespace TestGUI { diff --git a/tests/test_path_3d.h b/tests/scene/test_path_3d.h similarity index 99% rename from tests/test_path_3d.h rename to tests/scene/test_path_3d.h index 9961ae6e97..1fcef3adde 100644 --- a/tests/test_path_3d.h +++ b/tests/scene/test_path_3d.h @@ -32,7 +32,6 @@ #define TEST_PATH_3D_H #include "scene/3d/path_3d.h" -#include "scene/resources/curve.h" #include "tests/test_macros.h" diff --git a/tests/test_path_follow_2d.h b/tests/scene/test_path_follow_2d.h similarity index 99% rename from tests/test_path_follow_2d.h rename to tests/scene/test_path_follow_2d.h index 388b690060..ddfcc5552a 100644 --- a/tests/test_path_follow_2d.h +++ b/tests/scene/test_path_follow_2d.h @@ -32,7 +32,6 @@ #define TEST_PATH_FOLLOW_2D_H #include "scene/2d/path_2d.h" -#include "scene/resources/curve.h" #include "tests/test_macros.h" diff --git a/tests/test_path_follow_3d.h b/tests/scene/test_path_follow_3d.h similarity index 99% rename from tests/test_path_follow_3d.h rename to tests/scene/test_path_follow_3d.h index b6b4c88222..6a505dbb39 100644 --- a/tests/test_path_follow_3d.h +++ b/tests/scene/test_path_follow_3d.h @@ -32,7 +32,6 @@ #define TEST_PATH_FOLLOW_3D_H #include "scene/3d/path_3d.h" -#include "scene/resources/curve.h" #include "tests/test_macros.h" diff --git a/tests/test_physics_2d.cpp b/tests/servers/test_physics_2d.cpp similarity index 99% rename from tests/test_physics_2d.cpp rename to tests/servers/test_physics_2d.cpp index f6619db8fd..b6360cde8a 100644 --- a/tests/test_physics_2d.cpp +++ b/tests/servers/test_physics_2d.cpp @@ -31,11 +31,6 @@ #include "test_physics_2d.h" #include "core/os/main_loop.h" -#include "core/os/os.h" -#include "core/string/print_string.h" -#include "core/templates/map.h" -#include "scene/resources/texture.h" -#include "servers/display_server.h" #include "servers/physics_server_2d.h" #include "servers/rendering_server.h" diff --git a/tests/test_physics_2d.h b/tests/servers/test_physics_2d.h similarity index 98% rename from tests/test_physics_2d.h rename to tests/servers/test_physics_2d.h index 966d49200a..2ae1053a03 100644 --- a/tests/test_physics_2d.h +++ b/tests/servers/test_physics_2d.h @@ -31,7 +31,7 @@ #ifndef TEST_PHYSICS_2D_H #define TEST_PHYSICS_2D_H -#include "core/os/main_loop.h" +class MainLoop; namespace TestPhysics2D { diff --git a/tests/test_physics_3d.cpp b/tests/servers/test_physics_3d.cpp similarity index 98% rename from tests/test_physics_3d.cpp rename to tests/servers/test_physics_3d.cpp index d839ae26b7..4e483d628d 100644 --- a/tests/test_physics_3d.cpp +++ b/tests/servers/test_physics_3d.cpp @@ -31,12 +31,8 @@ #include "test_physics_3d.h" #include "core/math/convex_hull.h" -#include "core/math/math_funcs.h" +#include "core/math/geometry_3d.h" #include "core/os/main_loop.h" -#include "core/os/os.h" -#include "core/string/print_string.h" -#include "core/templates/map.h" -#include "servers/display_server.h" #include "servers/physics_server_3d.h" #include "servers/rendering_server.h" diff --git a/tests/test_physics_3d.h b/tests/servers/test_physics_3d.h similarity index 98% rename from tests/test_physics_3d.h rename to tests/servers/test_physics_3d.h index b6b66f350e..b86327cdb4 100644 --- a/tests/test_physics_3d.h +++ b/tests/servers/test_physics_3d.h @@ -31,7 +31,7 @@ #ifndef TEST_PHYSICS_H #define TEST_PHYSICS_H -#include "core/os/main_loop.h" +class MainLoop; namespace TestPhysics3D { diff --git a/tests/test_render.cpp b/tests/servers/test_render.cpp similarity index 98% rename from tests/test_render.cpp rename to tests/servers/test_render.cpp index 21b4da9b3b..183f049238 100644 --- a/tests/test_render.cpp +++ b/tests/servers/test_render.cpp @@ -31,12 +31,7 @@ #include "test_render.h" #include "core/math/convex_hull.h" -#include "core/math/math_funcs.h" -#include "core/os/keyboard.h" #include "core/os/main_loop.h" -#include "core/os/os.h" -#include "core/string/print_string.h" -#include "servers/display_server.h" #include "servers/rendering_server.h" #define OBJECT_COUNT 50 diff --git a/tests/test_render.h b/tests/servers/test_render.h similarity index 98% rename from tests/test_render.h rename to tests/servers/test_render.h index 35bb383773..1d773cb347 100644 --- a/tests/test_render.h +++ b/tests/servers/test_render.h @@ -31,11 +31,11 @@ #ifndef TEST_RENDER_H #define TEST_RENDER_H -#include "core/os/main_loop.h" +class MainLoop; namespace TestRender { MainLoop *test(); } -#endif +#endif // TEST_RENDER_H diff --git a/tests/test_shader_lang.cpp b/tests/servers/test_shader_lang.cpp similarity index 98% rename from tests/test_shader_lang.cpp rename to tests/servers/test_shader_lang.cpp index 5598852f29..0591bf6adf 100644 --- a/tests/test_shader_lang.cpp +++ b/tests/servers/test_shader_lang.cpp @@ -30,13 +30,8 @@ #include "test_shader_lang.h" -#include "core/io/file_access.h" #include "core/os/main_loop.h" #include "core/os/os.h" - -#include "core/string/print_string.h" -#include "scene/gui/control.h" -#include "scene/gui/text_edit.h" #include "servers/rendering/shader_language.h" typedef ShaderLanguage SL; diff --git a/tests/test_shader_lang.h b/tests/servers/test_shader_lang.h similarity index 98% rename from tests/test_shader_lang.h rename to tests/servers/test_shader_lang.h index 46a2e6af35..de7ec002b6 100644 --- a/tests/test_shader_lang.h +++ b/tests/servers/test_shader_lang.h @@ -31,7 +31,7 @@ #ifndef TEST_SHADER_LANG_H #define TEST_SHADER_LANG_H -#include "core/os/main_loop.h" +class MainLoop; namespace TestShaderLang { diff --git a/tests/test_text_server.h b/tests/servers/test_text_server.h similarity index 100% rename from tests/test_text_server.h rename to tests/servers/test_text_server.h diff --git a/tests/test_macros.h b/tests/test_macros.h index 6968f9df1f..0ec6eb9e7c 100644 --- a/tests/test_macros.h +++ b/tests/test_macros.h @@ -31,10 +31,8 @@ #ifndef TEST_MACROS_H #define TEST_MACROS_H -#include "core/object/callable_method_pointer.h" -#include "core/object/class_db.h" -#include "core/string/print_string.h" -#include "core/templates/map.h" +#include "core/input/input_map.h" +#include "core/object/message_queue.h" #include "core/variant/variant.h" // See documentation for doctest at: diff --git a/tests/test_main.cpp b/tests/test_main.cpp index 341fb1af61..a09be08de8 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -30,62 +30,62 @@ #include "test_main.h" -#include "core/templates/list.h" - -#include "test_aabb.h" -#include "test_array.h" -#include "test_astar.h" -#include "test_basis.h" -#include "test_class_db.h" -#include "test_code_edit.h" -#include "test_color.h" -#include "test_command_queue.h" -#include "test_config_file.h" -#include "test_crypto.h" -#include "test_curve.h" -#include "test_dictionary.h" -#include "test_expression.h" -#include "test_file_access.h" -#include "test_geometry_2d.h" -#include "test_geometry_3d.h" -#include "test_gradient.h" -#include "test_gui.h" -#include "test_hashing_context.h" -#include "test_image.h" -#include "test_json.h" -#include "test_list.h" -#include "test_local_vector.h" -#include "test_lru.h" -#include "test_marshalls.h" -#include "test_math.h" -#include "test_method_bind.h" -#include "test_node_path.h" -#include "test_oa_hash_map.h" -#include "test_object.h" -#include "test_ordered_hash_map.h" -#include "test_paged_array.h" -#include "test_path_3d.h" -#include "test_pck_packer.h" -#include "test_physics_2d.h" -#include "test_physics_3d.h" -#include "test_random_number_generator.h" -#include "test_rect2.h" -#include "test_render.h" -#include "test_resource.h" -#include "test_shader_lang.h" -#include "test_string.h" -#include "test_text_server.h" -#include "test_time.h" -#include "test_translation.h" -#include "test_validate_testing.h" -#include "test_variant.h" -#include "test_vector.h" -#include "test_xml_parser.h" +#include "tests/core/io/test_config_file.h" +#include "tests/core/io/test_file_access.h" +#include "tests/core/io/test_image.h" +#include "tests/core/io/test_json.h" +#include "tests/core/io/test_marshalls.h" +#include "tests/core/io/test_pck_packer.h" +#include "tests/core/io/test_resource.h" +#include "tests/core/io/test_xml_parser.h" +#include "tests/core/math/test_aabb.h" +#include "tests/core/math/test_astar.h" +#include "tests/core/math/test_basis.h" +#include "tests/core/math/test_color.h" +#include "tests/core/math/test_expression.h" +#include "tests/core/math/test_geometry_2d.h" +#include "tests/core/math/test_geometry_3d.h" +#include "tests/core/math/test_math.h" +#include "tests/core/math/test_random_number_generator.h" +#include "tests/core/math/test_rect2.h" +#include "tests/core/object/test_class_db.h" +#include "tests/core/object/test_method_bind.h" +#include "tests/core/object/test_object.h" +#include "tests/core/string/test_node_path.h" +#include "tests/core/string/test_string.h" +#include "tests/core/string/test_translation.h" +#include "tests/core/templates/test_command_queue.h" +#include "tests/core/templates/test_list.h" +#include "tests/core/templates/test_local_vector.h" +#include "tests/core/templates/test_lru.h" +#include "tests/core/templates/test_oa_hash_map.h" +#include "tests/core/templates/test_ordered_hash_map.h" +#include "tests/core/templates/test_paged_array.h" +#include "tests/core/templates/test_vector.h" +#include "tests/core/test_crypto.h" +#include "tests/core/test_hashing_context.h" +#include "tests/core/test_time.h" +#include "tests/core/variant/test_array.h" +#include "tests/core/variant/test_dictionary.h" +#include "tests/core/variant/test_variant.h" +#include "tests/scene/test_code_edit.h" +#include "tests/scene/test_curve.h" +#include "tests/scene/test_gradient.h" +#include "tests/scene/test_gui.h" +#include "tests/scene/test_path_3d.h" +#include "tests/servers/test_physics_2d.h" +#include "tests/servers/test_physics_3d.h" +#include "tests/servers/test_render.h" +#include "tests/servers/test_shader_lang.h" +#include "tests/servers/test_text_server.h" +#include "tests/test_validate_testing.h" #include "modules/modules_tests.gen.h" #include "tests/test_macros.h" +#include "scene/resources/default_theme/default_theme.h" + int test_main(int argc, char *argv[]) { bool run_tests = true; diff --git a/tests/test_tools.h b/tests/test_tools.h index ec18610f04..e1192458d0 100644 --- a/tests/test_tools.h +++ b/tests/test_tools.h @@ -31,8 +31,6 @@ #ifndef TEST_TOOLS_H #define TEST_TOOLS_H -#include "core/error/error_macros.h" - struct ErrorDetector { ErrorDetector() { eh.errfunc = _detect_error; diff --git a/tests/test_utils.cpp b/tests/test_utils.cpp index 1666a257a9..890dea3ee1 100644 --- a/tests/test_utils.cpp +++ b/tests/test_utils.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "test_utils.h" +#include "tests/test_utils.h" #include "core/os/os.h" diff --git a/tests/test_utils.h b/tests/test_utils.h index f05ab0bdb1..ccebe2e449 100644 --- a/tests/test_utils.h +++ b/tests/test_utils.h @@ -31,7 +31,7 @@ #ifndef TEST_UTILS_H #define TEST_UTILS_H -#include "core/string/ustring.h" +class String; namespace TestUtils {