From b7866c9cdfb259a3e3d0b9b94efa22afd3fbc95b 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 10:07:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B5=D1=82=D0=B2=D0=B5=D1=80=D1=82?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA=D1=80=D1=8B=D1=82=20=D1=84=D0=B8=D0=BA=D1=81=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 +++- .../fixtures/AuthRegistrationExecutorTestFixture.cpp | 5 ----- tests/fixtures/AuthRegistrationExecutorTestFixture.h | 8 ++------ .../fixture_session_initialization_helper.cpp | 9 +++++++++ .../fixtures/fixture_session_initialization_helper.h | 11 +++++++++++ 5 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 tests/fixtures/fixture_session_initialization_helper.cpp create mode 100644 tests/fixtures/fixture_session_initialization_helper.h diff --git a/CMakeLists.txt b/CMakeLists.txt index e5f87c0..6ad7e67 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,9 @@ add_executable(AuthRegistrationExecutorTests ./tests/endpoint_handlers/AuthRegis ./src/db/mysql_connector.h ./src/db/mysql_connector.cpp ./tests/fixtures/AuthRegistrationExecutorTestFixture.h - ./tests/fixtures/AuthRegistrationExecutorTestFixture.cpp) + ./tests/fixtures/AuthRegistrationExecutorTestFixture.cpp + ./tests/fixtures/fixture_session_initialization_helper.h + ./tests/fixtures/fixture_session_initialization_helper.cpp) target_link_libraries(AuthRegistrationExecutorTests PRIVATE Boost::boost Boost::json Boost::log diff --git a/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp b/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp index ab26ad0..4671563 100644 --- a/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp +++ b/tests/fixtures/AuthRegistrationExecutorTestFixture.cpp @@ -11,11 +11,6 @@ using namespace std; namespace uad { -fixture_helper::fixture_helper(mysqlx::Session* session) -{ - uad::SetMySqlSession(session); -} - AuthRegistrationExecutorTestFixture::AuthRegistrationExecutorTestFixture() : argv(boost::unit_test::framework::master_test_suite().argv), mysql_credentials(argv[1]), diff --git a/tests/fixtures/AuthRegistrationExecutorTestFixture.h b/tests/fixtures/AuthRegistrationExecutorTestFixture.h index b818f37..d936391 100644 --- a/tests/fixtures/AuthRegistrationExecutorTestFixture.h +++ b/tests/fixtures/AuthRegistrationExecutorTestFixture.h @@ -8,14 +8,10 @@ #include "./../../src/endpoints_handlers/AuthRegistrationExecutor.h" #include "./../../src/DAO/MySQLUserDAO.h" #include "./../../src/db/mysql_connector.h" +#include "fixture_session_initialization_helper.h" namespace uad { -struct fixture_helper -{ - explicit fixture_helper(mysqlx::Session* session); -}; - class AuthRegistrationExecutorTestFixture { public: using RouteAuthRegistrationExecutor = AuthRegistrationExecutor user_dao; RouteAuthRegistrationExecutor executor; diff --git a/tests/fixtures/fixture_session_initialization_helper.cpp b/tests/fixtures/fixture_session_initialization_helper.cpp new file mode 100644 index 0000000..b71bbca --- /dev/null +++ b/tests/fixtures/fixture_session_initialization_helper.cpp @@ -0,0 +1,9 @@ +#include "fixture_session_initialization_helper.h" + +namespace uad +{ +fixture_session_initialization_helper::fixture_session_initialization_helper(mysqlx::Session* session) +{ + uad::SetMySqlSession(session); +} +} diff --git a/tests/fixtures/fixture_session_initialization_helper.h b/tests/fixtures/fixture_session_initialization_helper.h new file mode 100644 index 0000000..f9f985e --- /dev/null +++ b/tests/fixtures/fixture_session_initialization_helper.h @@ -0,0 +1,11 @@ +#pragma once + +#include "./../../src/db/mysql_connector.h" + +namespace uad +{ +struct fixture_session_initialization_helper +{ + explicit fixture_session_initialization_helper(mysqlx::Session* session); +}; +}