std::cout << __func__ << std::endl;
}
- static void WiFiProvCbInApp(ESWiFiProvData *)
+ static void WiFiConfProvCbInApp(ESWiFiConfData *)
{
std::cout << __func__ << std::endl;
}
- static void DevConfProvCbInApp(ESDevConfProvData *)
+ static void DevConfProvCbInApp(ESDevConfData *)
{
std::cout << __func__ << std::endl;
}
- static void CloudDataCbInApp(ESCloudProvData *)
+ static void CoapCloudConfCbInApp(ESCoapCloudConfData *)
{
std::cout << __func__ << std::endl;
}
ESResult startEnrollee()
{
- ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFI_RESOURCE |
- ES_CLOUD_RESOURCE |
+ ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFICONF_RESOURCE |
+ ES_COAPCLOUDCONF_RESOURCE |
ES_DEVCONF_RESOURCE);
ESProvisioningCallbacks callbacks;
- callbacks.WiFiProvCb = &EasysetupEnrolleeTest::WiFiProvCbInApp;
+ callbacks.WiFiConfProvCb = &EasysetupEnrolleeTest::WiFiConfProvCbInApp;
callbacks.DevConfProvCb = &EasysetupEnrolleeTest::DevConfProvCbInApp;
- callbacks.CloudDataProvCb = &EasysetupEnrolleeTest::CloudDataCbInApp;
+ callbacks.CoapCloudConfProvCb = &EasysetupEnrolleeTest::CoapCloudConfCbInApp;
return ESInitEnrollee(false, resourcemMask, callbacks);
}
ESResult startEnrolleeWithInvalidRsrcMask()
{
ESProvisioningCallbacks callbacks;
- callbacks.WiFiProvCb = &EasysetupEnrolleeTest::WiFiProvCbInApp;
+ callbacks.WiFiConfProvCb = &EasysetupEnrolleeTest::WiFiConfProvCbInApp;
callbacks.DevConfProvCb = &EasysetupEnrolleeTest::DevConfProvCbInApp;
- callbacks.CloudDataProvCb = &EasysetupEnrolleeTest::CloudDataCbInApp;
+ callbacks.CoapCloudConfProvCb = &EasysetupEnrolleeTest::CoapCloudConfCbInApp;
return ESInitEnrollee(false, (ESResourceMask)0, callbacks);
}
ESResult setDeviceProperty()
{
ESDeviceProperty deviceProperty = {
- {{WIFI_11G, WiFi_EOF}, WIFI_5G}, {"Test Device", "Test Model Number"}
+ {{WIFI_11G, WiFi_EOF}, WIFI_5G}, {"Test Device"}
};
return ESSetDeviceProperty(&deviceProperty);
TEST_F(EasysetupEnrolleeTest, ESInitEnrolleeFailedByWiFiCbIsNull)
{
- ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFI_RESOURCE |
- ES_CLOUD_RESOURCE |
+ ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFICONF_RESOURCE |
+ ES_COAPCLOUDCONF_RESOURCE |
ES_DEVCONF_RESOURCE);
ESProvisioningCallbacks callbacks;
- callbacks.WiFiProvCb = NULL;
+ callbacks.WiFiConfProvCb = NULL;
callbacks.DevConfProvCb = &EasysetupEnrolleeTest::DevConfProvCbInApp;
- callbacks.CloudDataProvCb = &EasysetupEnrolleeTest::CloudDataCbInApp;
+ callbacks.CoapCloudConfProvCb = &EasysetupEnrolleeTest::CoapCloudConfCbInApp;
ESResult ret = ESInitEnrollee(false, resourcemMask, callbacks);
EXPECT_EQ(ret, ES_ERROR);
TEST_F(EasysetupEnrolleeTest, ESInitEnrolleeFailedByDevConfCbIsNull)
{
- ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFI_RESOURCE |
- ES_CLOUD_RESOURCE |
+ ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFICONF_RESOURCE |
+ ES_COAPCLOUDCONF_RESOURCE |
ES_DEVCONF_RESOURCE);
ESProvisioningCallbacks callbacks;
- callbacks.WiFiProvCb = &EasysetupEnrolleeTest::WiFiProvCbInApp;
+ callbacks.WiFiConfProvCb = &EasysetupEnrolleeTest::WiFiConfProvCbInApp;
callbacks.DevConfProvCb = NULL;
- callbacks.CloudDataProvCb = &EasysetupEnrolleeTest::CloudDataCbInApp;
+ callbacks.CoapCloudConfProvCb = &EasysetupEnrolleeTest::CoapCloudConfCbInApp;
ESResult ret = ESInitEnrollee(false, resourcemMask, callbacks);
EXPECT_EQ(ret, ES_ERROR);
TEST_F(EasysetupEnrolleeTest, ESInitEnrolleeFailedByCloudCbIsNull)
{
- ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFI_RESOURCE |
- ES_CLOUD_RESOURCE |
+ ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFICONF_RESOURCE |
+ ES_COAPCLOUDCONF_RESOURCE |
ES_DEVCONF_RESOURCE);
ESProvisioningCallbacks callbacks;
- callbacks.WiFiProvCb = &EasysetupEnrolleeTest::WiFiProvCbInApp;
+ callbacks.WiFiConfProvCb = &EasysetupEnrolleeTest::WiFiConfProvCbInApp;
callbacks.DevConfProvCb = &EasysetupEnrolleeTest::DevConfProvCbInApp;
- callbacks.CloudDataProvCb = NULL;
+ callbacks.CoapCloudConfProvCb = NULL;
ESResult ret = ESInitEnrollee(false, resourcemMask, callbacks);
EXPECT_EQ(ret, ES_ERROR);
cntForReceivedCallbackWithSuccess++;
});
- mocks.OnCallFunc(WiFiProvCbInApp).Do(
- [& cntForReceivedCallbackWithSuccess](ESWiFiProvData *data)
+ mocks.OnCallFunc(WiFiConfProvCbInApp).Do(
+ [& cntForReceivedCallbackWithSuccess](ESWiFiConfData *data)
{
if(!strcmp(data->ssid, "Iotivity_SSID") &&
!strcmp(data->pwd, "Iotivity_PWD") &&
cntForReceivedCallbackWithSuccess++;
}
});
- mocks.OnCallFunc(DevConfProvCbInApp).Do(
- [& cntForReceivedCallbackWithSuccess](ESDevConfProvData *data)
- {
- if(!strcmp(data->language, "korean") &&
- !strcmp(data->country, "Korea"))
- {
- cntForReceivedCallbackWithSuccess++;
- }
- });
startEnrollee();
std::unique_lock< std::mutex > lock{ mutexForCondition };
responseCon.wait_for(lock, g_waitForResponse);
- EXPECT_EQ(cntForReceivedCallbackWithSuccess, 3);
+ EXPECT_EQ(cntForReceivedCallbackWithSuccess, 2);
ESTerminateEnrollee();
}
}
});
- mocks.OnCallFunc(CloudDataCbInApp).Do(
- [& cntForReceivedCallbackWithSuccess](ESCloudProvData *data)
+ mocks.OnCallFunc(CoapCloudConfCbInApp).Do(
+ [& cntForReceivedCallbackWithSuccess](ESCoapCloudConfData *data)
{
if(!strcmp(data->authCode, "authCode") &&
!strcmp(data->authProvider, "authProvider") &&