Modify PPM linux Sample Application&plugins SConscript for convenience of verify

[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 e80c9df..653bdd3 100644 (file)
--- a/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
+++ b/service/resource-encapsulation/unittests/ResourceClient_Test.cpp
@@ -1,9 +1,31 @@
+//******************************************************************
+//
+// Copyright 2015 Samsung Electronics All Rights Reserved.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 #define private public
 #include <gtest/gtest.h>
 #include <iostream>
-#include "ResourceClient.h"
+#include "RCSDiscoveryManager.h"
+#include "RCSRemoteResourceObject.h"
 #include "RCSResourceObject.h"
 #include "OCPlatform.h"
+#include "RCSAddress.h"
 
 #define RESOURCEURI "/a/TemperatureSensor"
 #define RESOURCETYPE "Resource.Hosting"
@@ -14,8 +36,8 @@ using namespace OC;
 
 bool cbresult = false;
 std::string uri = "/oic/res?rt=Resource.Hosting";
-std::shared_ptr<RemoteResourceObject> object;
-DiscoveryManager *manager = DiscoveryManager::getInstance();
+std::shared_ptr<RCSRemoteResourceObject> object;
+RCSDiscoveryManager*manager = RCSDiscoveryManager::getInstance();
 ResourceState receivedResourceState;
 RCSResourceAttributes receivedResourceAttributes;
 RCSResourceObject::Ptr server;
@@ -45,7 +67,7 @@ void onRemoteAttrReceived(const RCSResourceAttributes &attributes)
     receivedResourceAttributes = attributes;
 }
 
-void onResourceDiscoveredCallback(std::shared_ptr<RemoteResourceObject> receivedObject)
+void onResourceDiscoveredCallback(std::shared_ptr<RCSRemoteResourceObject> receivedObject)
 {
     std::cout << "Resource discovered" << std::endl;
     object = receivedObject;
@@ -73,10 +95,10 @@ void OnRemoteAttributesSetCallback(const RCSResourceAttributes &attributes)
 TEST(ResourceClientTest, testDiscoverResourcePass)
 {
     createResource();
-    DiscoveryManager *instance = DiscoveryManager::getInstance();
+    RCSDiscoveryManager *instance = RCSDiscoveryManager::getInstance();
     cbresult = false;
-
-    instance->discoverResource("", uri, CT_DEFAULT, &onResourceDiscoveredCallback);
+    RCSAddress rcsAddress = RCSAddress::multicast();
+    instance->discoverResource(rcsAddress, uri , &onResourceDiscoveredCallback);
     sleep(2);
     EXPECT_TRUE(object != NULL);
     destroyResource();
@@ -124,7 +146,8 @@ TEST(ResourceClientTest, testSetRemoteAttributesPass)
 TEST(ResourceClientTest, testIsMonitoring)
 {
     createResource();
-    manager->DiscoveryManager::discoverResource("", uri, CT_DEFAULT, &onResourceDiscoveredCallback);
+    RCSAddress rcsAddress = RCSAddress::multicast();
+    manager->RCSDiscoveryManager::discoverResource(rcsAddress, uri , &onResourceDiscoveredCallback);
     sleep(1);
     destroyResource();
     EXPECT_FALSE(object->isMonitoring());
@@ -318,7 +341,7 @@ TEST(ResourceClientTest, testGetCachedAttribute)
 TEST(ResourceClientTest, testGetInstance)
 {
     createResource();
-    DiscoveryManager *instance = DiscoveryManager::getInstance();
+    RCSDiscoveryManager *instance = RCSDiscoveryManager::getInstance();
     EXPECT_TRUE(instance != NULL);
     destroyResource();
 }
@@ -327,8 +350,9 @@ TEST(ResourceClientTest, testGetInstance)
 TEST(ResourceClientTest, testDiscoverResourceEmptyResource)
 {
     createResource();
-    DiscoveryManager *instance = DiscoveryManager::getInstance();
-    EXPECT_THROW(instance->discoverResource("", "", CT_DEFAULT, &onResourceDiscoveredCallback),
+    RCSDiscoveryManager *instance = RCSDiscoveryManager::getInstance();
+    RCSAddress rcsAddress = RCSAddress::multicast();
+    EXPECT_THROW(instance->discoverResource(rcsAddress, "", &onResourceDiscoveredCallback),
                  InvalidParameterException);
     destroyResource();
 }
@@ -337,8 +361,9 @@ TEST(ResourceClientTest, testDiscoverResourceEmptyResource)
 TEST(ResourceClientTest, testDiscoverResourceEmptyCallback)
 {
     createResource();
-    DiscoveryManager *instance = DiscoveryManager::getInstance();
-    EXPECT_THROW(instance->discoverResource("", uri, CT_DEFAULT, NULL), InvalidParameterException);
+    RCSDiscoveryManager *instance = RCSDiscoveryManager::getInstance();
+    RCSAddress rcsAddress = RCSAddress::multicast();
+    EXPECT_THROW(instance->discoverResource(rcsAddress, uri , NULL), InvalidParameterException);
     destroyResource();
     object->stopMonitoring();
 }