Add resource type parameter to server builder to prevent registerResource error

To prevent crash in unit test by an exception thrown by base when resource type is empty

Change-Id: I924f568593839a4ddf9ef39a1695452ad1c77549
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1451
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp
index 7402d64..58f81a9 100644 (file)
--- a/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp
+++ b/service/resource-manipulation/modules/serverBuilder/unittests/PrimitiveServerResourceTest.cpp
@@ -40,8 +40,9 @@ typedef OCStackResult (*registerResourceSig)(OCResourceHandle&,
                        EntityHandler,
                        uint8_t );
 
-static constexpr char RESOURCE_URI[] = "a/test";
-static constexpr char KEY[] = "key";
+static constexpr char RESOURCE_URI[]{ "a/test" };
+static constexpr char RESOURCE_TYPE[]{ "resourceType" };
+static constexpr char KEY[]{ "key" };
 
 TEST(ServerResourceBuilderTest, ThrowIfUriIsInvalid)
 {
@@ -55,12 +56,12 @@ TEST(ServerResourceBuilderTest, RegisterResourceWhenCallCreate)
     mocks.ExpectCallFuncOverload(
             static_cast<registerResourceSig>(OCPlatform::registerResource)).Return(OC_STACK_OK);
 
-    PrimitiveServerResource::Builder(RESOURCE_URI, "", "").create();
+    PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, "").create();
 }
 
 TEST(ServerResourceBuilderTest, ResourceServerHasPropertiesSetByBuilder)
 {
-    auto serverResource = PrimitiveServerResource::Builder(RESOURCE_URI, "", "").
+    auto serverResource = PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, "").
             setDiscoverable(false).setObservable(true).create();
 
     EXPECT_FALSE(serverResource->isDiscoverable());
@@ -72,7 +73,7 @@ TEST(ServerResourceBuilderTest, ResourceServerHasAttrsSetByBuilder)
     ResourceAttributes attrs;
     attrs[KEY] = 100;
 
-    auto serverResource = PrimitiveServerResource::Builder(RESOURCE_URI, "", "").
+    auto serverResource = PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, "").
             setAttributes(attrs).create();
 
     PrimitiveServerResource::LockGuard lock{ serverResource };
@@ -90,7 +91,7 @@ protected:
     void SetUp() override
     {
         initMocks();
-        server = PrimitiveServerResource::Builder(RESOURCE_URI, "", "").create();
+        server = PrimitiveServerResource::Builder(RESOURCE_URI, RESOURCE_TYPE, "").create();
     }
 
     virtual void initMocks()
@@ -331,7 +332,7 @@ TEST_F(ServerResourceSynchronizationTest, MultipleAccessToServerResourceWithRequ
     int expected { 0 };
     vector<thread> threads;
 
-    mocks.ExpectCallFunc(OCPlatform::sendResponse).Return(OC_STACK_OK);
+    mocks.OnCallFunc(OCPlatform::sendResponse).Return(OC_STACK_OK);
 
     server->setAttribute(KEY, 0);
 

diff --git a/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp b/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp
index bf515b7..b5bb49d 100644 (file)
--- a/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp
+++ b/service/resource-manipulation/modules/serverBuilder/unittests/RequestHandlerTest.cpp
@@ -43,7 +43,7 @@ public:
 protected:
     void SetUp() override
     {
-        server = PrimitiveServerResource::Builder("a/test", "", "").create();
+        server = PrimitiveServerResource::Builder("a/test", "resourceType", "").create();
 
         server->setAttribute(EXISTING, ORIGIN_VALUE);
     }
@@ -97,7 +97,7 @@ protected:
         setRequestProxyHandler = make_shared<SetRequestProxyHandler>(
                 make_shared<SimpleRequestHandler>());
 
-        server = PrimitiveServerResource::Builder("a/test", "", "").create();
+        server = PrimitiveServerResource::Builder("a/test", "resourceType", "").create();
 
         server->setAttribute(EXISTING, ORIGIN_VALUE);
     }