From 80dffc2885ac62d01006879f169f3dc3eaa4ce34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Mon, 31 Aug 2015 11:11:04 +0200 Subject: [PATCH] rename Group as UserGroup --- projects/GDE_API_CPP/api/src/GDESession.cpp | 24 ++++++------ projects/GDE_API_CPP/api/src/GDESession.hpp | 12 +++--- .../api/src/{Group.hpp => UserGroup.hpp} | 14 +++---- projects/GDE_API_CPP/api/src/UserService.cpp | 22 +++++------ projects/GDE_API_CPP/api/src/UserService.hpp | 12 +++--- projects/GDE_API_CPP/api/tests/UserTest.cpp | 38 +++++++++---------- projects/GDE_API_CPP/api/tests/UserTest.hpp | 16 ++++---- 7 files changed, 69 insertions(+), 69 deletions(-) rename projects/GDE_API_CPP/api/src/{Group.hpp => UserGroup.hpp} (59%) diff --git a/projects/GDE_API_CPP/api/src/GDESession.cpp b/projects/GDE_API_CPP/api/src/GDESession.cpp index d988cac..6f6bf6a 100644 --- a/projects/GDE_API_CPP/api/src/GDESession.cpp +++ b/projects/GDE_API_CPP/api/src/GDESession.cpp @@ -38,34 +38,34 @@ gde::GDESession::findUser(const std::string& name) return gde::UserService(*this).findUser(name); } -const gde::Group -gde::GDESession::createGroup(const std::string& name) +const gde::UserGroup +gde::GDESession::createUserGroup(const std::string& name) { - return gde::UserService(*this).createGroup(name); + return gde::UserService(*this).createUserGroup(name); } bool -gde::GDESession::deleteGroup(const gde::Group& group) +gde::GDESession::deleteUserGroup(const gde::UserGroup& group) { - return gde::UserService(*this).deleteGroup(group); + return gde::UserService(*this).deleteUserGroup(group); } -const gde::Group -gde::GDESession::findGroup(const std::string& name) +const gde::UserGroup +gde::GDESession::findUserGroup(const std::string& name) { - return gde::UserService(*this).findGroup(name); + return gde::UserService(*this).findUserGroup(name); } bool -gde::GDESession::addToGroup(const gde::Group& group, const gde::User& user) +gde::GDESession::addToUserGroup(const gde::UserGroup& group, const gde::User& user) { - return gde::UserService(*this).addToGroup(group, user); + return gde::UserService(*this).addToUserGroup(group, user); } bool -gde::GDESession::removeFromGroup(const gde::Group& group, const gde::User& user) +gde::GDESession::removeFromUserGroup(const gde::UserGroup& group, const gde::User& user) { - return gde::UserService(*this).removeFromGroup(group, user); + return gde::UserService(*this).removeFromUserGroup(group, user); } /* StudyService */ diff --git a/projects/GDE_API_CPP/api/src/GDESession.hpp b/projects/GDE_API_CPP/api/src/GDESession.hpp index 3d02b1d..ec4975b 100644 --- a/projects/GDE_API_CPP/api/src/GDESession.hpp +++ b/projects/GDE_API_CPP/api/src/GDESession.hpp @@ -3,7 +3,7 @@ #include "Credentials.hpp" #include "User.hpp" -#include "Group.hpp" +#include "UserGroup.hpp" #include "Study.hpp" #include "Attribute.hpp" #include "AttributeGroup.hpp" @@ -39,12 +39,12 @@ namespace gde { bool deleteUser(const User&); const User findUser(const std::string& name); - const Group createGroup(const std::string& name); - bool deleteGroup(const Group&); - const Group findGroup(const std::string& name); + const UserGroup createUserGroup(const std::string& name); + bool deleteUserGroup(const UserGroup&); + const UserGroup findUserGroup(const std::string& name); - bool addToGroup(const Group&, const User&); - bool removeFromGroup(const Group&, const User&); + bool addToUserGroup(const UserGroup&, const User&); + bool removeFromUserGroup(const UserGroup&, const User&); /* StudyService */ diff --git a/projects/GDE_API_CPP/api/src/Group.hpp b/projects/GDE_API_CPP/api/src/UserGroup.hpp similarity index 59% rename from projects/GDE_API_CPP/api/src/Group.hpp rename to projects/GDE_API_CPP/api/src/UserGroup.hpp index b47c9b5..b5104ee 100644 --- a/projects/GDE_API_CPP/api/src/Group.hpp +++ b/projects/GDE_API_CPP/api/src/UserGroup.hpp @@ -1,16 +1,16 @@ -#ifndef GDE_GROUP_HPP -#define GDE_GROUP_HPP +#ifndef GDE_USER_GROUP_HPP +#define GDE_USER_GROUP_HPP #include namespace gde { - class Group { + class UserGroup { friend class UserService; friend class GDESession; public: - ~Group() {} + ~UserGroup() {} inline int getId() const { return _id; } inline void setId(int id) { this->_id = id; } @@ -19,9 +19,9 @@ namespace gde { inline void setName(const std::string& name) { this->_name = name; } private: - Group(int id=-1, const std::string& name="") : _id(id), _name(name) {} - Group(const Group&); // non copyable - Group& operator=(const Group&); // non copyable + UserGroup(int id=-1, const std::string& name="") : _id(id), _name(name) {} + UserGroup(const UserGroup&); // non copyable + UserGroup& operator=(const UserGroup&); // non copyable private: int _id; diff --git a/projects/GDE_API_CPP/api/src/UserService.cpp b/projects/GDE_API_CPP/api/src/UserService.cpp index 329dfc2..3f6196c 100644 --- a/projects/GDE_API_CPP/api/src/UserService.cpp +++ b/projects/GDE_API_CPP/api/src/UserService.cpp @@ -76,8 +76,8 @@ gde::UserService::findUser(const std::string& name) } } -const gde::Group -gde::UserService::createGroup(const std::string& name) +const gde::UserGroup +gde::UserService::createUserGroup(const std::string& name) { CommandTO cto(CREATE_GROUP); cto.setParameter("name", name); @@ -86,17 +86,17 @@ gde::UserService::createGroup(const std::string& name) std::string uri = _session.getServiceURI(_servletName); CommandResultTO crto = gde::HttpConnection(Poco::URI(uri), credentials).doPost(cto); - // build Group object from CommandResultTO data (json format) + // build UserGroup object from CommandResultTO data (json format) { Poco::JSON::Object::Ptr object = JsonFormatter::parse(crto.getData()); int id = JsonFormatter::extract(object, "id"); std::string name = JsonFormatter::extract(object, "name"); - return gde::Group(id, name); + return gde::UserGroup(id, name); } } bool -gde::UserService::deleteGroup(const gde::Group& group) +gde::UserService::deleteUserGroup(const gde::UserGroup& group) { CommandTO cto(DELETE_GROUP); cto.setParameter("id", group.getId()); @@ -107,8 +107,8 @@ gde::UserService::deleteGroup(const gde::Group& group) return crto.getCode() == CommandResultTO::OK; } -const gde::Group -gde::UserService::findGroup(const std::string& name) +const gde::UserGroup +gde::UserService::findUserGroup(const std::string& name) { CommandTO cto(FIND_GROUP); cto.setParameter("groupname", name); @@ -117,17 +117,17 @@ gde::UserService::findGroup(const std::string& name) std::string uri = _session.getServiceURI(_servletName); CommandResultTO crto = gde::HttpConnection(Poco::URI(uri), credentials).doPost(cto); - // build Group object from CommandResultTO data (json format) + // build UserGroup object from CommandResultTO data (json format) { Poco::JSON::Object::Ptr object = JsonFormatter::parse(crto.getData()); int id = JsonFormatter::extract(object, "id"); std::string name = JsonFormatter::extract(object, "name"); - return gde::Group(id, name); + return gde::UserGroup(id, name); } } bool -gde::UserService::addToGroup(const gde::Group& group, const gde::User& user) +gde::UserService::addToUserGroup(const gde::UserGroup& group, const gde::User& user) { CommandTO cto(ADD_TO_GROUP); cto.setParameter("groupId", group.getId()); @@ -140,7 +140,7 @@ gde::UserService::addToGroup(const gde::Group& group, const gde::User& user) } bool -gde::UserService::removeFromGroup(const gde::Group& group, const gde::User& user) +gde::UserService::removeFromUserGroup(const gde::UserGroup& group, const gde::User& user) { CommandTO cto(REMOVE_FROM_GROUP); cto.setParameter("groupId", group.getId()); diff --git a/projects/GDE_API_CPP/api/src/UserService.hpp b/projects/GDE_API_CPP/api/src/UserService.hpp index e180a3c..c53befd 100644 --- a/projects/GDE_API_CPP/api/src/UserService.hpp +++ b/projects/GDE_API_CPP/api/src/UserService.hpp @@ -2,7 +2,7 @@ #define GDE_USER_SERVICE_HPP #include "User.hpp" -#include "Group.hpp" +#include "UserGroup.hpp" #include "GDESession.hpp" #include @@ -17,12 +17,12 @@ namespace gde { bool deleteUser(const User&); const User findUser(const std::string& name); - const Group createGroup(const std::string& name); - bool deleteGroup(const Group&); - const Group findGroup(const std::string& name); + const UserGroup createUserGroup(const std::string& name); + bool deleteUserGroup(const UserGroup&); + const UserGroup findUserGroup(const std::string& name); - bool addToGroup(const Group&, const User&); - bool removeFromGroup(const Group&, const User&); + bool addToUserGroup(const UserGroup&, const User&); + bool removeFromUserGroup(const UserGroup&, const User&); private: UserService(const GDESession& session) : _session(session) {} diff --git a/projects/GDE_API_CPP/api/tests/UserTest.cpp b/projects/GDE_API_CPP/api/tests/UserTest.cpp index ffc1926..c32a850 100644 --- a/projects/GDE_API_CPP/api/tests/UserTest.cpp +++ b/projects/GDE_API_CPP/api/tests/UserTest.cpp @@ -42,67 +42,67 @@ UserTest::testFindUser() } void -UserTest::testCreateDeleteGroup() +UserTest::testCreateDeleteUserGroup() { gde::GDESession session(serverAddress, credentials); - const gde::Group& group = session.createGroup("mygroup"); + const gde::UserGroup& group = session.createUserGroup("mygroup"); CPPUNIT_ASSERT(group.getName() == "mygroup"); CPPUNIT_ASSERT(group.getId() > 0); - CPPUNIT_ASSERT(session.deleteGroup(group)); + CPPUNIT_ASSERT(session.deleteUserGroup(group)); } void -UserTest::testFindGroup() +UserTest::testFindUserGroup() { gde::GDESession session(serverAddress, credentials); - const gde::Group& group = session.createGroup("mygroup"); + const gde::UserGroup& group = session.createUserGroup("mygroup"); { - const gde::Group& myGroup = session.findGroup("mygroup"); - CPPUNIT_ASSERT(myGroup.getName() == "mygroup"); - CPPUNIT_ASSERT(myGroup.getId() > 0); + const gde::UserGroup& myUserGroup = session.findUserGroup("mygroup"); + CPPUNIT_ASSERT(myUserGroup.getName() == "mygroup"); + CPPUNIT_ASSERT(myUserGroup.getId() > 0); } - CPPUNIT_ASSERT(session.deleteGroup(group)); + CPPUNIT_ASSERT(session.deleteUserGroup(group)); /* // Will raise an exception: group does not exist anymore { - const gde::Group& myGroup = session.findGroup("mygroup"); + const gde::UserGroup& myUserGroup = session.findUserGroup("mygroup"); } */ } void -UserTest::testAddToGroup() +UserTest::testAddToUserGroup() { gde::GDESession session(serverAddress, credentials); const gde::User& user = session.createUser("toto", "toto_passwd"); CPPUNIT_ASSERT(user.getId() > 0); - const gde::Group& group = session.createGroup("mygroup"); + const gde::UserGroup& group = session.createUserGroup("mygroup"); CPPUNIT_ASSERT(group.getId() > 0); - CPPUNIT_ASSERT(session.addToGroup(group, user)); + CPPUNIT_ASSERT(session.addToUserGroup(group, user)); - CPPUNIT_ASSERT(session.deleteGroup(group)); + CPPUNIT_ASSERT(session.deleteUserGroup(group)); CPPUNIT_ASSERT(session.deleteUser(user)); } void -UserTest::testRemoveFromGroup() +UserTest::testRemoveFromUserGroup() { gde::GDESession session(serverAddress, credentials); const gde::User& user = session.createUser("toto", "toto_passwd"); CPPUNIT_ASSERT(user.getId() > 0); - const gde::Group& group = session.createGroup("mygroup"); + const gde::UserGroup& group = session.createUserGroup("mygroup"); CPPUNIT_ASSERT(group.getId() > 0); - CPPUNIT_ASSERT(session.addToGroup(group, user)); - CPPUNIT_ASSERT(session.removeFromGroup(group, user)); + CPPUNIT_ASSERT(session.addToUserGroup(group, user)); + CPPUNIT_ASSERT(session.removeFromUserGroup(group, user)); - CPPUNIT_ASSERT(session.deleteGroup(group)); + CPPUNIT_ASSERT(session.deleteUserGroup(group)); CPPUNIT_ASSERT(session.deleteUser(user)); } diff --git a/projects/GDE_API_CPP/api/tests/UserTest.hpp b/projects/GDE_API_CPP/api/tests/UserTest.hpp index 8fb99aa..65a1962 100644 --- a/projects/GDE_API_CPP/api/tests/UserTest.hpp +++ b/projects/GDE_API_CPP/api/tests/UserTest.hpp @@ -8,19 +8,19 @@ class UserTest : public CppUnit::TestFixture CPPUNIT_TEST_SUITE(UserTest); CPPUNIT_TEST(testCreateDeleteUser); CPPUNIT_TEST(testFindUser); - CPPUNIT_TEST(testCreateDeleteGroup); - CPPUNIT_TEST(testFindGroup); - CPPUNIT_TEST(testAddToGroup); - CPPUNIT_TEST(testRemoveFromGroup); + CPPUNIT_TEST(testCreateDeleteUserGroup); + CPPUNIT_TEST(testFindUserGroup); + CPPUNIT_TEST(testAddToUserGroup); + CPPUNIT_TEST(testRemoveFromUserGroup); CPPUNIT_TEST_SUITE_END(); public: void testCreateDeleteUser(); void testFindUser(); - void testCreateDeleteGroup(); - void testFindGroup(); - void testAddToGroup(); - void testRemoveFromGroup(); + void testCreateDeleteUserGroup(); + void testFindUserGroup(); + void testAddToUserGroup(); + void testRemoveFromUserGroup(); }; CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(UserTest, "UserTest"); -- 2.39.2