Eliminate result code from RCSGetResponse and RCSSetResponse.

[platform/upstream/iotivity.git] / service / resource-encapsulation / src / serverBuilder / unittests / RCSResourceObjectTest.cpp

diff --git a/service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp b/service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp
index f00d33a..3e15bbc 100644 (file)
--- a/service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp
+++ b/service/resource-encapsulation/src/serverBuilder/unittests/RCSResourceObjectTest.cpp
@@ -167,6 +167,7 @@ TEST_F(ResourceObjectTest, SettingNestedVectorAttributesIsSameToGettingNestedVec
     ASSERT_EQ(arr31, server->getAttribute<vector<vector<vector<int>>>>(KEY));
 }
 
+
 class AutoNotifyTest: public ResourceObjectTest
 {
 protected:
@@ -374,30 +375,27 @@ TEST_F(ResourceObjectHandlingRequestTest, SendResponseWithSameHandlesPassedByReq
 TEST_F(ResourceObjectHandlingRequestTest, SendResponseWithRCSResponseResults)
 {
     constexpr int errorCode{ 1999 };
-    constexpr OCEntityHandlerResult result{ OC_EH_SLOW };
 
     server->setGetRequestHandler(
             [](const RCSRequest&, RCSResourceAttributes&) -> RCSGetResponse
             {
-                return RCSGetResponse::create(result, errorCode);
+                return RCSGetResponse::create(errorCode);
             }
     );
 
     mocks.ExpectCallFunc(OCPlatform::sendResponse).Match(
             [](const shared_ptr<OCResourceResponse> response)
             {
-                return response->getErrorCode() == errorCode &&
-                        response->getResponseResult() == result;
+                return response->getErrorCode() == errorCode;
             }
     ).Return(OC_STACK_OK);
 
     ASSERT_EQ(OC_EH_OK, handler(createRequest()));
 }
 
-TEST_F(ResourceObjectHandlingRequestTest, SendSetResponseWithCustomAttrsAndResults)
+TEST_F(ResourceObjectHandlingRequestTest, SendSetResponseWithCustomAttrs)
 {
     constexpr int errorCode{ 1999 };
-    constexpr OCEntityHandlerResult result{ OC_EH_SLOW };
     constexpr char value[]{ "value" };
 
     server->setSetRequestHandler(
@@ -405,7 +403,7 @@ TEST_F(ResourceObjectHandlingRequestTest, SendSetResponseWithCustomAttrsAndResul
             {
                 RCSResourceAttributes attrs;
                 attrs[KEY] = value;
-                return RCSSetResponse::create(attrs, result, errorCode);
+                return RCSSetResponse::create(attrs, errorCode);
             }
     );
 
@@ -413,8 +411,7 @@ TEST_F(ResourceObjectHandlingRequestTest, SendSetResponseWithCustomAttrsAndResul
             [](const shared_ptr<OCResourceResponse> response)
             {
                 return value == response->getResourceRepresentation()[KEY].getValue<std::string>()
-                        && response->getErrorCode() == errorCode
-                        && response->getResponseResult() == result;
+                        && response->getErrorCode() == errorCode;
             }
     ).Return(OC_STACK_OK);