From 849d73f22ad89e04137006704d2fd6d6fdbb4969 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 24 Feb 2024 18:25:11 +0100
Subject: sort, clean up tests

---
 test/app.cpp    |  5 +++--
 test/app.hpp    |  3 ++-
 test/loader.cpp | 11 ++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/test/app.cpp b/test/app.cpp
index 2da424c6..5e343bdc 100644
--- a/test/app.cpp
+++ b/test/app.cpp
@@ -53,14 +53,15 @@ int test_app::exec()
         FM_TEST(test_hash),
         FM_TEST(test_raycast),
         FM_TEST(test_json),
+        FM_TEST(test_loader),
         FM_TEST(test_wall_atlas),
         FM_TEST(test_json2),
         FM_TEST(test_wall_atlas2),
         FM_TEST(test_json3),
         FM_TEST(test_bitmask),
-        FM_TEST(test_loader),
-        FM_TEST(test_serializer1),
         FM_TEST(test_loader2),
+        FM_TEST(test_serializer1),
+        FM_TEST(test_loader3),
         FM_TEST(test_astar_pool),
         FM_TEST(test_astar),
         FM_TEST(test_dijkstra),
diff --git a/test/app.hpp b/test/app.hpp
index a7814697..7c736a95 100644
--- a/test/app.hpp
+++ b/test/app.hpp
@@ -32,12 +32,13 @@ struct test_app final : private FM_APPLICATION
     static void test_json();
     static void test_json2();
     static void test_json3();
-    static void test_saves();
     static void test_loader();
     static void test_loader2();
+    static void test_loader3();
     static void test_magnum_math();
     static void test_math();
     static void test_raycast();
+    static void test_saves();
     static void test_serializer1();
     static void test_tile_iter();
     static void test_wall_atlas();
diff --git a/test/loader.cpp b/test/loader.cpp
index 4a49b400..ad793b81 100644
--- a/test/loader.cpp
+++ b/test/loader.cpp
@@ -48,6 +48,13 @@ constexpr const char* sceneries[] = {
 
 void test_app::test_loader()
 {
+    fm_assert(loader.ground_atlas("texel")->pass_mode() == pass_mode::blocked);
+}
+
+void test_app::test_loader2()
+{
+    fm_assert(loader.ground_atlas("metal1")->pass_mode() == pass_mode::pass);
+
     fm_assert(loader.invalid_ground_atlas().atlas);
     fm_assert(&loader.invalid_ground_atlas().atlas == &loader.invalid_ground_atlas().atlas);
     fm_assert(loader.invalid_ground_atlas().name == loader.INVALID);
@@ -77,11 +84,9 @@ void test_app::test_loader()
         const auto& S = loader.scenery(name);
         fm_assert(S.atlas);
     }
-    fm_assert(loader.ground_atlas("texel")->pass_mode() == pass_mode::blocked);
-    fm_assert(loader.ground_atlas("metal1")->pass_mode() == pass_mode::pass);
 }
 
-void test_app::test_loader2()
+void test_app::test_loader3()
 {
     for (const auto& x : loader.ground_atlas_list())
     {
-- 
cgit v1.2.3