From 56c21ef72613fe4103fecb1d87837abb71e787ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Sat, 22 Nov 2025 15:28:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B0=D1=8F=20=D1=84=D0=B8=D0=BA=D1=81=D1=82?= =?UTF-8?q?=D1=83=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 20 ++++++++++++++----- .../AuthRegistrationExecutor_TEST.cpp | 10 +++++----- ...xecutorTestFixture.cpp => AuthFixture.cpp} | 6 +++--- ...ionExecutorTestFixture.h => AuthFixture.h} | 6 +++--- 4 files changed, 26 insertions(+), 16 deletions(-) rename tests/fixtures/{AuthRegistrationExecutorTestFixture.cpp => AuthFixture.cpp} (80%) rename tests/fixtures/{AuthRegistrationExecutorTestFixture.h => AuthFixture.h} (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f87c52..cf49186 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ add_executable(App ./src/main.cpp ./src/exceptions/session_exception.h src/log/Log.h src/log/Log.cpp - tests/fixtures/AuthRegistrationExecutorTestFixture.h + tests/fixtures/AuthFixture.h ) target_link_libraries(App PRIVATE Boost::boost @@ -92,8 +92,8 @@ add_executable(AuthRegistrationExecutorTests ./tests/endpoint_handlers/AuthRegis ./src/DAO/MySQLUserDAO.cpp ./src/db/mysql_connector.h ./src/db/mysql_connector.cpp - ./tests/fixtures/AuthRegistrationExecutorTestFixture.h - ./tests/fixtures/AuthRegistrationExecutorTestFixture.cpp + tests/fixtures/AuthFixture.h + tests/fixtures/AuthFixture.cpp ./tests/fixtures/fixture_session_initialization_helper.h ./tests/fixtures/fixture_session_initialization_helper.cpp) target_link_libraries(AuthRegistrationExecutorTests PRIVATE Boost::boost @@ -116,7 +116,11 @@ add_executable(AuthLoginExecutorTests ./tests/endpoint_handlers/AuthLoginExecuto ./src/DAO/MemoryAuthDAO.h ./src/DAO/MemoryAuthDAO.cpp ./src/db/mysql_connector.h - ./src/db/mysql_connector.cpp) + ./src/db/mysql_connector.cpp + tests/fixtures/AuthFixture.h + tests/fixtures/AuthFixture.cpp + ./tests/fixtures/fixture_session_initialization_helper.h + ./tests/fixtures/fixture_session_initialization_helper.cpp) target_link_libraries(AuthLoginExecutorTests PRIVATE Boost::boost Boost::json Boost::log @@ -137,7 +141,11 @@ add_executable(AuthLogoutExecutorTests ./tests/endpoint_handlers/AuthLogoutExecu ./src/DAO/MemoryAuthDAO.h ./src/DAO/MemoryAuthDAO.cpp ./src/db/mysql_connector.h - ./src/db/mysql_connector.cpp) + ./src/db/mysql_connector.cpp + tests/fixtures/AuthFixture.h + tests/fixtures/AuthFixture.cpp + ./tests/fixtures/fixture_session_initialization_helper.h + ./tests/fixtures/fixture_session_initialization_helper.cpp) target_link_libraries(AuthLogoutExecutorTests PRIVATE Boost::boost Boost::json Boost::log @@ -152,4 +160,6 @@ if (WIN32) target_compile_definitions(HelpersTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX) target_compile_definitions(ControllerTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX) target_compile_definitions(AuthRegistrationExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX) + target_compile_definitions(AuthLoginExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX) + target_compile_definitions(AuthLogoutExecutorTests PRIVATE WIN32_LEAN_AND_MEAN NOMINMAX) endif () diff --git a/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp b/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp index 8cda86d..bc2e6ea 100644 --- a/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp +++ b/tests/endpoint_handlers/AuthRegistrationExecutor_TEST.cpp @@ -13,7 +13,7 @@ #include "./../../src/db/mysql_connector.h" #include "./../../src/exceptions/session_exception.h" #include "./../../src/helpers/helpers.h" -#include "./../fixtures/AuthRegistrationExecutorTestFixture.h" +#include "./../fixtures/AuthFixture.h" const std::string kUUID = std::to_string(uad::Random()); @@ -29,7 +29,7 @@ using RouteAuthRegistrationExecutor = AuthRegistrationExecutor>>; -BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Failed_Parse_Payload, AuthRegistrationExecutorTestFixture) +BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Failed_Parse_Payload, AuthFixture) { req.body() = "{ \"login\": ABS3 }"s; @@ -39,7 +39,7 @@ BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Failed_Parse_Payload, AuthRegis }); } -BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Login_Data, AuthRegistrationExecutorTestFixture) +BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Login_Data, AuthFixture) { value req_body; @@ -56,7 +56,7 @@ BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Invalid_Login_Data, AuthRegistr }); } -BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesfull_User_Login, AuthRegistrationExecutorTestFixture) +BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesfull_User_Login, AuthFixture) { value req_body; @@ -72,7 +72,7 @@ BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Succesfull_User_Login, AuthRegi BOOST_CHECK_EQUAL(response.result(), http::status::created); } -BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Unsuccesfull_User_Login, AuthRegistrationExecutorTestFixture) +BOOST_FIXTURE_TEST_CASE(AuthRegistrationExecutor_Unsuccesfull_User_Login, AuthFixture) { value req_body; diff --git a/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp b/tests/fixtures/AuthFixture.cpp similarity index 80% rename from tests/fixtures/AuthRegistrationExecutorTestFixture.cpp rename to tests/fixtures/AuthFixture.cpp index 6f852b6..675064e 100644 --- a/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp +++ b/tests/fixtures/AuthFixture.cpp @@ -1,4 +1,4 @@ -#include "AuthRegistrationExecutorTestFixture.h" +#include "AuthFixture.h" #include #include @@ -11,7 +11,7 @@ using namespace std; namespace uad { -AuthRegistrationExecutorTestFixture::AuthRegistrationExecutorTestFixture() : +AuthFixture::AuthFixture() : argv(boost::unit_test::framework::master_test_suite().argv), mysql_credentials(argv[1]), mysql_session(new mysqlx::Session(mysql_credentials)), @@ -23,7 +23,7 @@ AuthRegistrationExecutorTestFixture::AuthRegistrationExecutorTestFixture() : BOOST_TEST_MESSAGE("Setup RouteAuthRegistrationExecutor fixture"); } -AuthRegistrationExecutorTestFixture::~AuthRegistrationExecutorTestFixture() +AuthFixture::~AuthFixture() { argv = nullptr; mysql_session->close(); diff --git a/tests/fixtures/AuthRegistrationExecutorTestFixture.h b/tests/fixtures/AuthFixture.h similarity index 89% rename from tests/fixtures/AuthRegistrationExecutorTestFixture.h rename to tests/fixtures/AuthFixture.h index 8fd1be0..49f07e1 100644 --- a/tests/fixtures/AuthRegistrationExecutorTestFixture.h +++ b/tests/fixtures/AuthFixture.h @@ -13,7 +13,7 @@ namespace uad { -class AuthRegistrationExecutorTestFixture { +class AuthFixture { public: using RouteAuthRegistrationExecutor = AuthRegistrationExecutor, @@ -33,7 +33,7 @@ public: Request req; - AuthRegistrationExecutorTestFixture(); - ~AuthRegistrationExecutorTestFixture(); + AuthFixture(); + ~AuthFixture(); }; }