AuthRefistrationTest - 3 ok 1 fail

tests/fixtures/AuthFixture.cpp

@@ -1,37 +0,0 @@
-#include "AuthFixture.h"
-
-#include <boost/test/unit_test.hpp>
-#include <boost/beast.hpp>
-
-#include <memory>
-
-#include "./../../src/db/mysql_connector.h"
-
-using namespace std;
-
-namespace uad
-{
-AuthFixture::AuthFixture() :
-  uuid(std::to_string(uad::Random())),
-  argv(boost::unit_test::framework::master_test_suite().argv),
-  mysql_credentials(argv[1]),
-  mysql_session(new mysqlx::Session(mysql_credentials)),
-  helper(mysql_session),
-  user_dao(std::make_shared<MySQLUserDAO>(GetMySqlSession())),
-  auth_dao(make_shared<MemoryAuthDAO>(GetMySqlSession())),
-  executor(RouteAuthRegistrationExecutor(GetMySqlSession(), user_dao))
-{
-  BOOST_TEST_MESSAGE("Setup RouteAuthRegistrationExecutor fixture");
-}
-
-AuthFixture::~AuthFixture()
-{
-  argv = nullptr;
-  mysql_session->close();
-  delete mysql_session;
-  mysql_session = nullptr;
-  SetMySqlSession(nullptr);
-
-  BOOST_TEST_MESSAGE("Teardown RouteAuthRegistrationExecutor fixture");
-}
-}

tests/fixtures/AuthFixture.h

@@ -3,6 +3,7 @@
 #include <string>
 #include <boost/beast.hpp>
 #include <memory>
+#include <boost/test/unit_test.hpp>
 
 #include <mysqlx/xdevapi.h>
 #include "./../../src/endpoints_handlers/AuthRegistrationExecutor.h"
@@ -13,28 +14,33 @@
 
 namespace uad
 {
+using Request = boost::beast::http::request<boost::beast::http::string_body,
+                                            boost::beast::http::basic_fields<std::allocator<char>>>;
+
+template <class Executor>
 class AuthFixture {
 public:
-  using RouteAuthRegistrationExecutor = AuthRegistrationExecutor<boost::beast::http::string_body,
-                                                               std::allocator<char>,
-                                                               boost::beast::http::string_body>;
-  using Request = boost::beast::http::request<boost::beast::http::string_body,
-                                              boost::beast::http::basic_fields<std::allocator<char>>>;
-  const std::string uuid;
-  char** argv;
+  const std::string uuid = std::to_string(uad::Random());
+  char** argv = boost::unit_test::framework::master_test_suite().argv;
 
-  const std::string mysql_credentials;
-  mysqlx::Session* mysql_session;
+  const std::string mysql_credentials = argv[1];
+  mysqlx::Session* mysql_session = new mysqlx::Session(mysql_credentials);
 
-  fixture_session_initialization_helper helper;
+  fixture_session_initialization_helper helper = fixture_session_initialization_helper(mysql_session);
 
-  std::shared_ptr<IUserDAO> user_dao;
-  std::shared_ptr<MemoryAuthDAO> auth_dao;
-  RouteAuthRegistrationExecutor executor;
+  std::shared_ptr<IUserDAO> user_dao = std::make_shared<MySQLUserDAO>(GetMySqlSession());
+  std::shared_ptr<MemoryAuthDAO> auth_dao = std::make_shared<MemoryAuthDAO>(GetMySqlSession());
+  Executor executor = Executor(GetMySqlSession(), user_dao);
 
   Request req;
 
-  AuthFixture();
-  ~AuthFixture();
+  AuthFixture()
+  {
+    BOOST_TEST_MESSAGE("Setup fixture");
+  }
+  ~AuthFixture()
+  {
+    BOOST_TEST_MESSAGE("Teardown fixture");
+  }
 };
 }