Skip to content

Commit 0482c31

Browse files
aentingeraentinger
committed
Renaming class ArduinoCloudProperty to Property
1 parent 181c2a1 commit 0482c31

23 files changed

+141
-141
lines changed

Diff for: ‎extras/test/src/test_addPropertyReal.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ SCENARIO("The same arduino cloud properties are added multiple times", "[Arduino
2525

2626
CloudBool bool_property = false;
2727

28-
ArduinoCloudProperty * bool_property_ptr_1 = &property_container.addPropertyReal(bool_property, "bool_property", Permission::ReadWrite);
29-
ArduinoCloudProperty * bool_property_ptr_2 = &property_container.addPropertyReal(bool_property, "bool_property", Permission::ReadWrite);
28+
Property * bool_property_ptr_1 = &property_container.addPropertyReal(bool_property, "bool_property", Permission::ReadWrite);
29+
Property * bool_property_ptr_2 = &property_container.addPropertyReal(bool_property, "bool_property", Permission::ReadWrite);
3030
THEN("No new property is added and the first added property is returned instead of a new one") {
3131
REQUIRE(bool_property_ptr_1 == bool_property_ptr_2);
3232
}
@@ -39,8 +39,8 @@ SCENARIO("The same arduino cloud properties are added multiple times", "[Arduino
3939

4040
CloudInt int_property = 1;
4141

42-
ArduinoCloudProperty * int_property_ptr_1 = &property_container.addPropertyReal(int_property, "int_property", Permission::ReadWrite);
43-
ArduinoCloudProperty * int_property_ptr_2 = &property_container.addPropertyReal(int_property, "int_property", Permission::ReadWrite);
42+
Property * int_property_ptr_1 = &property_container.addPropertyReal(int_property, "int_property", Permission::ReadWrite);
43+
Property * int_property_ptr_2 = &property_container.addPropertyReal(int_property, "int_property", Permission::ReadWrite);
4444

4545
THEN("No new property is added and the first added property is returned instead of a new one") {
4646
REQUIRE(int_property_ptr_1 == int_property_ptr_2);
@@ -54,8 +54,8 @@ SCENARIO("The same arduino cloud properties are added multiple times", "[Arduino
5454

5555
CloudFloat float_property = 1.0f;
5656

57-
ArduinoCloudProperty * float_property_ptr_1 = &property_container.addPropertyReal(float_property, "float_property", Permission::ReadWrite);
58-
ArduinoCloudProperty * float_property_ptr_2 = &property_container.addPropertyReal(float_property, "float_property", Permission::ReadWrite);
57+
Property * float_property_ptr_1 = &property_container.addPropertyReal(float_property, "float_property", Permission::ReadWrite);
58+
Property * float_property_ptr_2 = &property_container.addPropertyReal(float_property, "float_property", Permission::ReadWrite);
5959

6060
THEN("No new property is added and the first added property is returned instead of a new one") {
6161
REQUIRE(float_property_ptr_1 == float_property_ptr_2);
@@ -69,8 +69,8 @@ SCENARIO("The same arduino cloud properties are added multiple times", "[Arduino
6969

7070
CloudString str_property;
7171

72-
ArduinoCloudProperty * str_property_ptr_1 = &property_container.addPropertyReal(str_property, "str_property", Permission::ReadWrite);
73-
ArduinoCloudProperty * str_property_ptr_2 = &property_container.addPropertyReal(str_property, "str_property", Permission::ReadWrite);
72+
Property * str_property_ptr_1 = &property_container.addPropertyReal(str_property, "str_property", Permission::ReadWrite);
73+
Property * str_property_ptr_2 = &property_container.addPropertyReal(str_property, "str_property", Permission::ReadWrite);
7474

7575
THEN("No new property is added and the first added property is returned instead of a new one") {
7676
REQUIRE(str_property_ptr_1 == str_property_ptr_2);

Diff for: ‎extras/test/src/test_callback.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ SCENARIO("A (boolean) property is manipulated in the callback to its origin stat
101101
static bool sync_callback_called = false;
102102
static bool change_callback_called = false;
103103

104-
void auto_sync_callback(ArduinoCloudProperty& property) {
104+
void auto_sync_callback(Property& property) {
105105
MOST_RECENT_WINS(property);
106106
sync_callback_called = true;
107107
}
@@ -167,7 +167,7 @@ SCENARIO("After a connection/reconnection an incoming cbor payload is processed
167167
SCENARIO("Primitive property: After a connection/reconnection an incoming cbor payload is processed and the synchronization callback is executed. The sync callback applies the AUTO_SYNC policy (the most recent value between the local one and the cloud one is finally assigned to the property). The onUpdate function is called if the cloud value is the most recent one. In this scenario the most updated value is the cloud one.") {
168168
GIVEN("CloudProtocol::V2") {
169169
bool test = true;
170-
std::unique_ptr<ArduinoCloudProperty> p(new CloudWrapperBool(test));
170+
std::unique_ptr<Property> p(new CloudWrapperBool(test));
171171
sync_callback_called = false;
172172
change_callback_called = false;
173173

@@ -198,7 +198,7 @@ SCENARIO("Primitive property: After a connection/reconnection an incoming cbor p
198198
SCENARIO("Primitive property: After a connection/reconnection an incoming cbor payload is processed and the synchronization callback is executed. The sync callback apply the AUTO_SYNC policy (the most recent value between the local one and the cloud one is finally assigned to the property). The onUpdate function is called if the cloud value is the most recent one. In this scenario the most updated value is the local one.") {
199199
GIVEN("CloudProtocol::V2") {
200200
bool test = true;
201-
std::unique_ptr<ArduinoCloudProperty> p(new CloudWrapperBool(test));
201+
std::unique_ptr<Property> p(new CloudWrapperBool(test));
202202
sync_callback_called = false;
203203
change_callback_called = false;
204204

@@ -288,7 +288,7 @@ SCENARIO("Object property: After a connection/reconnection an incoming cbor payl
288288

289289
/**************************************************************************************/
290290

291-
void force_device_sync_callback(ArduinoCloudProperty& property) {
291+
void force_device_sync_callback(Property& property) {
292292
DEVICE_WINS(property);
293293
sync_callback_called = true;
294294
}
@@ -321,7 +321,7 @@ SCENARIO("After a connection/reconnection an incoming cbor payload is processed
321321

322322
/**************************************************************************************/
323323

324-
void force_cloud_sync_callback(ArduinoCloudProperty& property) {
324+
void force_cloud_sync_callback(Property& property) {
325325
CLOUD_WINS(property);
326326
sync_callback_called = true;
327327
}

Diff for: ‎extras/test/src/test_decode.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,10 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]")
506506
String str_test;
507507
str_test = "str_test";
508508

509-
std::unique_ptr<ArduinoCloudProperty> i(new CloudWrapperInt(int_test));
510-
std::unique_ptr<ArduinoCloudProperty> b(new CloudWrapperBool(bool_test));
511-
std::unique_ptr<ArduinoCloudProperty> f(new CloudWrapperFloat(float_test));
512-
std::unique_ptr<ArduinoCloudProperty> s(new CloudWrapperString(str_test));
509+
std::unique_ptr<Property> i(new CloudWrapperInt(int_test));
510+
std::unique_ptr<Property> b(new CloudWrapperBool(bool_test));
511+
std::unique_ptr<Property> f(new CloudWrapperFloat(float_test));
512+
std::unique_ptr<Property> s(new CloudWrapperString(str_test));
513513

514514
property_container.addPropertyReal(*b, "bool_test", Permission::ReadWrite).onSync(CLOUD_WINS);
515515
property_container.addPropertyReal(*i, "int_test", Permission::ReadWrite).onSync(CLOUD_WINS);

Diff for: ‎extras/test/src/test_encode.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,10 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode]")
398398
String str_test;
399399
str_test = "str_test";
400400

401-
std::unique_ptr<ArduinoCloudProperty> i(new CloudWrapperInt(int_test));
402-
std::unique_ptr<ArduinoCloudProperty> b(new CloudWrapperBool(bool_test));
403-
std::unique_ptr<ArduinoCloudProperty> f(new CloudWrapperFloat(float_test));
404-
std::unique_ptr<ArduinoCloudProperty> s(new CloudWrapperString(str_test));
401+
std::unique_ptr<Property> i(new CloudWrapperInt(int_test));
402+
std::unique_ptr<Property> b(new CloudWrapperBool(bool_test));
403+
std::unique_ptr<Property> f(new CloudWrapperFloat(float_test));
404+
std::unique_ptr<Property> s(new CloudWrapperString(str_test));
405405

406406
property_container.addPropertyReal(*i, "int_test", Permission::ReadWrite);
407407
property_container.addPropertyReal(*b, "bool_test", Permission::ReadWrite);

Diff for: ‎src/ArduinoIoTCloud.cpp

+26-26
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ void ArduinoIoTCloudClass::addCallback(ArduinoIoTCloudEvent const event, OnCloud
3030
_cloud_event_callback[static_cast<size_t>(event)] = callback;
3131
}
3232

33-
void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
33+
void ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
3434
{
3535
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
3636
}
3737

38-
void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
38+
void ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
3939
{
4040
Permission permission = Permission::ReadWrite;
4141
if (permission_type == READ) {
@@ -53,91 +53,91 @@ void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, Strin
5353
}
5454
}
5555

56-
void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
56+
void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
5757
{
5858
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
5959
}
6060

61-
void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
61+
void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
6262
{
63-
ArduinoCloudProperty* p = new CloudWrapperBool(property);
63+
Property* p = new CloudWrapperBool(property);
6464
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
6565
}
6666

67-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Permission const permission)
67+
Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, Permission const permission)
6868
{
6969
return addPropertyReal(property, name, -1, permission);
7070
}
7171

72-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)
72+
Property& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)
7373
{
74-
ArduinoCloudProperty* p = new CloudWrapperBool(property);
74+
Property* p = new CloudWrapperBool(property);
7575
return _property_container.addPropertyReal(*p, name, permission, tag);
7676
}
7777

78-
void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
78+
void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
7979
{
8080
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
8181
}
8282

83-
void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
83+
void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
8484
{
85-
ArduinoCloudProperty* p = new CloudWrapperFloat(property);
85+
Property* p = new CloudWrapperFloat(property);
8686
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
8787
}
8888

89-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Permission const permission)
89+
Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, Permission const permission)
9090
{
9191
return addPropertyReal(property, name, -1, permission);
9292
}
9393

94-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)
94+
Property& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)
9595
{
96-
ArduinoCloudProperty* p = new CloudWrapperFloat(property);
96+
Property* p = new CloudWrapperFloat(property);
9797
return _property_container.addPropertyReal(*p, name, permission, tag);
9898
}
9999

100-
void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
100+
void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
101101
{
102102
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
103103
}
104104

105-
void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
105+
void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
106106
{
107-
ArduinoCloudProperty* p = new CloudWrapperInt(property);
107+
Property* p = new CloudWrapperInt(property);
108108
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
109109
}
110110

111-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Permission const permission)
111+
Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, Permission const permission)
112112
{
113113
return addPropertyReal(property, name, -1, permission);
114114
}
115115

116-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)
116+
Property& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)
117117
{
118-
ArduinoCloudProperty* p = new CloudWrapperInt(property);
118+
Property* p = new CloudWrapperInt(property);
119119
return _property_container.addPropertyReal(*p, name, permission, tag);
120120
}
121121

122-
void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
122+
void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
123123
{
124124
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
125125
}
126126

127-
void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
127+
void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
128128
{
129-
ArduinoCloudProperty* p = new CloudWrapperString(property);
129+
Property* p = new CloudWrapperString(property);
130130
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
131131
}
132132

133-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, Permission const permission)
133+
Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, Permission const permission)
134134
{
135135
return addPropertyReal(property, name, -1, permission);
136136
}
137137

138-
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)
138+
Property& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)
139139
{
140-
ArduinoCloudProperty* p = new CloudWrapperString(property);
140+
Property* p = new CloudWrapperString(property);
141141
return _property_container.addPropertyReal(*p, name, permission, tag);
142142
}
143143

0 commit comments

Comments
 (0)