#include "ESEnrolleeSimulator.h"
#include "escommon.h"
#include "ESRichCommon.h"
-#include "EasySetup.h"
+#include "EasySetup.hpp"
#include "RemoteEnrollee.h"
#include "ESEnrolleeCommon.h"
#include "cainterface.h"
#include "OCPlatform.h"
-#define PROV_RESOURCE_TYPE "ocf.wk.prov"
-
using namespace OC;
using namespace OIC::Service;
EasysetupMediatorTest() = default;
~EasysetupMediatorTest() = default;
- std::shared_ptr<OC::OCResource> CreateNotProvResource()
+ std::shared_ptr<OC::OCResource> CreateNotEasySetupResource()
{
OCConnectivityType connectivityType = CT_DEFAULT;
- std::vector<std::string> types = {"ocf.wk.notprov"};
+ std::vector<std::string> types = {"oic.r.noteasysetup"};
std::vector<std::string> ifaces = {DEFAULT_INTERFACE};
return OCPlatform::constructResourceObject("coap://192.168.1.2:5000",
- "/NotProvisioningResURI",
+ "/NotEasySetupResURI",
connectivityType,
false,
types,
void discoverRemoteEnrollee()
{
- std::string uri = std::string("/oic/res?rt=") + PROV_RESOURCE_TYPE;
+ std::string uri = std::string("/oic/res?rt=") + OC_RSRVD_ES_RES_TYPE_EASYSETUP;
OC::OCPlatform::findResource("", uri,
OCConnectivityType::CT_DEFAULT,
std::bind(&EasysetupMediatorTest::discoverRemoteEnrolleeCb,
return ;
}
- if(!resource->getResourceTypes().at(0).compare(PROV_RESOURCE_TYPE))
+ if(!resource->getResourceTypes().at(0).compare(OC_RSRVD_ES_RES_TYPE_EASYSETUP))
{
m_enrolleeResource = resource;
}
}
};
-TEST_F(EasysetupMediatorTest, createremoteenrolleeFailedWithNotProvResource)
+TEST_F(EasysetupMediatorTest, createremoteenrolleeFailedWithNotEasySetupResource)
{
- auto remoteEnrollee = EasySetup::getInstance()->createRemoteEnrollee(CreateNotProvResource());
+ auto remoteEnrollee = EasySetup::getInstance()->createRemoteEnrollee(CreateNotEasySetupResource());
EXPECT_EQ(nullptr, remoteEnrollee);
}
-TEST_F(EasysetupMediatorTest, createremoteenrolleeSucceedWithProvResource)
+TEST_F(EasysetupMediatorTest, createremoteenrolleeSucceedWithEasySetupResource)
{
discoverRemoteEnrollee();
g_remoteEnrollee = EasySetup::getInstance()->createRemoteEnrollee(m_enrolleeResource);
{
if(conf.getWiFiModes().at(0) == WIFI_11G &&
conf.getWiFiFreq() == WIFI_5G &&
- !strcmp(conf.getDeviceName().c_str(), "Test Device") &&
- !strcmp(conf.getModelNumber().c_str(), "Test Model Number"))
+ !strcmp(conf.getDeviceName().c_str(), "Test Device"))
{
isWellConstructed = true;
}
cout << "getDeviceName : " << conf.getDeviceName().c_str() << endl;
- cout << "getModelNumber : " << conf.getModelNumber().c_str() << endl;
}
}
});
{
DeviceProp devProp;
devProp.setWiFiProp("Iotivity_SSID", "Iotivity_PWD", WPA2_PSK, TKIP_AES);
- devProp.setDevConfProp("korean", "Korea", "Location");
EXPECT_ANY_THROW(g_remoteEnrollee->provisionDeviceProperties(devProp, nullptr));
}
{
DeviceProp devProp;
devProp.setWiFiProp("", "Iotivity_PWD", WPA2_PSK, TKIP_AES);
- devProp.setDevConfProp("korean", "Korea", "Location");
EXPECT_ANY_THROW(g_remoteEnrollee->provisionDeviceProperties(devProp,
deviceProvisioningStatusCb));
}
{
DeviceProp devProp;
devProp.setWiFiProp("Iotivity_SSID", "Iotivity_PWD", WPA2_PSK, TKIP_AES);
- devProp.setDevConfProp("korean", "Korea", "Location");
int cntForReceivedCallbackWithSuccess = 0;
mocks.OnCallFunc(cloudPropProvStatusCb).Do(
[& cntForReceivedCallbackWithSuccess](std::shared_ptr< CloudPropProvisioningStatus > status)
{
- // Will called twice
if(status->getESResult() == ES_OK)
{
cntForReceivedCallbackWithSuccess++;
std::unique_lock< std::mutex > lock{ mutexForCondition };
responseCon.wait_for(lock, g_waitForResponse);
- EXPECT_EQ(cntForReceivedCallbackWithSuccess, 2);
+ EXPECT_EQ(cntForReceivedCallbackWithSuccess, 1);
ESTerminateEnrollee();
}