replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / unittests / ESEnrolleeSimulator.h

diff --git a/service/easy-setup/mediator/richsdk/unittests/ESEnrolleeSimulator.h b/service/easy-setup/mediator/richsdk/unittests/ESEnrolleeSimulator.h
old mode 100644 (file)
new mode 100755 (executable)
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*/)
     {
     }
 };