summaryrefslogtreecommitdiff
path: root/main/tests
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-03-28 13:19:05 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-03-28 13:20:48 +0100
commit0c320a6bf3f9d8d2570a9230a29cf8ae925e89f0 (patch)
treece229b0c853409ad5fd57c79605753a2804fe053 /main/tests
parentbbbdabc771662d0effb739237967982cd201ea89 (diff)
More server renames for consistency after #37361
Diffstat (limited to 'main/tests')
-rw-r--r--main/tests/test_main.cpp12
-rw-r--r--main/tests/test_physics_3d.cpp (renamed from main/tests/test_physics.cpp)18
-rw-r--r--main/tests/test_physics_3d.h (renamed from main/tests/test_physics.h)4
3 files changed, 17 insertions, 17 deletions
diff --git a/main/tests/test_main.cpp b/main/tests/test_main.cpp
index beb955d045..a9a671e2f1 100644
--- a/main/tests/test_main.cpp
+++ b/main/tests/test_main.cpp
@@ -40,8 +40,8 @@
#include "test_math.h"
#include "test_oa_hash_map.h"
#include "test_ordered_hash_map.h"
-#include "test_physics.h"
#include "test_physics_2d.h"
+#include "test_physics_3d.h"
#include "test_render.h"
#include "test_shader_lang.h"
#include "test_string.h"
@@ -51,8 +51,8 @@ const char **tests_get_names() {
static const char *test_names[] = {
"string",
"math",
- "physics",
"physics_2d",
+ "physics_3d",
"render",
"oa_hash_map",
"gui",
@@ -81,14 +81,14 @@ MainLoop *test_main(String p_test, const List<String> &p_args) {
return TestMath::test();
}
- if (p_test == "physics") {
+ if (p_test == "physics_2d") {
- return TestPhysics::test();
+ return TestPhysics2D::test();
}
- if (p_test == "physics_2d") {
+ if (p_test == "physics_3d") {
- return TestPhysics2D::test();
+ return TestPhysics3D::test();
}
if (p_test == "render") {
diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics_3d.cpp
index 5e8940f453..2d208ee317 100644
--- a/main/tests/test_physics.cpp
+++ b/main/tests/test_physics_3d.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* test_physics.cpp */
+/* test_physics_3d.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
-#include "test_physics.h"
+#include "test_physics_3d.h"
#include "core/map.h"
#include "core/math/math_funcs.h"
@@ -40,9 +40,9 @@
#include "servers/physics_server_3d.h"
#include "servers/rendering_server.h"
-class TestPhysicsMainLoop : public MainLoop {
+class TestPhysics3DMainLoop : public MainLoop {
- GDCLASS(TestPhysicsMainLoop, MainLoop);
+ GDCLASS(TestPhysics3DMainLoop, MainLoop);
enum {
LINK_COUNT = 20,
@@ -81,7 +81,7 @@ class TestPhysicsMainLoop : public MainLoop {
protected:
static void _bind_methods() {
- ClassDB::bind_method("body_changed_transform", &TestPhysicsMainLoop::body_changed_transform);
+ ClassDB::bind_method("body_changed_transform", &TestPhysics3DMainLoop::body_changed_transform);
}
RID create_body(PhysicsServer3D::ShapeType p_shape, PhysicsServer3D::BodyMode p_body, const Transform p_location, bool p_active_default = true, const Transform &p_shape_xform = Transform()) {
@@ -426,14 +426,14 @@ public:
return false;
}
- TestPhysicsMainLoop() {
+ TestPhysics3DMainLoop() {
}
};
-namespace TestPhysics {
+namespace TestPhysics3D {
MainLoop *test() {
- return memnew(TestPhysicsMainLoop);
+ return memnew(TestPhysics3DMainLoop);
}
-} // namespace TestPhysics
+} // namespace TestPhysics3D
diff --git a/main/tests/test_physics.h b/main/tests/test_physics_3d.h
index fbbc59bba9..d03f2c6573 100644
--- a/main/tests/test_physics.h
+++ b/main/tests/test_physics_3d.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* test_physics.h */
+/* test_physics_3d.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -33,7 +33,7 @@
#include "core/os/main_loop.h"
-namespace TestPhysics {
+namespace TestPhysics3D {
MainLoop *test();
}