From acdd9328cc7ca1247b9b44c05c8d976b7e33f184 Mon Sep 17 00:00:00 2001 From: Sarah_deep <91503476+Sarahdeep@users.noreply.github.com> Date: Mon, 15 May 2023 22:18:49 +0300 Subject: [PATCH] test fix --- .../repository/include/MetricRepository.hpp | 2 +- .../repository/include/SolutionRepository.hpp | 2 +- .../repository/include/TaskRepository.hpp | 2 +- .../repository/include/UserRepository.hpp | 2 +- .../repository/tests/RepositoryTests.cpp | 18 +++++++++--------- .../repository/virtual/ITaskRepository.hpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/internal/repository/include/MetricRepository.hpp b/server/internal/repository/include/MetricRepository.hpp index 5d9bf96..6e23e90 100644 --- a/server/internal/repository/include/MetricRepository.hpp +++ b/server/internal/repository/include/MetricRepository.hpp @@ -8,7 +8,7 @@ using namespace pqxx; -class MetricRepository : IMetricRepository { +class MetricRepository :public IMetricRepository { public: explicit MetricRepository(); diff --git a/server/internal/repository/include/SolutionRepository.hpp b/server/internal/repository/include/SolutionRepository.hpp index 50d9552..c7face4 100644 --- a/server/internal/repository/include/SolutionRepository.hpp +++ b/server/internal/repository/include/SolutionRepository.hpp @@ -12,7 +12,7 @@ using namespace pqxx; -class SolutionRepository : ISolutionRepository { +class SolutionRepository :public ISolutionRepository { public: explicit SolutionRepository(); std::optional getSolutionById(size_t id) override; diff --git a/server/internal/repository/include/TaskRepository.hpp b/server/internal/repository/include/TaskRepository.hpp index 83e5135..4fbc8d1 100644 --- a/server/internal/repository/include/TaskRepository.hpp +++ b/server/internal/repository/include/TaskRepository.hpp @@ -10,7 +10,7 @@ using namespace pqxx; -class TaskRepository : ITaskRepository { +class TaskRepository :public ITaskRepository { public: explicit TaskRepository(); std::optional getTaskById(size_t id) override; diff --git a/server/internal/repository/include/UserRepository.hpp b/server/internal/repository/include/UserRepository.hpp index b5a52f3..70ceaf0 100644 --- a/server/internal/repository/include/UserRepository.hpp +++ b/server/internal/repository/include/UserRepository.hpp @@ -11,7 +11,7 @@ using namespace pqxx; -class UserRepository : IUserRepository { +class UserRepository :public IUserRepository { public: explicit UserRepository(); diff --git a/server/internal/repository/tests/RepositoryTests.cpp b/server/internal/repository/tests/RepositoryTests.cpp index b78c57c..1e2cab7 100644 --- a/server/internal/repository/tests/RepositoryTests.cpp +++ b/server/internal/repository/tests/RepositoryTests.cpp @@ -46,7 +46,7 @@ TEST(TaskRepository_CRUD_Test, CRUD) { TEST(SolutionRepository_CRUD_Test, CRUD) { SolutionRepository rep; - Solution solution("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result"); + Solution solution("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result", 1); size_t id = rep.storeSolution(solution); EXPECT_NO_FATAL_FAILURE(rep.getSolutionById(1)); solution.setId(id); @@ -101,8 +101,8 @@ TEST(UserRepository_CRUD_Test, loginLikeId) { TEST(SolutionRepository_CRUD_Test, CRUD_getSolutionsBySenderId) { SolutionRepository rep; - Solution solution1("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result"); - Solution solution2("01.01.1970", 1, "/home/usr", "tokens.txt", "tree.txt", 1, "result"); + Solution solution1("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result", 1); + Solution solution2("01.01.1970", 1, "/home/usr", "tokens.txt", "tree.txt", 1, "result", 1); size_t id1 = rep.storeSolution(solution1); solution1.setId(id1); @@ -110,8 +110,8 @@ TEST(SolutionRepository_CRUD_Test, CRUD_getSolutionsBySenderId) { size_t id2 = rep.storeSolution(solution2); solution2.setId(id2); EXPECT_EQ(solution2, rep.getSolutionById(id2)); - std::vector v = {{id1, "01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result"}, - {id2, "01.01.1970", 1, "/home/usr", "tokens.txt", "tree.txt", 1, "result"}}; + std::vector v = {{id1, "01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result", 1}, + {id2, "01.01.1970", 1, "/home/usr", "tokens.txt", "tree.txt", 1, "result", 1}}; std::vector new_v = rep.getSolutionsBySenderId(solution1.getSenderId()); EXPECT_EQ(v, new_v); EXPECT_NO_FATAL_FAILURE(rep.deleteSolution(solution1)); @@ -122,8 +122,8 @@ TEST(SolutionRepository_CRUD_Test, CRUD_getSolutionsBySenderId) { TEST(SolutionRepository_CRUD_Test, CRUD_getSolutionsByTaskId) { SolutionRepository rep; - Solution solution1("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result"); - Solution solution2("01.01.1970", 1, "/home/usr", "tokens.txt", "tree.txt", 1, "result"); + Solution solution1("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 1, "result", 1); + Solution solution2("01.01.1970", 1, "/home/usr", "tokens.txt", "tree.txt", 1, "result", 1); size_t id1 = rep.storeSolution(solution1); solution1.setId(id1); @@ -139,7 +139,7 @@ TEST(SolutionRepository_CRUD_Test, CRUD_getSolutionsByTaskId) { TEST(SolutionRepository_CRUD_Test, tryToAddWithNotExistingTask){ SolutionRepository rep; - Solution solution("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 100500, "result"); + Solution solution("01.01.1970", 1, ":/C/Users", "tokens.txt", "tree.txt", 100500, "result", 1); try{ rep.storeSolution(solution); }catch(pqxx::foreign_key_violation &e){ @@ -150,7 +150,7 @@ TEST(SolutionRepository_CRUD_Test, tryToAddWithNotExistingTask){ TEST(SolutionRepository_CRUD_Test, tryToStoreWithNotExistingSender){ SolutionRepository rep; - Solution solution("01.01.1970", 100500, ":/C/Users", "tokens.txt", "tree.txt", 1, "result"); + Solution solution("01.01.1970", 100500, ":/C/Users", "tokens.txt", "tree.txt", 1, "result", 1); try{ rep.storeSolution(solution); }catch(pqxx::foreign_key_violation &keyViolation){ diff --git a/server/internal/repository/virtual/ITaskRepository.hpp b/server/internal/repository/virtual/ITaskRepository.hpp index 62ee8a2..dec4862 100644 --- a/server/internal/repository/virtual/ITaskRepository.hpp +++ b/server/internal/repository/virtual/ITaskRepository.hpp @@ -11,7 +11,7 @@ public: virtual std::vector getAllTasks() = 0; - virtual void updateTask(Task task) = 0; + virtual void updateTask(const Task& task) = 0; virtual size_t storeTask(Task task) = 0; -- GitLab