diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/app.hpp | 6 | ||||
| -rw-r--r-- | test/const-math.cpp | 4 | ||||
| -rw-r--r-- | test/json.cpp | 2 | ||||
| -rw-r--r-- | test/main.cpp | 8 | ||||
| -rw-r--r-- | test/tile-iter.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 981a99a2..ea0009f8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,6 +6,6 @@ file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/test") link_libraries(${PROJECT_NAME}) link_libraries(Magnum::WindowlessWglApplication Magnum::Trade) -#add_executable(${self} "${sources}" "../main/loader-impl.cpp") -add_library(${self} STATIC "${sources}" "../main/loader-impl.cpp") +#add_executable(${self} "${sources}" "../loader/loader-impl.cpp") +add_library(${self} STATIC "${sources}" "../loader/loader-impl.cpp") install(TARGETS ${self} RUNTIME DESTINATION bin) diff --git a/test/app.hpp b/test/app.hpp index 4647001e..943e53a3 100644 --- a/test/app.hpp +++ b/test/app.hpp @@ -2,10 +2,10 @@ #include <Magnum/Magnum.h> #include <Magnum/Platform/WindowlessWglApplication.h> namespace floormat { -struct app final : Platform::WindowlessWglApplication // NOLINT(cppcoreguidelines-virtual-class-destructor) +struct floormat final : Platform::WindowlessWglApplication // NOLINT(cppcoreguidelines-virtual-class-destructor) { - explicit app(const Arguments& arguments); - ~app(); + explicit floormat(const Arguments& arguments); + ~floormat(); int exec() override; static bool test_json(); static bool test_tile_iter(); diff --git a/test/const-math.cpp b/test/const-math.cpp index 63baff4d..1ea4c2f0 100644 --- a/test/const-math.cpp +++ b/test/const-math.cpp @@ -61,7 +61,7 @@ static constexpr void* compile_tests() namespace floormat { -bool app::test_const_math() +bool floormat::test_const_math() { static_assert(compile_tests() == nullptr); return true; @@ -73,5 +73,5 @@ bool app::test_const_math() # pragma GCC diagnostic pop #endif #else -namespace floormat { bool app::test_const_math() { return true; } } +namespace floormat { bool floormat::test_const_math() { return true; } } #endif diff --git a/test/json.cpp b/test/json.cpp index 6684f404..198f2d48 100644 --- a/test/json.cpp +++ b/test/json.cpp @@ -29,7 +29,7 @@ static chunk make_test_chunk() return c; } -bool app::test_json() // NOLINT(readability-convert-member-functions-to-static) +bool floormat::test_json() // NOLINT(readability-convert-member-functions-to-static) { const std::filesystem::path output_dir = "../test/."; { diff --git a/test/main.cpp b/test/main.cpp index 8e053d23..75e2950f 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -9,7 +9,7 @@ namespace floormat { -app::app(const Arguments& arguments): +floormat::floormat(const Arguments& arguments): Platform::WindowlessWglApplication{ arguments, Configuration{} @@ -17,12 +17,12 @@ app::app(const Arguments& arguments): { } -app::~app() +floormat::~floormat() { loader_::destroy(); } -int app::exec() +int floormat::exec() { bool ret = true; ret &= test_json(); @@ -35,7 +35,7 @@ int app::exec() int main(int argc, char** argv) { - floormat::app application{{argc, argv}}; + floormat::floormat application{{argc, argv}}; return application.exec(); } diff --git a/test/tile-iter.cpp b/test/tile-iter.cpp index 3aeb3ba2..9303a764 100644 --- a/test/tile-iter.cpp +++ b/test/tile-iter.cpp @@ -8,7 +8,7 @@ static inline bool always_false() return ret; } -bool app::test_tile_iter() // NOLINT(readability-function-size) +bool floormat::test_tile_iter() // NOLINT(readability-function-size) { if (always_false()) { |