and tranfer "RCSDiscoveryTask"'s location into "RCSDiscoveryMananger".
- if input value(relativeUri) is empty, will be discovered after be changed into "OC_RSRVD_WELL_KNOWN_URI".
- delete white space.
- According to move "RCSDiscoveryTask" into "RCSDiscoveryManager", changed name from "RCSDiscoveryTask" to "DiscoverTask".
Change-Id: I544d001e5b3a2f0fda75452f86430aceee2b46e5
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2663
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
Tested-by: Madan Lanka <lanka.madan@samsung.com>
class RCSRemoteResourceObject;
class RCSAddress;
- class RCSDiscoveryTask
+ /**
+ * This class contains the resource discovery methods.
+ *
+ * @see RCSRemoteResourceObject
+ */
+ class RCSDiscoveryManager
{
public:
+ class DiscoveryTask
+ {
+ public:
- void cancel();
- bool isCanceled();
- ~RCSDiscoveryTask();
-
- public:
+ void cancel();
+ bool isCanceled();
+ ~DiscoveryTask();
- RCSDiscoveryTask(const RCSDiscoveryTask&) = delete;
- RCSDiscoveryTask(RCSDiscoveryTask&&) = delete;
- RCSDiscoveryTask& operator = (const RCSDiscoveryTask&) const = delete;
- RCSDiscoveryTask& operator = (RCSDiscoveryTask&&) const = delete;
+ public:
- private:
+ DiscoveryTask(const DiscoveryTask&) = delete;
+ DiscoveryTask(DiscoveryTask&&) = delete;
+ DiscoveryTask& operator = (const DiscoveryTask&) const = delete;
+ DiscoveryTask& operator = (DiscoveryTask&&) const = delete;
- explicit RCSDiscoveryTask(unsigned int id) : m_id{ id } {};
- private:
+ private:
- unsigned int m_id;
- friend class RCSDiscoveryManager;
- friend class RCSDiscoveryManagerImpl;
- };
+ explicit DiscoveryTask(unsigned int id) : m_id{ id } {};
+ private:
- /**
- * This class contains the resource discovery methods.
- *
- * @see RCSRemoteResourceObject
- */
- class RCSDiscoveryManager
- {
+ unsigned int m_id;
+ friend class RCSDiscoveryManagerImpl;
+ };
public:
/**
* @see RCSAddress
*
*/
- std::unique_ptr<RCSDiscoveryTask> discoverResource(const RCSAddress& address,
+ std::unique_ptr<DiscoveryTask> discoverResource(const RCSAddress& address,
ResourceDiscoveredCallback cb);
/**
* @see RCSAddress
*
*/
- std::unique_ptr<RCSDiscoveryTask> discoverResource(const RCSAddress& address,
+ std::unique_ptr<DiscoveryTask> discoverResource(const RCSAddress& address,
const std::string& relativeURI, ResourceDiscoveredCallback cb);
/**
* @see RCSAddress
*
*/
- std::unique_ptr<RCSDiscoveryTask> discoverResourceByType(const RCSAddress& address,
+ std::unique_ptr<DiscoveryTask> discoverResourceByType(const RCSAddress& address,
const std::string& resourceType, ResourceDiscoveredCallback cb);
/**
* @see RCSAddress
*
*/
- std::unique_ptr<RCSDiscoveryTask> discoverResourceByType(const RCSAddress& address,
+ std::unique_ptr<DiscoveryTask> discoverResourceByType(const RCSAddress& address,
const std::string& relativeURI, const std::string& resourceType,
ResourceDiscoveredCallback cb);
RCSDiscoveryManager() = default;
~RCSDiscoveryManager()= default;;
- friend class RCSDiscoveryTask;
+ friend class DiscoveryTask;
};
}
}
class RCSDiscoveryManager;
class PrimitiveResource;
class RCSAddress;
- class RCSDiscoveryTask;
class DiscoverRequestInfo
{
public:
public:
- std::unique_ptr<RCSDiscoveryTask> startDiscovery(const RCSAddress& address,
+ std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> startDiscovery(const RCSAddress& address,
const std::string& relativeURI,const std::string& resourceType,
RCSDiscoveryManager::ResourceDiscoveredCallback cb);
return &instance;
}
- std::unique_ptr<RCSDiscoveryTask> RCSDiscoveryManager::discoverResource(const RCSAddress& address,
+ std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> RCSDiscoveryManager::discoverResource(const RCSAddress& address,
ResourceDiscoveredCallback cb) {
return discoverResourceByType(address, OC_RSRVD_WELL_KNOWN_URI, "",
std::move(cb));
}
- std::unique_ptr<RCSDiscoveryTask> RCSDiscoveryManager::discoverResource(const RCSAddress& address,
+ std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> RCSDiscoveryManager::discoverResource(const RCSAddress& address,
const std::string& relativeURI, ResourceDiscoveredCallback cb) {
return discoverResourceByType(address, relativeURI, "", std::move(cb));
}
- std::unique_ptr<RCSDiscoveryTask> RCSDiscoveryManager::discoverResourceByType(
+ std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> RCSDiscoveryManager::discoverResourceByType(
const RCSAddress& address, const std::string& resourceType, ResourceDiscoveredCallback cb) {
return discoverResourceByType(address, OC_RSRVD_WELL_KNOWN_URI,
resourceType, std::move(cb));
}
- std::unique_ptr<RCSDiscoveryTask> RCSDiscoveryManager::discoverResourceByType(
+ std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> RCSDiscoveryManager::discoverResourceByType(
const RCSAddress& address, const std::string& relativeURI,
const std::string& resourceType, ResourceDiscoveredCallback cb) {
return RCSDiscoveryManagerImpl::getInstance()->startDiscovery(address,
- relativeURI, resourceType, std::move(cb));
+ relativeURI.empty() ? OC_RSRVD_WELL_KNOWN_URI : relativeURI,
+ resourceType, std::move(cb));
}
- RCSDiscoveryTask::~RCSDiscoveryTask(){
+ RCSDiscoveryManager::DiscoveryTask::~DiscoveryTask(){
cancel();
}
- bool RCSDiscoveryTask::isCanceled() {
+ bool RCSDiscoveryManager::DiscoveryTask::isCanceled() {
auto it = RCSDiscoveryManagerImpl::getInstance();
if(it->m_discoveryMap.find(m_id) == it->m_discoveryMap.end())
return false;
}
- void RCSDiscoveryTask::cancel(){
+ void RCSDiscoveryManager::DiscoveryTask::cancel(){
RCSDiscoveryManagerImpl::getInstance()->m_discoveryMap.erase(m_id);
}
}
}
}
- std::unique_ptr<RCSDiscoveryTask> RCSDiscoveryManagerImpl::startDiscovery(const RCSAddress& address,
+ std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> RCSDiscoveryManagerImpl::startDiscovery(const RCSAddress& address,
const std::string& relativeURI, const std::string& resourceType,
RCSDiscoveryManager::ResourceDiscoveredCallback cb)
{
discoveryItem.m_relativeUri + "?rt=" +discoveryItem.m_resourceType,
OCConnectivityType::CT_DEFAULT, discoveryItem.m_findCB);
- return std::unique_ptr<RCSDiscoveryTask>(new RCSDiscoveryTask(discoverID));
+ return std::unique_ptr<RCSDiscoveryManager::DiscoveryTask>(new RCSDiscoveryManager::DiscoveryTask(discoverID));
}
void RCSDiscoveryManagerImpl::initializedDiscoveryEnvironment()
constexpr char RESOURCEURI[]{ "/a/TemperatureSensor" };
constexpr char RESOURCETYPE[]{ "Resource.Hosting" };
constexpr char RESOURCEINTERFACE[]{ "oic.if.baseline" };
-constexpr int RCSDiscoveryTaskDELAYTIME = 7;
+constexpr int DiscoveryTaskDELAYTIME = 7;
class DiscoveryManagerTest: public TestWithMock
{
RCSResourceObject::Ptr server;
RCSRemoteResourceObject::Ptr object;
- std::unique_ptr<RCSDiscoveryTask> discoveryTask;
+ std::unique_ptr<RCSDiscoveryManager::DiscoveryTask> discoveryTask;
public:
server = RCSResourceObject::Builder(RESOURCEURI, RESOURCETYPE, RESOURCEINTERFACE).build();
}
- void waitForRCSDiscoveryTask()
+ void waitForDiscoveryTask()
{
- sleep(RCSDiscoveryTaskDELAYTIME);
+ sleep(DiscoveryTaskDELAYTIME);
}
static void resourceDiscovered(std::shared_ptr< RCSRemoteResourceObject >) {}
mocks.ExpectCallFunc(resourceDiscovered);
startDiscovery();
- waitForRCSDiscoveryTask();
+ waitForDiscoveryTask();
}
TEST_F(DiscoveryManagerTest, resourceIsSupportedPresenceBeforeDiscovering)
mocks.ExpectCallFunc(resourceDiscovered);
startDiscovery();
- waitForRCSDiscoveryTask();
+ waitForDiscoveryTask();
}
TEST_F(DiscoveryManagerTest, resourceIsNotSupportedPresenceAfterDiscovering)
startDiscovery();
createResource();
- waitForRCSDiscoveryTask();
+ waitForDiscoveryTask();
}
TEST_F(DiscoveryManagerTest, resourceIsSupportedPresenceAndAfterDiscovering)
startPresence(10);
startDiscovery();
createResource();
- waitForRCSDiscoveryTask();
+ waitForDiscoveryTask();
}
-TEST_F(DiscoveryManagerTest, cancelRCSDiscoveryTaskAfterDiscoveryResource)
+TEST_F(DiscoveryManagerTest, cancelDiscoveryTaskAfterDiscoveryResource)
{
startDiscovery();
cancelDiscovery();
}
-TEST_F(DiscoveryManagerTest, cancelRCSDiscoveryTaskNotStartDiscoveryResource)
+TEST_F(DiscoveryManagerTest, cancelDiscoveryTaskNotStartDiscoveryResource)
{
startDiscovery();
cancelDiscovery();