X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Feasy-setup%2Fmediator%2Frichsdk%2Funittests%2FESEnrolleeSimulator.h;h=ac097fa569b2bcc008c6424e6c4b0ffd20807c41;hb=c315c87e07c4080ecd0ef488e7a1047bc3c509b2;hp=80220bed7a0f2934c52459c7539f52809cead744;hpb=bf72b57c4f5711f045c34288566c078ef72df990;p=platform%2Fupstream%2Fiotivity.git diff --git a/service/easy-setup/mediator/richsdk/unittests/ESEnrolleeSimulator.h b/service/easy-setup/mediator/richsdk/unittests/ESEnrolleeSimulator.h old mode 100644 new mode 100755 index 80220be..ac097fa --- a/service/easy-setup/mediator/richsdk/unittests/ESEnrolleeSimulator.h +++ b/service/easy-setup/mediator/richsdk/unittests/ESEnrolleeSimulator.h @@ -31,8 +31,6 @@ #include "ESEnrolleeCommon.h" #include "easysetup.h" -#define PROV_RESOURCE_TYPE "ocf.wk.prov" - class ESEnrolleeSimulator { public: @@ -49,14 +47,14 @@ public: ESResult initEnrollee() { - 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 = &onWiFiProvisioning; + callbacks.WiFiConfProvCb = &onWiFiProvisioning; callbacks.DevConfProvCb = &onDevConfProvisioning; - callbacks.CloudDataProvCb = &onCloudProvisioning; + callbacks.CoapCloudConfProvCb = &onCloudProvisioning; return ESInitEnrollee(false, resourcemMask, callbacks); } @@ -64,7 +62,7 @@ public: 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); @@ -81,15 +79,15 @@ public: } private: - static void onWiFiProvisioning(ESWiFiProvData* /*data*/) + static void onWiFiProvisioning(ESWiFiConfData* /*data*/) { } - static void onDevConfProvisioning(ESDevConfProvData* /*data*/) + static void onDevConfProvisioning(ESDevConfData* /*data*/) { } - static void onCloudProvisioning(ESCloudProvData* /*data*/) + static void onCloudProvisioning(ESCoapCloudConfData* /*data*/) { } };