Rename ResourceObject to RCSResourceObject

[platform/upstream/iotivity.git] / service / resource-encapsulation / unittests / ResourceClient_Test.cpp

diff --git a/service/resource-encapsulation/unittests/ResourceClient_Test.cpp b/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
index 80183b6..78e86f6 100644 (file)
--- a/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
+++ b/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 #include <iostream>
 #include "ResourceClient.h"
-#include "ResourceObject.h"
+#include "RCSResourceObject.h"
 #include "OCPlatform.h"
 
 #define RESOURCEURI "/a/TemperatureSensor"
@@ -18,11 +18,11 @@ std::shared_ptr<RemoteResourceObject> object;
 DiscoveryManager *manager = DiscoveryManager::getInstance();
 ResourceState receivedResourceState;
 ResourceAttributes receivedResourceAttributes;
-ResourceObject::Ptr server;
+RCSResourceObject::Ptr server;
 
 void createResource()
 {
-    server = ResourceObject::Builder(RESOURCEURI, RESOURCETYPE,
+    server = RCSResourceObject::Builder(RESOURCEURI, RESOURCETYPE,
                                      RESOURCEINTERFACE).setDiscoverable(true).setObservable(true).build();
     std::cout << "Resource created successfully " << std::endl;
     server->setAttribute("Temperature", 0);
@@ -250,7 +250,7 @@ TEST(ResourceClientTest, testGetCachedAttributesWithoutCallback)
 {
     createResource();
     ResourceAttributes result = object->getCachedAttributes();
-    EXPECT_TRUE(result != NULL);
+    EXPECT_TRUE(result.empty());
     destroyResource();
 }
 
@@ -259,8 +259,7 @@ TEST(ResourceClientTest, testGetCachedAttributeWithInvalidAttribute)
 {
     createResource();
     ResourceAttributes::Value result = object->getCachedAttribute("");
-    std::nullptr_t null;
-    EXPECT_TRUE(result == null);
+    EXPECT_TRUE(result == nullptr);
     destroyResource();
 }
 
@@ -278,7 +277,7 @@ TEST(ResourceClientTest, testGetUri)
 {
     createResource();
     std::string result = object->getUri();
-    EXPECT_TRUE(result != NULL);
+    EXPECT_TRUE(!result.empty());
     destroyResource();
 }
 
@@ -286,7 +285,7 @@ TEST(ResourceClientTest, testGetAddress)
 {
     createResource();
     std::string result = object->getAddress();
-    EXPECT_TRUE(result != NULL);
+    EXPECT_TRUE(!result.empty());
     destroyResource();
 }
 
@@ -311,7 +310,7 @@ TEST(ResourceClientTest, testGetCachedAttribute)
 {
     createResource();
     ResourceAttributes::Value result = object->getCachedAttribute("Temperature");
-    EXPECT_TRUE(result != NULL);
+    EXPECT_TRUE(result != nullptr);
     destroyResource();
 }