Modify resourceContainer code files for active discovery manager

- add variable for RCSDiscoveryTask.

Change-Id: Ic26daafcb70c8c59242debcddcbd1307e84aae01
Signed-off-by: Younghyun Joo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2773
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/resource-encapsulation/src/resourceContainer/include/DiscoverResourceUnit.h b/service/resource-encapsulation/src/resourceContainer/include/DiscoverResourceUnit.h
index e610016..227c1a7 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/include/DiscoverResourceUnit.h
+++ b/service/resource-encapsulation/src/resourceContainer/include/DiscoverResourceUnit.h
@@ -70,6 +70,7 @@ namespace OIC
                 std::string m_ResourceType;
                 std::string m_AttrubuteName;
                 std::atomic_bool isStartedDiscovery;
+                std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> discoveryTask;
 
                 std::vector<RemoteResourceUnit::Ptr> m_vecRemoteResource;
                 RCSDiscoveryManager::ResourceDiscoveredCallback pDiscoveredCB;

diff --git a/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp b/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp
index 32cfd6e..e34ff3b 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp
@@ -68,8 +68,8 @@ void DiscoverResourceUnit::startDiscover(DiscoverResourceInfo info, UpdatedCB up
             pDiscoveredCB = std::bind(&DiscoverResourceUnit::discoverdCB, this, std::placeholders::_1, m_Uri);
         }
 
-        RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::multicast(), m_ResourceType,
-                pDiscoveredCB);
+        discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(
+                RCSAddress::multicast(), m_ResourceType, pDiscoveredCB);
     }
     catch (InvalidParameterException &e)
     {

diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
index bd413e2..737cc04 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
+++ b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp
@@ -42,7 +42,7 @@
 #include "RCSResourceObject.h"
 #include "RCSRemoteResourceObject.h"
 
-#include "ResourceEncapsulationTesetSimulator.h"
+#include "ResourceContainerTestSimulator.h"
 
 using namespace std;
 using namespace testing;
@@ -679,7 +679,7 @@ class DiscoverResourceUnitTest: public TestWithMock
                                    std::vector<RCSResourceAttributes::Value> values)>
         UpdatedCB;
     public:
-        ResourceEncapsulationTestSimulator::Ptr testObject;
+        ResourceContainerTestSimulator::Ptr testObject;
         DiscoverResourceUnit::Ptr m_pDiscoverResourceUnit;
         std::string m_bundleId;
         UpdatedCB m_updatedCB;
@@ -689,7 +689,7 @@ class DiscoverResourceUnitTest: public TestWithMock
         {
             TestWithMock::SetUp();
 
-            testObject = std::make_shared<ResourceEncapsulationTestSimulator>();
+            testObject = std::make_shared<ResourceContainerTestSimulator>();
             testObject->createResource();
             m_bundleId = "/a/TempHumSensor/Container";
             m_pDiscoverResourceUnit = std::make_shared< DiscoverResourceUnit >( m_bundleId );
@@ -744,7 +744,7 @@ class RemoteResourceUnitTest: public TestWithMock
         UpdatedCBFromServer;
 
     public:
-        ResourceEncapsulationTestSimulator::Ptr testObject;
+        ResourceContainerTestSimulator::Ptr testObject;
         RemoteResourceUnit::Ptr m_pRemoteResourceUnit;
         RCSRemoteResourceObject::Ptr m_pRCSRemoteResourceObject;
         UpdatedCBFromServer m_updatedCBFromServer;
@@ -754,7 +754,7 @@ class RemoteResourceUnitTest: public TestWithMock
         {
             TestWithMock::SetUp();
 
-            testObject = std::make_shared<ResourceEncapsulationTestSimulator>();
+            testObject = std::make_shared<ResourceContainerTestSimulator>();
             testObject->defaultRunSimulator();
             m_pRCSRemoteResourceObject = testObject->getRemoteResource();
             m_updatedCBFromServer = ([](RemoteResourceUnit::UPDATE_MSG, RCSRemoteResourceObject::Ptr) {});
@@ -768,7 +768,7 @@ class RemoteResourceUnitTest: public TestWithMock
         }
 };
 
