From: coderhyme Date: Thu, 2 Jul 2015 10:48:57 +0000 (+0900) Subject: Change the class name of PrimitveServerResource to ResourceObject X-Git-Tag: 1.2.0+RC1~1430^2~86 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72c2e997bae39dc9421d1c7335b47d5d9e5ba15f;p=platform%2Fupstream%2Fiotivity.git Change the class name of PrimitveServerResource to ResourceObject Terminology of the Primitive is not specific. Change-Id: I473310416076eb6929e00a1d4c47b05f7ae858fb Signed-off-by: coderhyme Reviewed-on: https://gerrit.iotivity.org/gerrit/1499 Reviewed-by: Uze Choi Tested-by: Uze Choi --- diff --git a/service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h b/service/resource-manipulation/modules/serverBuilder/include/ResourceObject.h similarity index 83% rename from service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h rename to service/resource-manipulation/modules/serverBuilder/include/ResourceObject.h index ae1f1b9..61382a3 100644 --- a/service/resource-manipulation/modules/serverBuilder/include/PrimitiveServerResource.h +++ b/service/resource-manipulation/modules/serverBuilder/include/ResourceObject.h @@ -18,8 +18,8 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#ifndef __PRIMITIVESERVERRESOURCE_H -#define __PRIMITIVESERVERRESOURCE_H +#ifndef __OIC_RESOURCEOBJECT_H +#define __OIC_RESOURCEOBJECT_H #include #include @@ -52,7 +52,7 @@ namespace OIC DeadLockException(std::string&& what) : PrimitiveException{ std::move(what) } {} }; - class PrimitiveServerResource + class ResourceObject { private: class WeakGuard; @@ -64,8 +64,8 @@ namespace OIC // UPDATED // }; - using Ptr = std::shared_ptr; - using ConstPtr = std::shared_ptr; + using Ptr = std::shared_ptr< ResourceObject >; + using ConstPtr = std::shared_ptr< const ResourceObject >; class Builder { @@ -82,7 +82,7 @@ namespace OIC /** * @throw PlatformException */ - PrimitiveServerResource::Ptr create(); + ResourceObject::Ptr build(); private: std::string m_uri; @@ -102,13 +102,13 @@ namespace OIC ResourceAttributes&) >; public: - PrimitiveServerResource(PrimitiveServerResource&&) = delete; - PrimitiveServerResource(const PrimitiveServerResource&) = delete; + ResourceObject(ResourceObject&&) = delete; + ResourceObject(const ResourceObject&) = delete; - PrimitiveServerResource& operator=(PrimitiveServerResource&&) = delete; - PrimitiveServerResource& operator=(const PrimitiveServerResource&) = delete; + ResourceObject& operator=(ResourceObject&&) = delete; + ResourceObject& operator=(const ResourceObject&) = delete; - virtual ~PrimitiveServerResource(); + virtual ~ResourceObject(); template< typename T > void setAttribute(const std::string& key, T&& value) @@ -149,7 +149,7 @@ namespace OIC // void setAutoNotifyPolicy(AutoNotifyPolicy); private: - PrimitiveServerResource(uint8_t, ResourceAttributes&&); + ResourceObject(uint8_t, ResourceAttributes&&); OCEntityHandlerResult entityHandler(std::shared_ptr< OC::OCResourceRequest >); @@ -173,11 +173,11 @@ namespace OIC mutable std::mutex m_mutex; }; - class PrimitiveServerResource::LockGuard + class ResourceObject::LockGuard { public: - LockGuard(const PrimitiveServerResource&); - LockGuard(const PrimitiveServerResource::Ptr); + LockGuard(const ResourceObject&); + LockGuard(const ResourceObject::Ptr); ~LockGuard(); LockGuard(const LockGuard&) = delete; @@ -187,13 +187,13 @@ namespace OIC LockGuard& operator=(LockGuard&&) = delete; private: - const PrimitiveServerResource& m_serverResource; + const ResourceObject& m_resourceObject; }; - class PrimitiveServerResource::WeakGuard + class ResourceObject::WeakGuard { public: - WeakGuard(const PrimitiveServerResource&); + WeakGuard(const ResourceObject&); ~WeakGuard(); WeakGuard(const WeakGuard&) = delete; @@ -203,10 +203,10 @@ namespace OIC WeakGuard& operator=(WeakGuard&&) = delete; private: - const PrimitiveServerResource& m_serverResource; + const ResourceObject& m_serverResource; bool m_hasLocked; }; } } -#endif +#endif // __OIC_RESOURCEOBJECT_H diff --git a/service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h b/service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h index dc91981..f3311f7 100644 --- a/service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h +++ b/service/resource-manipulation/modules/serverBuilder/include/internal/RequestHandler.h @@ -21,7 +21,7 @@ #ifndef __REQUESTHANDLER_H #define __REQUESTHANDLER_H -#include +#include #include #include @@ -33,7 +33,7 @@ namespace OIC class RequestHandler { public: - using Ptr = std::shared_ptr; + using Ptr = std::shared_ptr< RequestHandler >; static constexpr int DEFAULT_ERROR_CODE = 200; static constexpr OCEntityHandlerResult DEFAULT_RESULT = OC_EH_OK; @@ -43,7 +43,7 @@ namespace OIC } virtual std::shared_ptr< OC::OCResourceResponse > buildResponse( - PrimitiveServerResource&, const ResourceAttributes& requestAttrs) = 0; + ResourceObject&, const ResourceAttributes& requestAttrs) = 0; }; class SimpleRequestHandler: public RequestHandler @@ -53,12 +53,12 @@ namespace OIC int errorCode = DEFAULT_ERROR_CODE); std::shared_ptr< OC::OCResourceResponse > buildResponse( - PrimitiveServerResource&, const ResourceAttributes&) override; + ResourceObject&, const ResourceAttributes&) override; protected: - virtual int getErrorCode(PrimitiveServerResource&); - virtual OCEntityHandlerResult getResponseResult(PrimitiveServerResource&); - virtual OC::OCRepresentation getOCRepresentation(PrimitiveServerResource& resource); + virtual int getErrorCode(ResourceObject&); + virtual OCEntityHandlerResult getResponseResult(ResourceObject&); + virtual OC::OCRepresentation getOCRepresentation(ResourceObject& resource); private: OCEntityHandlerResult m_result; @@ -78,7 +78,7 @@ namespace OIC } protected: - OC::OCRepresentation getOCRepresentation(PrimitiveServerResource& resource) override; + OC::OCRepresentation getOCRepresentation(ResourceObject& resource) override; private: ResourceAttributes m_attrs; @@ -90,7 +90,7 @@ namespace OIC SetRequestProxyHandler(RequestHandler::Ptr requestHandler); std::shared_ptr< OC::OCResourceResponse > buildResponse( - PrimitiveServerResource& resource, + ResourceObject& resource, const ResourceAttributes& requestAttrs) override; private: diff --git a/service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp b/service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp index 5818ea9..d02f3d1 100644 --- a/service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp +++ b/service/resource-manipulation/modules/serverBuilder/src/RequestHandler.cpp @@ -36,7 +36,7 @@ namespace OIC } std::shared_ptr< OC::OCResourceResponse > SimpleRequestHandler::buildResponse( - PrimitiveServerResource& resource, const ResourceAttributes&) + ResourceObject& resource, const ResourceAttributes&) { auto response = std::make_shared< OC::OCResourceResponse >(); @@ -47,26 +47,26 @@ namespace OIC return response; } - int SimpleRequestHandler::getErrorCode(PrimitiveServerResource&) + int SimpleRequestHandler::getErrorCode(ResourceObject&) { return m_errorCode; } - OCEntityHandlerResult SimpleRequestHandler::getResponseResult(PrimitiveServerResource&) + OCEntityHandlerResult SimpleRequestHandler::getResponseResult(ResourceObject&) { return m_result; } OC::OCRepresentation SimpleRequestHandler::getOCRepresentation( - PrimitiveServerResource& resource) + ResourceObject& resource) { - PrimitiveServerResource::LockGuard lock{ resource }; + ResourceObject::LockGuard lock{ resource }; return ResourceAttributesConverter::toOCRepresentation(resource.getAttributes()); } OC::OCRepresentation CustomAttrRequestHandler::getOCRepresentation( - PrimitiveServerResource& resource) + ResourceObject& resource) { return ResourceAttributesConverter::toOCRepresentation(m_attrs); } @@ -79,10 +79,10 @@ namespace OIC } std::shared_ptr< OC::OCResourceResponse > SetRequestProxyHandler::buildResponse( - PrimitiveServerResource& resource, const ResourceAttributes& requestAttrs) + ResourceObject& resource, const ResourceAttributes& requestAttrs) { { - PrimitiveServerResource::LockGuard lock(resource); + ResourceObject::LockGuard lock(resource); if (!acceptableAttributes(resource.getAttributes(), requestAttrs)) { diff --git a/service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp b/service/resource-manipulation/modules/serverBuilder/src/ResourceObject.cpp similarity index 74% rename from service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp rename to service/resource-manipulation/modules/serverBuilder/src/ResourceObject.cpp index c8a0e70..8618f02 100644 --- a/service/resource-manipulation/modules/serverBuilder/src/PrimitiveServerResource.cpp +++ b/service/resource-manipulation/modules/serverBuilder/src/ResourceObject.cpp @@ -18,7 +18,7 @@ // //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include +#include #include #include @@ -40,7 +40,7 @@ namespace namespace Detail { template - OCEntityHandlerResult sendResponse(PrimitiveServerResource& resource, + OCEntityHandlerResult sendResponse(ResourceObject& resource, std::shared_ptr< OC::OCResourceRequest > ocRequest, const ResourceAttributes& requestAttrs, RESPONSE&& response) { @@ -81,7 +81,7 @@ namespace } template< typename HANDLER, typename RESPONSE = typename std::decay::type::result_type> - OCEntityHandlerResult handleRequest(PrimitiveServerResource& resource, + OCEntityHandlerResult handleRequest(ResourceObject& resource, std::shared_ptr< OC::OCResourceRequest > ocRequest, HANDLER&& handler) { ResourceAttributes attrs{ ResourceAttributesConverter::fromOCRepresentation( @@ -102,7 +102,7 @@ namespace OIC { namespace Service { - PrimitiveServerResource::PrimitiveServerResource(uint8_t properties, + ResourceObject::ResourceObject(uint8_t properties, ResourceAttributes&& attrs) : m_properties { properties }, m_resourceHandle{}, m_resourceAttributes{ std::move(attrs) }, m_getRequestHandler{ }, @@ -110,49 +110,49 @@ namespace OIC { } - PrimitiveServerResource::Builder::Builder(const std::string& uri, const std::string& type, + ResourceObject::Builder::Builder(const std::string& uri, const std::string& type, const std::string& interface) : m_uri{ uri }, m_type{ type }, m_interface{ interface }, m_properties{ OC_DISCOVERABLE | OC_OBSERVABLE } { } - PrimitiveServerResource::Builder& PrimitiveServerResource::Builder::setDiscoverable( + ResourceObject::Builder& ResourceObject::Builder::setDiscoverable( bool discoverable) { m_properties = ::makePropertyFlags(m_properties, OC_DISCOVERABLE, discoverable); return *this; } - PrimitiveServerResource::Builder& PrimitiveServerResource::Builder::setObservable( + ResourceObject::Builder& ResourceObject::Builder::setObservable( bool observable) { m_properties = ::makePropertyFlags(m_properties, OC_OBSERVABLE, observable); return *this; } - PrimitiveServerResource::Builder& PrimitiveServerResource::Builder::setAttributes( + ResourceObject::Builder& ResourceObject::Builder::setAttributes( const ResourceAttributes& attrs) { m_resourceAttributes = attrs; return *this; } - PrimitiveServerResource::Builder& PrimitiveServerResource::Builder::setAttributes( + ResourceObject::Builder& ResourceObject::Builder::setAttributes( ResourceAttributes&& attrs) { m_resourceAttributes = std::move(attrs); return *this; } - PrimitiveServerResource::Ptr PrimitiveServerResource::Builder::create() + ResourceObject::Ptr ResourceObject::Builder::build() { OCResourceHandle handle{ nullptr }; - PrimitiveServerResource::Ptr server { - new PrimitiveServerResource{ m_properties, std::move(m_resourceAttributes) } }; + ResourceObject::Ptr server { + new ResourceObject{ m_properties, std::move(m_resourceAttributes) } }; - OC::EntityHandler entityHandler{ std::bind(&PrimitiveServerResource::entityHandler, + OC::EntityHandler entityHandler{ std::bind(&ResourceObject::entityHandler, server.get(), std::placeholders::_1) }; try @@ -174,7 +174,7 @@ namespace OIC } - PrimitiveServerResource::~PrimitiveServerResource() + ResourceObject::~ResourceObject() { if (m_resourceHandle) { @@ -189,31 +189,31 @@ namespace OIC } } - bool PrimitiveServerResource::removeAttribute(const std::string& key) + bool ResourceObject::removeAttribute(const std::string& key) { WeakGuard lock(*this); return m_resourceAttributes.erase(key); } - bool PrimitiveServerResource::hasAttribute(const std::string& key) const + bool ResourceObject::hasAttribute(const std::string& key) const { WeakGuard lock(*this); return m_resourceAttributes.contains(key); } - ResourceAttributes& PrimitiveServerResource::getAttributes() + ResourceAttributes& ResourceObject::getAttributes() { expectOwnLock(); return m_resourceAttributes; } - const ResourceAttributes& PrimitiveServerResource::getAttributes() const + const ResourceAttributes& ResourceObject::getAttributes() const { expectOwnLock(); return m_resourceAttributes; } - void PrimitiveServerResource::expectOwnLock() const + void ResourceObject::expectOwnLock() const { if (m_lockOwner != std::this_thread::get_id()) { @@ -221,27 +221,27 @@ namespace OIC } } - bool PrimitiveServerResource::isObservable() const + bool ResourceObject::isObservable() const { return ::hasProperty(m_properties, OC_OBSERVABLE); } - bool PrimitiveServerResource::isDiscoverable() const + bool ResourceObject::isDiscoverable() const { return ::hasProperty(m_properties, OC_DISCOVERABLE); } - void PrimitiveServerResource::setGetRequestHandler(GetRequestHandler h) + void ResourceObject::setGetRequestHandler(GetRequestHandler h) { m_getRequestHandler = h; } - void PrimitiveServerResource::setSetRequestHandler(SetRequestHandler h) + void ResourceObject::setSetRequestHandler(SetRequestHandler h) { m_setRequestHandler = h; } - void PrimitiveServerResource::notify() const + void ResourceObject::notify() const { using NotifyAllObservers = OCStackResult (*)(OCResourceHandle); @@ -249,7 +249,7 @@ namespace OIC m_resourceHandle); } - OCEntityHandlerResult PrimitiveServerResource::entityHandler( + OCEntityHandlerResult ResourceObject::entityHandler( std::shared_ptr< OC::OCResourceRequest > request) { if (!request) @@ -282,7 +282,7 @@ namespace OIC return OC_EH_ERROR; } - OCEntityHandlerResult PrimitiveServerResource::handleRequest( + OCEntityHandlerResult ResourceObject::handleRequest( std::shared_ptr< OC::OCResourceRequest > request) { if (request->getRequestType() == "GET") @@ -298,19 +298,19 @@ namespace OIC return OC_EH_ERROR; } - OCEntityHandlerResult PrimitiveServerResource::handleRequestGet( + OCEntityHandlerResult ResourceObject::handleRequestGet( std::shared_ptr< OC::OCResourceRequest > request) { return ::handleRequest(*this, request, m_getRequestHandler); } - OCEntityHandlerResult PrimitiveServerResource::handleRequestSet( + OCEntityHandlerResult ResourceObject::handleRequestSet( std::shared_ptr< OC::OCResourceRequest > request) { return ::handleRequest(*this, request, m_setRequestHandler); } - OCEntityHandlerResult PrimitiveServerResource::handleObserve( + OCEntityHandlerResult ResourceObject::handleObserve( std::shared_ptr< OC::OCResourceRequest > request) { if (!isObservable()) @@ -321,32 +321,32 @@ namespace OIC return OC_EH_OK; } - PrimitiveServerResource::LockGuard::LockGuard(const PrimitiveServerResource::Ptr ptr) : + ResourceObject::LockGuard::LockGuard(const ResourceObject::Ptr ptr) : LockGuard{ *ptr } { } - PrimitiveServerResource::LockGuard::LockGuard( - const PrimitiveServerResource& serverResource) : - m_serverResource(serverResource) + ResourceObject::LockGuard::LockGuard( + const ResourceObject& serverResource) : + m_resourceObject(serverResource) { - if (m_serverResource.m_lockOwner == std::this_thread::get_id()) + if (m_resourceObject.m_lockOwner == std::this_thread::get_id()) { throw DeadLockException{ "Can't lock recursively in same thread." }; } - m_serverResource.m_mutex.lock(); - m_serverResource.m_lockOwner = std::this_thread::get_id(); + m_resourceObject.m_mutex.lock(); + m_resourceObject.m_lockOwner = std::this_thread::get_id(); } - PrimitiveServerResource::LockGuard::~LockGuard() + ResourceObject::LockGuard::~LockGuard() { - m_serverResource.m_lockOwner = std::thread::id(); - m_serverResource.m_mutex.unlock(); + m_resourceObject.m_lockOwner = std::thread::id(); + m_resourceObject.m_mutex.unlock(); } - PrimitiveServerResource::WeakGuard::WeakGuard( - const PrimitiveServerResource& serverResource) : + ResourceObject::WeakGuard::WeakGuard( + const ResourceObject& serverResource) : m_serverResource(serverResource), m_hasLocked{ false } { if (m_serverResource.m_lockOwner != std::this_thread::get_id()) @@ -356,7 +356,7 @@ namespace OIC } } - PrimitiveServerResource::WeakGuard::~WeakGuard() + ResourceObject::WeakGuard::~WeakGuard() { if (m_hasLocked) { diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp index 86438ea..e110c3a 100644 --- a/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp +++ b/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveResponseTest.cpp @@ -22,7 +22,8 @@ #include #include -#include +#include + #include #include @@ -59,14 +60,14 @@ class PrimitiveResponseTest: public Test { public: MockRepository mocks; - PrimitiveServerResource::Ptr server; + ResourceObject::Ptr server; public: template< typename T > shared_ptr< OCResourceResponse > buildResponse(const T& response) { - PrimitiveServerResource::Ptr server = - PrimitiveServerResource::Builder("a/test", "", "").create(); + ResourceObject::Ptr server = + ResourceObject::Builder("a/test", "", "").build(); return response.getHandler()->buildResponse(*server, ResourceAttributes()); } @@ -79,7 +80,7 @@ protected: mocks.OnCallFunc(OCPlatform::unregisterResource).Return(OC_STACK_OK); - server = PrimitiveServerResource::Builder("a/test", "", "").create(); + server = ResourceObject::Builder("a/test", "", "").build(); } }; diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp index d5e258b..dee1f94 100644 --- a/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp +++ b/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp @@ -39,7 +39,7 @@ using RegisterResource = OCStackResult (*)(OCResourceHandle&, std::string&, class SimpleRequestHandlerTest: public Test { public: - PrimitiveServerResource::Ptr server; + ResourceObject::Ptr server; ResourceAttributes requestAttrs; @@ -51,7 +51,7 @@ protected: mocks.OnCallFuncOverload(static_cast(OC::OCPlatform::registerResource)) .Return(OC_STACK_OK); - server = PrimitiveServerResource::Builder("a/test", "resourceType", "").create(); + server = ResourceObject::Builder("a/test", "resourceType", "").build(); server->setAttribute(EXISTING, ORIGIN_VALUE); } @@ -95,7 +95,7 @@ TEST_F(SimpleRequestHandlerTest, ResponseHasAttrsSetByCustomAttrRequestHandler) class SetRequestProxyHandlerTest: public Test { public: - PrimitiveServerResource::Ptr server; + ResourceObject::Ptr server; ResourceAttributes requestAttrs; RequestHandler::Ptr setRequestProxyHandler; @@ -110,7 +110,7 @@ protected: setRequestProxyHandler = make_shared( make_shared()); - server = PrimitiveServerResource::Builder("a/test", "resourceType", "").create(); + server = ResourceObject::Builder("a/test", "resourceType", "").build(); server->setAttribute(EXISTING, ORIGIN_VALUE); } diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/ResourceObjectTest.cpp similarity index 77% rename from service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp rename to service/resource-manipulation/modules/serverBuilder/unittests/ResourceObjectTest.cpp index 925a712..74577d2 100644 --- a/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp +++ b/service/resource-manipulation/modules/serverBuilder/unittests/ResourceObjectTest.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include @@ -44,12 +44,12 @@ static constexpr char RESOURCE_URI[]{ "a/test" }; static constexpr char RESOURCE_TYPE[]{ "resourceType" }; static constexpr char KEY[]{ "key" }; -TEST(ServerResourceBuilderCreateTest, ThrowIfUriIsInvalid) +TEST(ResourceObjectBuilderCreateTest, ThrowIfUriIsInvalid) { - ASSERT_THROW(PrimitiveServerResource::Builder("", "", "").create(), PlatformException); + ASSERT_THROW(ResourceObject::Builder("", "", "").build(), PlatformException); } -class ServerResourceBuilderTest: public Test +class ResourceObjectBuilderTest: public Test { public: MockRepository mocks; @@ -62,46 +62,46 @@ protected: } }; -TEST_F(ServerResourceBuilderTest, RegisterResourceWhenCallCreate) +TEST_F(ResourceObjectBuilderTest, RegisterResourceWhenCallCreate) { mocks.ExpectCallFuncOverload(static_cast(OCPlatform::registerResource)) .Return(OC_STACK_OK); - PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, "").create(); + ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").build(); } -TEST_F(ServerResourceBuilderTest, ResourceServerHasPropertiesSetByBuilder) +TEST_F(ResourceObjectBuilderTest, ResourceServerHasPropertiesSetByBuilder) { - auto serverResource = PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, ""). - setDiscoverable(false).setObservable(true).create(); + auto serverResource = ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, ""). + setDiscoverable(false).setObservable(true).build(); EXPECT_FALSE(serverResource->isDiscoverable()); EXPECT_TRUE(serverResource->isObservable()); } -TEST_F(ServerResourceBuilderTest, ResourceServerHasAttrsSetByBuilder) +TEST_F(ResourceObjectBuilderTest, ResourceServerHasAttrsSetByBuilder) { ResourceAttributes attrs; attrs[KEY] = 100; - auto serverResource = PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, ""). - setAttributes(attrs).create(); + auto serverResource = ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, ""). + setAttributes(attrs).build(); - PrimitiveServerResource::LockGuard lock{ serverResource }; + ResourceObject::LockGuard lock{ serverResource }; EXPECT_EQ(attrs, serverResource->getAttributes()); } -class ServerResourceTest: public Test +class ResourceObjectTest: public Test { public: MockRepository mocks; - PrimitiveServerResource::Ptr server; + ResourceObject::Ptr server; protected: void SetUp() override { initMocks(); - server = PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, "").create(); + server = ResourceObject::Builder(RESOURCE_URI, RESOURCE_TYPE, "").build(); } virtual void initMocks() @@ -113,12 +113,12 @@ protected: } }; -TEST_F(ServerResourceTest, AccessAttributesWithLock) +TEST_F(ResourceObjectTest, AccessAttributesWithLock) { constexpr int value{ 100 }; { - PrimitiveServerResource::LockGuard lock{ server }; + ResourceObject::LockGuard lock{ server }; auto& attr = server->getAttributes(); attr[KEY] = value; } @@ -126,24 +126,24 @@ TEST_F(ServerResourceTest, AccessAttributesWithLock) ASSERT_EQ(value, server->getAttribute(KEY)); } -TEST_F(ServerResourceTest, ThrowIfTryToAccessAttributesWithoutLock) +TEST_F(ResourceObjectTest, ThrowIfTryToAccessAttributesWithoutLock) { ASSERT_THROW(server->getAttributes(), NoLockException); } -TEST_F(ServerResourceTest, ThrowIfLockRecursively) +TEST_F(ResourceObjectTest, ThrowIfLockRecursively) { - PrimitiveServerResource::LockGuard lock{ server }; + ResourceObject::LockGuard lock{ server }; - ASSERT_THROW(PrimitiveServerResource::LockGuard again{ server }, DeadLockException); + ASSERT_THROW(ResourceObject::LockGuard again{ server }, DeadLockException); } -TEST_F(ServerResourceTest, AccessingAttributesWithMethodsWithinLockDoesntCauseDeadLock) +TEST_F(ResourceObjectTest, AccessingAttributesWithMethodsWithinLockDoesntCauseDeadLock) { constexpr int value{ 100 }; { - PrimitiveServerResource::LockGuard lock{ server }; + ResourceObject::LockGuard lock{ server }; server->setAttribute(KEY, value); } @@ -152,7 +152,7 @@ TEST_F(ServerResourceTest, AccessingAttributesWithMethodsWithinLockDoesntCauseDe -class ServerResourceHandlingRequestTest: public ServerResourceTest +class ResourceObjectHandlingRequestTest: public ResourceObjectTest { public: EntityHandler handler; @@ -197,28 +197,28 @@ protected: { mocks.OnCallFuncOverload( static_cast(OCPlatform::registerResource)).Do( - bind(&ServerResourceHandlingRequestTest::registerResourceFake, + bind(&ResourceObjectHandlingRequestTest::registerResourceFake, this, _1, _2, _3, _4, _5, _6)); mocks.OnCallFunc(OCPlatform::unregisterResource).Return(OC_STACK_OK); } }; -TEST_F(ServerResourceHandlingRequestTest, CallSendResponseWhenReceiveRequest) +TEST_F(ResourceObjectHandlingRequestTest, CallSendResponseWhenReceiveRequest) { mocks.ExpectCallFunc(OCPlatform::sendResponse).Return(OC_STACK_OK); ASSERT_EQ(OC_EH_OK, handler(createRequest())); } -TEST_F(ServerResourceHandlingRequestTest, ReturnErrorCodeWhenSendResponseFailed) +TEST_F(ResourceObjectHandlingRequestTest, ReturnErrorCodeWhenSendResponseFailed) { mocks.ExpectCallFunc(OCPlatform::sendResponse).Return(OC_STACK_ERROR); ASSERT_EQ(OC_EH_ERROR, handler(createRequest())); } -TEST_F(ServerResourceHandlingRequestTest, SendResponseWithSameHandlesPassedByRequest) +TEST_F(ResourceObjectHandlingRequestTest, SendResponseWithSameHandlesPassedByRequest) { mocks.ExpectCallFunc(OCPlatform::sendResponse).Match( [](const shared_ptr response) @@ -231,7 +231,7 @@ TEST_F(ServerResourceHandlingRequestTest, SendResponseWithSameHandlesPassedByReq ASSERT_EQ(OC_EH_OK, handler(createRequest())); } -TEST_F(ServerResourceHandlingRequestTest, SendResponseWithPrimitiveResponseResults) +TEST_F(ResourceObjectHandlingRequestTest, SendResponseWithPrimitiveResponseResults) { constexpr int errorCode{ 1999 }; constexpr OCEntityHandlerResult result{ OC_EH_SLOW }; @@ -254,7 +254,7 @@ TEST_F(ServerResourceHandlingRequestTest, SendResponseWithPrimitiveResponseResul ASSERT_EQ(OC_EH_OK, handler(createRequest())); } -TEST_F(ServerResourceHandlingRequestTest, SendSetResponseWithCustomAttrsAndResults) +TEST_F(ResourceObjectHandlingRequestTest, SendSetResponseWithCustomAttrsAndResults) { constexpr int errorCode{ 1999 }; constexpr OCEntityHandlerResult result{ OC_EH_SLOW }; @@ -283,15 +283,15 @@ TEST_F(ServerResourceHandlingRequestTest, SendSetResponseWithCustomAttrsAndResul -class ServerResourceSynchronizationTest: public ServerResourceHandlingRequestTest +class ResourceObjectSynchronizationTest: public ResourceObjectHandlingRequestTest { public: - static void withLock(PrimitiveServerResource::Ptr serverResource, int count) + static void withLock(ResourceObject::Ptr serverResource, int count) { for (int i=0; igetAttributes(); @@ -299,18 +299,18 @@ public: } } - static void withSetter(PrimitiveServerResource::Ptr serverResource, int count) + static void withSetter(ResourceObject::Ptr serverResource, int count) { for (int i=0; isetAttribute(KEY, serverResource->getAttribute(KEY) + 1); } } }; -TEST_F(ServerResourceSynchronizationTest, MultipleAccessToServerResource) +TEST_F(ResourceObjectSynchronizationTest, MultipleAccessToServerResource) { int expected { 0 }; vector threads; @@ -337,7 +337,7 @@ TEST_F(ServerResourceSynchronizationTest, MultipleAccessToServerResource) ASSERT_EQ(expected, server->getAttribute(KEY)); } -TEST_F(ServerResourceSynchronizationTest, MultipleAccessToServerResourceWithRequests) +TEST_F(ResourceObjectSynchronizationTest, MultipleAccessToServerResourceWithRequests) { int expected { 0 }; vector threads;