projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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"
#include "ESEnrolleeCommon.h"
#include "easysetup.h"
-#define PROV_RESOURCE_TYPE "ocf.wk.prov"
-
class ESEnrolleeSimulator
{
public:
class ESEnrolleeSimulator
{
public:
@@
-49,14
+47,14
@@
public:
ESResult initEnrollee()
{
ESResult initEnrollee()
{
- ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFI_RESOURCE |
- ES_C
LOUD
_RESOURCE |
+ ESResourceMask resourcemMask = (ESResourceMask)(ES_WIFI
CONF
_RESOURCE |
+ ES_C
OAPCLOUDCONF
_RESOURCE |
ES_DEVCONF_RESOURCE);
ESProvisioningCallbacks callbacks;
ES_DEVCONF_RESOURCE);
ESProvisioningCallbacks callbacks;
- callbacks.WiFiProvCb = &onWiFiProvisioning;
+ callbacks.WiFi
Conf
ProvCb = &onWiFiProvisioning;
callbacks.DevConfProvCb = &onDevConfProvisioning;
callbacks.DevConfProvCb = &onDevConfProvisioning;
- callbacks.C
loudData
ProvCb = &onCloudProvisioning;
+ callbacks.C
oapCloudConf
ProvCb = &onCloudProvisioning;
return ESInitEnrollee(false, resourcemMask, callbacks);
}
return ESInitEnrollee(false, resourcemMask, callbacks);
}
@@
-64,7
+62,7
@@
public:
ESResult setDeviceProperty()
{
ESDeviceProperty deviceProperty = {
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);
};
return ESSetDeviceProperty(&deviceProperty);
@@
-81,15
+79,15
@@
public:
}
private:
}
private:
- static void onWiFiProvisioning(ESWiFi
Prov
Data* /*data*/)
+ static void onWiFiProvisioning(ESWiFi
Conf
Data* /*data*/)
{
}
{
}
- static void onDevConfProvisioning(ESDevConf
Prov
Data* /*data*/)
+ static void onDevConfProvisioning(ESDevConfData* /*data*/)
{
}
{
}
- static void onCloudProvisioning(ESC
loudProv
Data* /*data*/)
+ static void onCloudProvisioning(ESC
oapCloudConf
Data* /*data*/)
{
}
};
{
}
};