X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fresource-encapsulation%2Fsrc%2Fcommon%2FprimitiveResource%2Funittests%2FPrimitiveResourceTest.cpp;h=dcf5c3cf38406544284c3a63a35450072c525aa9;hb=refs%2Ftags%2Fsubmit%2Ftizen_4.0%2F20171010.021147;hp=8f15ad558ac6608fe30822f8cbd34fd12efad7bf;hpb=84ddde8349acc67db8f013a2f3737669d986bffc;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp b/service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
index 8f15ad5..dcf5c3c 100644
--- a/service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
+++ b/service/resource-encapsulation/src/common/primitiveResource/unittests/PrimitiveResourceTest.cpp
@@ -18,13 +18,13 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include <UnitTestHelper.h>
+#include "UnitTestHelper.h"
 
-#include <PrimitiveResourceImpl.h>
-#include <AssertUtils.h>
+#include "PrimitiveResourceImpl.h"
+#include "AssertUtils.h"
 
-#include <OCResource.h>
-#include <OCPlatform.h>
+#include "OCResource.h"
+#include "OCPlatform.h"
 
 using namespace OIC::Service;
 
@@ -35,11 +35,15 @@ class FakeOCResource
 public:
     virtual ~FakeOCResource() {};
 
-    virtual OCStackResult get(const OC::QueryParamsMap&, OC::GetCallback) = 0;
+    virtual OCStackResult get(const std::string&, const std::string&,
+            const OC::QueryParamsMap&, OC::GetCallback) = 0;
 
     virtual OCStackResult put(
             const OC::OCRepresentation&, const OC::QueryParamsMap&, OC::PutCallback) = 0;
 
+    virtual OCStackResult post(const std::string&, const std::string&,
+            const OC::OCRepresentation&, const OC::QueryParamsMap&, OC::PostCallback) = 0;
+
     virtual OCStackResult observe(
             OC::ObserveType, const OC::QueryParamsMap&, OC::ObserveCallback) = 0;
 
@@ -50,6 +54,7 @@ public:
     virtual std::string host() const = 0;
     virtual std::vector<std::string> getResourceTypes() const = 0;
     virtual std::vector<std::string> getResourceInterfaces() const = 0;
+    virtual OCConnectivityType connectivityType() const = 0;
 
     virtual bool isObservable() const = 0;
 };
@@ -82,32 +87,33 @@ TEST_F(PrimitiveResourceTest, RequestGetThrowsOCResourceGetReturnsNotOK)
 {
     mocks.OnCall(fakeResource, FakeOCResource::get).Return(OC_STACK_ERROR);
 
-    ASSERT_THROW(resource->requestGet(PrimitiveResource::GetCallback()), PlatformException);
+    ASSERT_THROW(resource->requestGet(PrimitiveResource::GetCallback()), RCSPlatformException);
 }
 
-TEST_F(PrimitiveResourceTest, RequestSetInvokesOCResourcePut)
+TEST_F(PrimitiveResourceTest, RequestSetInvokesOCResourcePost)
 {
-    mocks.ExpectCall(fakeResource, FakeOCResource::put).Return(OC_STACK_OK);
+    mocks.ExpectCall(fakeResource, FakeOCResource::post).Return(OC_STACK_OK);
 
     resource->requestSet(RCSResourceAttributes{ }, PrimitiveResource::SetCallback());
 }
 
-TEST_F(PrimitiveResourceTest, RequestSetThrowsOCResourcePutReturnsNotOK)
+TEST_F(PrimitiveResourceTest, RequestSetThrowsOCResourcePostReturnsNotOK)
 {
-    mocks.OnCall(fakeResource, FakeOCResource::put).Return(OC_STACK_ERROR);
+    mocks.OnCall(fakeResource, FakeOCResource::post).Return(OC_STACK_ERROR);
 
     ASSERT_THROW(resource->requestSet(RCSResourceAttributes{ }, PrimitiveResource::SetCallback()),
-            PlatformException);
+            RCSPlatformException);
 }
 
-TEST_F(PrimitiveResourceTest, RequestSetPassResourceAttributesToOCResourcePut)
+TEST_F(PrimitiveResourceTest, RequestSetPassResourceAttributesToOCResourcePost)
 {
     constexpr int value{ -200 };
 
     RCSResourceAttributes attrs;
 
-    mocks.ExpectCall(fakeResource, FakeOCResource::put).Match(
-            [](const OC::OCRepresentation& ocRep, const OC::QueryParamsMap&, OC::PutCallback)
+    mocks.ExpectCall(fakeResource, FakeOCResource::post).Match(
+            [](const std::string&, const std::string&, const OC::OCRepresentation& ocRep,
+                    const OC::QueryParamsMap&, OC::PutCallback)
             {
                 return ocRep.getValue<int>(KEY) == value;
             }
@@ -129,7 +135,7 @@ TEST_F(PrimitiveResourceTest, RequestObserveThrowsOCResourceObserveReturnsNotOK)
 {
     mocks.OnCall(fakeResource, FakeOCResource::observe).Return(OC_STACK_ERROR);
 
-    ASSERT_THROW(resource->requestObserve(PrimitiveResource::ObserveCallback()), PlatformException);
+    ASSERT_THROW(resource->requestObserve(PrimitiveResource::ObserveCallback()), RCSPlatformException);
 }
 
 TEST_F(PrimitiveResourceTest, DelegteGettersToOCResource)
@@ -153,7 +159,7 @@ TEST_F(PrimitiveResourceTest, ResponseStatementHasSameValuesWithOCRepresentation
     constexpr int value{ 1999 };
 
     mocks.OnCall(fakeResource, FakeOCResource::get).Do(
-            [](const OC::QueryParamsMap&, OC::GetCallback cb)
+            [](const std::string&, const std::string&, const OC::QueryParamsMap&, OC::GetCallback cb)
             {
                 OC::OCRepresentation ocRep;
                 ocRep[KEY] = value;
@@ -204,6 +210,6 @@ TEST_F(DiscoverResourceTest, ThrowsdWhenOCPlatformFindResourceReturnsNotOK)
     mocks.ExpectCallFuncOverload(static_cast<FindResource>(OC::OCPlatform::findResource)).
             Return(OC_STACK_ERROR);
 
-    EXPECT_THROW(discoverResource("", "", OCConnectivityType{ }, discovered), PlatformException);
+    EXPECT_THROW(discoverResource("", "", OCConnectivityType{ }, discovered), RCSPlatformException);
 }