summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--test/app.cpp4
-rw-r--r--test/app.hpp2
-rw-r--r--test/rtree.cpp (renamed from test/collisions.cpp)2
3 files changed, 4 insertions, 4 deletions
diff --git a/test/app.cpp b/test/app.cpp
index 26ecac74..f7adebcb 100644
--- a/test/app.cpp
+++ b/test/app.cpp
@@ -65,6 +65,7 @@ int App::exec()
FM_TEST(test_bptr),
FM_TEST(test_iptr),
FM_TEST(test_entity),
+ FM_TEST(test_hash),
// normal
FM_TEST(test_bitmask),
FM_TEST(test_json),
@@ -72,13 +73,12 @@ int App::exec()
FM_TEST(test_json3),
FM_TEST(test_loader),
FM_TEST(test_region),
- FM_TEST(test_collisions),
+ FM_TEST(test_rtree),
FM_TEST(test_raycast),
FM_TEST(test_wall_atlas),
FM_TEST(test_wall_atlas2),
// the rest are slow
FM_TEST(test_astar),
- FM_TEST(test_hash),
FM_TEST(test_critter),
FM_TEST(test_dijkstra),
FM_TEST(test_loader2),
diff --git a/test/app.hpp b/test/app.hpp
index b358d896..b1995e77 100644
--- a/test/app.hpp
+++ b/test/app.hpp
@@ -19,7 +19,6 @@ void test_astar();
void test_astar_pool();
void test_bitmask();
void test_bptr();
-void test_collisions();
void test_coords();
void test_critter();
void test_dijkstra();
@@ -38,6 +37,7 @@ void test_magnum_math();
void test_math();
void test_raycast();
void test_region();
+void test_rtree();
void test_save();
void test_saves();
void test_script();
diff --git a/test/collisions.cpp b/test/rtree.cpp
index 5a535a44..16e89659 100644
--- a/test/collisions.cpp
+++ b/test/rtree.cpp
@@ -90,7 +90,7 @@ void test2()
} // namespace
-void Test::test_collisions()
+void Test::test_rtree()
{
test1();
test2();