-/*TEST_F(RemoteResourceUnitTest, createRemoteResourceInfo)
+TEST_F(RemoteResourceUnitTest, createRemoteResourceInfo)
 {
     EXPECT_NE(nullptr, m_pRemoteResourceUnit->createRemoteResourceInfo(m_pRCSRemoteResourceObject,
               m_updatedCBFromServer));
@@ -816,18 +816,3 @@ TEST_F(RemoteResourceUnitTest, onCacheCBCalled)
     testObject->ChangeAttributeValue();
     EXPECT_TRUE(isCalled);
 }
-
-TEST_F(RemoteResourceUnitTest, onStateCBCalled)
-{
-    bool isCalled = false;
-    mocks.ExpectCallFunc(onStateCB).Do(
-        [this, &isCalled](ResourceState)
-    {
-        isCalled = true;
-    });
-    RemoteResourceUnit::Ptr ptr = m_pRemoteResourceUnit->createRemoteResourceInfoWithStateCB(
-                                      m_pRCSRemoteResourceObject, m_updatedCBFromServer, onStateCB);
-    ptr->startMonitoring();
-    testObject->ChangeResourceState();
-    EXPECT_TRUE(isCalled);
-}*/

diff --git a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceEncapsulationTesetSimulator.h b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h
similarity index 70%
rename from service/resource-encapsulation/src/resourceContainer/unittests/ResourceEncapsulationTesetSimulator.h
rename to service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h
index cf681a6..364f5b1 100644 (file)
--- a/service/resource-encapsulation/src/resourceContainer/unittests/ResourceEncapsulationTesetSimulator.h
+++ b/service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h
@@ -1,4 +1,23 @@
-//ResourceEncapsulationTestSimulator.h
+//******************************************************************
+//
+// 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.
+//
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 #include <memory>
 #include <mutex>
 #include <atomic>
@@ -10,16 +29,14 @@
 #include "RCSResourceAttributes.h"
 #include "RCSAddress.h"
 
-//#include "RequestObject.h"
-
 using namespace testing;
 using namespace OIC::Service;
 
-class ResourceEncapsulationTestSimulator
-    : public std::enable_shared_from_this<ResourceEncapsulationTestSimulator>
+class ResourceContainerTestSimulator
+    : public std::enable_shared_from_this<ResourceContainerTestSimulator>
 {
     public:
-        typedef std::shared_ptr<ResourceEncapsulationTestSimulator> Ptr;
+        typedef std::shared_ptr<ResourceContainerTestSimulator> Ptr;
 
         RCSResourceObject::Ptr server;
         RCSRemoteResourceObject::Ptr remoteResource;
@@ -33,9 +50,10 @@ class ResourceEncapsulationTestSimulator
         std::string RESOURCEINTERFACE;
         std::string ATTR_KEY;
         int ATTR_VALUE;
+        std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> discoveryTask;
 
     public:
-        ResourceEncapsulationTestSimulator()
+        ResourceContainerTestSimulator()
             : server(nullptr), remoteResource(nullptr),
               mutexForDiscovery(),
               MULTICASTURI("/oic/res"),
@@ -46,7 +64,7 @@ class ResourceEncapsulationTestSimulator
               ATTR_VALUE(0)
         { }
 
-        ~ResourceEncapsulationTestSimulator()
+        ~ResourceContainerTestSimulator()
         {
             if (remoteResource != nullptr && remoteResource->isCaching())
             {
@@ -76,9 +94,9 @@ class ResourceEncapsulationTestSimulator
         }
 
         static void onDiscoveryResource(RCSRemoteResourceObject::Ptr resourceObject,
-                                        std::weak_ptr<ResourceEncapsulationTestSimulator> rPtr)
+                                        std::weak_ptr<ResourceContainerTestSimulator> rPtr)
         {
-            std::shared_ptr<ResourceEncapsulationTestSimulator> ptr = rPtr.lock();
+            std::shared_ptr<ResourceContainerTestSimulator> ptr = rPtr.lock();
             if (ptr != nullptr)
             {
                 ptr->onDiscoveryResource_Impl(resourceObject);
@@ -126,11 +144,10 @@ class ResourceEncapsulationTestSimulator
         {
             try
             {
-                RCSDiscoveryManager::getInstance()->discoverResourceByType(RCSAddress::multicast(),
-                        MULTICASTURI, resourceType,
-                        std::bind(onDiscoveryResource,
-                                  std::placeholders::_1,
-                                  std::weak_ptr<ResourceEncapsulationTestSimulator>(shared_from_this())));
+                discoveryTask = RCSDiscoveryManager::getInstance()->discoverResourceByType(
+                        RCSAddress::multicast(), MULTICASTURI, resourceType,
+                        std::bind(onDiscoveryResource, std::placeholders::_1,
+                           std::weak_ptr<ResourceContainerTestSimulator>(shared_from_this())));
                 mutexForDiscovery.lock();
             }
             catch (std::exception &e)