From 1d1125fd3c82b40e7d9fc222b22f287f787ed431 Mon Sep 17 00:00:00 2001 From: coderhyme Date: Wed, 15 Jul 2015 00:02:45 +0900 Subject: [PATCH] Fix broken unit-test for the Resource Builder It is caused by AutoNotify which is new feature of ResourceObject. Change-Id: I20b423d9c155d9f410d809be6b91c4c945d480c7 Signed-off-by: coderhyme Change-Id: I20b423d9c155d9f410d809be6b91c4c945d480c7 Reviewed-on: https://gerrit.iotivity.org/gerrit/1648 Reviewed-by: Uze Choi Tested-by: Uze Choi --- .../src/serverBuilder/src/RequestHandler.cpp | 12 +++++++----- .../src/serverBuilder/unittests/RequestHandlerTest.cpp | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp b/service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp index 12f8f6f..e2bc59a 100755 --- a/service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp +++ b/service/resource-manipulation/src/serverBuilder/src/RequestHandler.cpp @@ -59,16 +59,18 @@ namespace return response; } - AttrKeyValuePairs applyAcceptMethod(ResourceObject& resource, const ResourceAttributes& requestAttrs) + AttrKeyValuePairs applyAcceptMethod(ResourceObject& resource, + const ResourceAttributes& requestAttrs) { ResourceObject::LockGuard lock(resource, ResourceObject::AutoNotifyPolicy::NEVER); return replaceAttributes(resource.getAttributes(), requestAttrs); } - AttrKeyValuePairs applyDefaultMethod(ResourceObject& resource, const ResourceAttributes& requestAttrs) + AttrKeyValuePairs applyDefaultMethod(ResourceObject& resource, + const ResourceAttributes& requestAttrs) { - ResourceObject::LockGuard lock(resource,ResourceObject::AutoNotifyPolicy::NEVER); + ResourceObject::LockGuard lock(resource, ResourceObject::AutoNotifyPolicy::NEVER); if (resource.getSetRequestHandlerPolicy() != ResourceObject::SetRequestHandlerPolicy::ACCEPTANCE @@ -85,8 +87,8 @@ namespace return AttrKeyValuePairs(); } - std::function getApplyAcceptanceFunc( - PrimitiveSetResponse::AcceptanceMethod method) + auto getApplyAcceptanceFunc(PrimitiveSetResponse::AcceptanceMethod method) -> + std::function { switch (method) { diff --git a/service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp b/service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp index 689948e..66c214e 100644 --- a/service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp +++ b/service/resource-manipulation/src/serverBuilder/unittests/RequestHandlerTest.cpp @@ -55,6 +55,7 @@ protected: server = ResourceObject::Builder("a/test", "resourceType", "").build(); + server->setAutoNotifyPolicy(ResourceObject::AutoNotifyPolicy::NEVER); server->setAttribute(EXISTING, ORIGIN_VALUE); } }; -- 2.7.4