Skip to content

Commit 8b79789

Browse files
fabik111fabik111
committed
update cbor messages lib version
update test ci cloud utils version update arduinoiotcloud lib version on ci test
1 parent d6c791c commit 8b79789

File tree

9 files changed

+169
-169
lines changed

9 files changed

+169
-169
lines changed

‎.github/workflows/compile-examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
- source-url: https://github.com/fabik111/ArduinoBLE.git
3535
version: 82e2a28f871e97b313846cee6d9efed8943dca53
3636
- source-url: https://github.com/andreagilardoni/ArduinoIoTCloud.git
37-
version: e778f3a8e416801102ab38931ac0540ea9b82d80
37+
version: a51de0e7bfb68b18aea5fbac753f0414991fac7f
3838
- name: Arduino_SecureElement
3939
- source-url: https://github.com/andreagilardoni/Arduino_CloudUtils.git
40-
version: a5642c1d6abe770df290f0e17331683b3d479fb7
40+
version: 5fd19ba84d34ffbc3def4d1035d5a21fd9e2f06b
4141
- source-url: https://github.com/andreagilardoni/ArduinoStorage.git
4242
version: 39f0bd138103967aaafcaa7f5c0e1e237b4ccb4d
4343
- name: ArduinoJson

‎extras/test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ set(TEST_DUT_SRCS
111111
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cbortojson.c
112112
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborvalidation.c
113113
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/open_memstream.c
114-
${cloudutils_SOURCE_DIR}/src/cbor/CborDecoder.cpp
115-
${cloudutils_SOURCE_DIR}/src/cbor/CborEncoder.cpp
114+
${cloudutils_SOURCE_DIR}/src/cbor/MessageDecoder.cpp
115+
${cloudutils_SOURCE_DIR}/src/cbor/MessageEncoder.cpp
116116
)
117117
##########################################################################
118118

‎extras/test/src/test_provisioning_command_decode.cpp

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <memory>
1313

1414
#include <Decoder.h>
15-
#include <CborDecoder.h>
15+
#include <cbor/MessageDecoder.h>
1616
#include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
1717
#include <IPAddress.h>
1818

@@ -37,10 +37,10 @@
3737
uint64_t ts = 1728475108;
3838
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
3939
CBORMessageDecoder decoder;
40-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
40+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
4141

4242
THEN("The decode is successful") {
43-
REQUIRE(err == Decoder::Status::Complete);
43+
REQUIRE(err == MessageDecoder::Status::Complete);
4444
REQUIRE(command.c.id == ProvisioningMessageId::TimestampProvisioningMessageId);
4545
REQUIRE(command.provisioningTimestamp.timestamp == ts);
4646
}
@@ -60,10 +60,10 @@
6060
uint8_t commandId = 100;
6161
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
6262
CBORMessageDecoder decoder;
63-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
63+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
6464

6565
THEN("The decode is successful") {
66-
REQUIRE(err == Decoder::Status::Complete);
66+
REQUIRE(err == MessageDecoder::Status::Complete);
6767
REQUIRE(command.c.id == ProvisioningMessageId::CommandsProvisioningMessageId);
6868
REQUIRE(command.provisioningCommands.cmd == commandId);
6969
}
@@ -90,9 +90,9 @@
9090
char password[] = "PASSWORDSSID1";
9191
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
9292
CBORMessageDecoder decoder;
93-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
93+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
9494
THEN("The decode is successful") {
95-
REQUIRE(err == Decoder::Status::Complete);
95+
REQUIRE(err == MessageDecoder::Status::Complete);
9696
REQUIRE(command.c.id == ProvisioningMessageId::WifiConfigProvisioningMessageId);
9797
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::WIFI);
9898
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.wifi.ssid, ssid) == 0);
@@ -129,10 +129,10 @@
129129
uint8_t band = 5;
130130
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
131131
CBORMessageDecoder decoder;
132-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
132+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
133133

134134
THEN("The decode is successful") {
135-
REQUIRE(err == Decoder::Status::Complete);
135+
REQUIRE(err == MessageDecoder::Status::Complete);
136136
REQUIRE(command.c.id == ProvisioningMessageId::LoRaConfigProvisioningMessageId);
137137
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::LORA);
138138
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.lora.appeui, appeui) == 0);
@@ -170,10 +170,10 @@
170170
uint8_t band = models::settingsDefault(NetworkAdapter::LORA).lora.band;
171171
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
172172
CBORMessageDecoder decoder;
173-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
173+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
174174

175175
THEN("The decode is successful") {
176-
REQUIRE(err == Decoder::Status::Complete);
176+
REQUIRE(err == MessageDecoder::Status::Complete);
177177
REQUIRE(command.c.id == ProvisioningMessageId::LoRaConfigProvisioningMessageId);
178178
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::LORA);
179179
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.lora.appeui, appeui) == 0);
@@ -215,10 +215,10 @@
215215

216216
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
217217
CBORMessageDecoder decoder;
218-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
218+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
219219

220220
THEN("The decode is successful") {
221-
REQUIRE(err == Decoder::Status::Complete);
221+
REQUIRE(err == MessageDecoder::Status::Complete);
222222
REQUIRE(command.c.id == ProvisioningMessageId::GSMConfigProvisioningMessageId);
223223
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::GSM);
224224
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.gsm.pin, pin) == 0);
@@ -258,10 +258,10 @@
258258

259259
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
260260
CBORMessageDecoder decoder;
261-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
261+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
262262

263263
THEN("The decode is successful") {
264-
REQUIRE(err == Decoder::Status::Complete);
264+
REQUIRE(err == MessageDecoder::Status::Complete);
265265
REQUIRE(command.c.id == ProvisioningMessageId::GSMConfigProvisioningMessageId);
266266
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::GSM);
267267
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.gsm.pin, pin) == 0);
@@ -299,10 +299,10 @@
299299

300300
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
301301
CBORMessageDecoder decoder;
302-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
302+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
303303

304304
THEN("The decode is successful") {
305-
REQUIRE(err == Decoder::Status::Complete);
305+
REQUIRE(err == MessageDecoder::Status::Complete);
306306
REQUIRE(command.c.id == ProvisioningMessageId::GSMConfigProvisioningMessageId);
307307
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::GSM);
308308
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.gsm.pin, pin) == 0);
@@ -343,10 +343,10 @@
343343

344344
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
345345
CBORMessageDecoder decoder;
346-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
346+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
347347

348348
THEN("The decode is successful") {
349-
REQUIRE(err == Decoder::Status::Complete);
349+
REQUIRE(err == MessageDecoder::Status::Complete);
350350
REQUIRE(command.c.id == ProvisioningMessageId::NBIOTConfigProvisioningMessageId);
351351
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::NB);
352352
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.nb.pin, pin) == 0);
@@ -396,10 +396,10 @@
396396

397397
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
398398
CBORMessageDecoder decoder;
399-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
399+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
400400

401401
THEN("The decode is successful") {
402-
REQUIRE(err == Decoder::Status::Complete);
402+
REQUIRE(err == MessageDecoder::Status::Complete);
403403
REQUIRE(command.c.id == ProvisioningMessageId::CATM1ConfigProvisioningMessageId);
404404
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::CATM1);
405405
REQUIRE(command.provisioningNetworkConfig.networkSetting.catm1.rat == rat);
@@ -446,10 +446,10 @@
446446

447447
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
448448
CBORMessageDecoder decoder;
449-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
449+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
450450

451451
THEN("The decode is successful") {
452-
REQUIRE(err == Decoder::Status::Complete);
452+
REQUIRE(err == MessageDecoder::Status::Complete);
453453
REQUIRE(command.c.id == ProvisioningMessageId::CATM1ConfigProvisioningMessageId);
454454
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::CATM1);
455455
REQUIRE(command.provisioningNetworkConfig.networkSetting.catm1.rat == rat);
@@ -492,10 +492,10 @@
492492
uint8_t rat = models::settingsDefault(NetworkAdapter::CATM1).catm1.rat;
493493
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
494494
CBORMessageDecoder decoder;
495-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
495+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
496496

497497
THEN("The decode is successful") {
498-
REQUIRE(err == Decoder::Status::Complete);
498+
REQUIRE(err == MessageDecoder::Status::Complete);
499499
REQUIRE(command.c.id == ProvisioningMessageId::CATM1ConfigProvisioningMessageId);
500500
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::CATM1);
501501
REQUIRE(command.provisioningNetworkConfig.networkSetting.catm1.rat == rat);
@@ -540,10 +540,10 @@
540540

541541
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
542542
CBORMessageDecoder decoder;
543-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
543+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
544544

545545
THEN("The decode is error") {
546-
REQUIRE(err == Decoder::Status::Error);
546+
REQUIRE(err == MessageDecoder::Status::Error);
547547
}
548548
}
549549

@@ -581,10 +581,10 @@
581581

582582
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
583583
CBORMessageDecoder decoder;
584-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
584+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
585585

586586
THEN("The decode is successful") {
587-
REQUIRE(err == Decoder::Status::Complete);
587+
REQUIRE(err == MessageDecoder::Status::Complete);
588588
REQUIRE(command.c.id == ProvisioningMessageId::EthernetConfigProvisioningMessageId);
589589
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::ETHERNET);
590590
REQUIRE(command.provisioningNetworkConfig.networkSetting.eth.ip.type == IPType::IPv4);
@@ -641,10 +641,10 @@
641641

642642
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
643643
CBORMessageDecoder decoder;
644-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
644+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
645645

646646
THEN("The decode is successful") {
647-
REQUIRE(err == Decoder::Status::Complete);
647+
REQUIRE(err == MessageDecoder::Status::Complete);
648648
REQUIRE(command.c.id == ProvisioningMessageId::EthernetConfigProvisioningMessageId);
649649
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::ETHERNET);
650650
REQUIRE(command.provisioningNetworkConfig.networkSetting.eth.ip.type == IPType::IPv6);
@@ -690,10 +690,10 @@ WHEN("Decode a provisioning Ethernet with defaults and DHCP")
690690

691691
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
692692
CBORMessageDecoder decoder;
693-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
693+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
694694

695695
THEN("The decode is successful") {
696-
REQUIRE(err == Decoder::Status::Complete);
696+
REQUIRE(err == MessageDecoder::Status::Complete);
697697
REQUIRE(command.c.id == ProvisioningMessageId::EthernetConfigProvisioningMessageId);
698698
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::ETHERNET);
699699
REQUIRE(command.provisioningNetworkConfig.networkSetting.eth.ip.type == IPType::IPv4);
@@ -740,10 +740,10 @@ WHEN("Decode a provisioning Ethernet with defaults and DHCP")
740740

741741
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
742742
CBORMessageDecoder decoder;
743-
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
743+
MessageDecoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
744744

745745
THEN("The decode is successful") {
746-
REQUIRE(err == Decoder::Status::Complete);
746+
REQUIRE(err == MessageDecoder::Status::Complete);
747747
REQUIRE(command.c.id == ProvisioningMessageId::CellularConfigProvisioningMessageId);
748748
REQUIRE(command.provisioningNetworkConfig.networkSetting.type == NetworkAdapter::CELL);
749749
REQUIRE(strcmp(command.provisioningNetworkConfig.networkSetting.cell.pin, pin) == 0);

‎extras/test/src/test_provisioning_command_encode.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <memory>
1212
#include <Encoder.h>
13-
#include <CborEncoder.h>
13+
#include <cbor/MessageEncoder.h>
1414
#include "../../src/ConfiguratorAgents/agents/BoardConfigurationProtocol/cbor/CBOR.h"
1515

1616
/******************************************************************************
@@ -29,7 +29,7 @@
2929
size_t bytes_encoded = sizeof(buffer);
3030

3131
CBORMessageEncoder encoder;
32-
Encoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
32+
MessageEncoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
3333

3434
uint8_t expected_result[] = {
3535
0xda, 0x00, 0x01, 0x20, 0x00, 0x81, 0x38, 0x63
@@ -41,7 +41,7 @@
4141
// 38 63 # negative(99)
4242

4343
THEN("The encoding is successful") {
44-
REQUIRE(err == Encoder::Status::Complete);
44+
REQUIRE(err == MessageEncoder::Status::Complete);
4545
REQUIRE(bytes_encoded == sizeof(expected_result));
4646
REQUIRE(memcmp(buffer, expected_result, sizeof(expected_result)) == 0);
4747
}
@@ -65,7 +65,7 @@
6565
size_t bytes_encoded = sizeof(buffer);
6666

6767
CBORMessageEncoder encoder;
68-
Encoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
68+
MessageEncoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
6969

7070
uint8_t expected_result[] = {
7171
0xda, 0x00, 0x01, 0x20, 0x01, 0x84, 0x65, 0x53, 0x53, 0x49, 0x44, 0x31, 0x38, 0x4B, 0x65, 0x53, 0x53, 0x49, 0x44, 0x32, 0x38, 0x37
@@ -81,7 +81,7 @@
8181
// 5353494432 # "SSID2"
8282
// 38 37 # negative(55)
8383
THEN("The encoding is successful") {
84-
REQUIRE(err == Encoder::Status::Complete);
84+
REQUIRE(err == MessageEncoder::Status::Complete);
8585
REQUIRE(bytes_encoded == sizeof(expected_result));
8686
REQUIRE(memcmp(buffer, expected_result, sizeof(expected_result)) == 0);
8787
}
@@ -96,7 +96,7 @@
9696
size_t bytes_encoded = sizeof(buffer);
9797

9898
CBORMessageEncoder encoder;
99-
Encoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
99+
MessageEncoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
100100

101101
uint8_t expected_result[] = {
102102
0xda, 0x00, 0x01, 0x20, 0x10, 0x81, 0x58, 0x20,
@@ -112,7 +112,7 @@
112112
// 58 20 # bytes(32)
113113
// CA.... omissis # values
114114
THEN("The encoding is successful") {
115-
REQUIRE(err == Encoder::Status::Complete);
115+
REQUIRE(err == MessageEncoder::Status::Complete);
116116
REQUIRE(bytes_encoded == sizeof(expected_result));
117117
REQUIRE(memcmp(buffer, expected_result, sizeof(expected_result)) == 0);
118118
}
@@ -127,7 +127,7 @@
127127
size_t bytes_encoded = sizeof(buffer);
128128

129129
CBORMessageEncoder encoder;
130-
Encoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
130+
MessageEncoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
131131

132132
uint8_t expected_result[] = {
133133
0xda, 0x00, 0x01, 0x20, 0x11, 0x81, 0x59, 0x01, 0x0C,
@@ -173,7 +173,7 @@
173173
// 58 F6 # bytes(32)
174174
// CA.... omissis # values
175175
THEN("The encoding is successful") {
176-
REQUIRE(err == Encoder::Status::Complete);
176+
REQUIRE(err == MessageEncoder::Status::Complete);
177177
REQUIRE(bytes_encoded == sizeof(expected_result));
178178
REQUIRE(memcmp(buffer, expected_result, sizeof(expected_result)) == 0);
179179
}
@@ -188,7 +188,7 @@
188188
size_t bytes_encoded = sizeof(buffer);
189189

190190
CBORMessageEncoder encoder;
191-
Encoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
191+
MessageEncoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
192192

193193
uint8_t expected_result[] = {
194194
0xda, 0x00, 0x01, 0x20, 0x13, 0x81, 0x46,
@@ -201,7 +201,7 @@
201201
// 46 # bytes(6)
202202
// AFAFAFAFAFA
203203
THEN("The encoding is successful") {
204-
REQUIRE(err == Encoder::Status::Complete);
204+
REQUIRE(err == MessageEncoder::Status::Complete);
205205
REQUIRE(bytes_encoded == sizeof(expected_result));
206206
REQUIRE(memcmp(buffer, expected_result, sizeof(expected_result)) == 0);
207207
}
@@ -216,7 +216,7 @@
216216
size_t bytes_encoded = sizeof(buffer);
217217

218218
CBORMessageEncoder encoder;
219-
Encoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
219+
MessageEncoder::Status err = encoder.encode((Message*)&command, buffer, bytes_encoded);
220220

221221
uint8_t expected_result[] = {
222222
0xda, 0x00, 0x01, 0x20, 0x14, 0x81, 0x65, 0x31, 0x2E, 0x36, 0x2E, 0x30
@@ -228,7 +228,7 @@
228228
// 65 # text(5)
229229
// 312E362E30 # "1.6.0"
230230
THEN("The encoding is successful") {
231-
REQUIRE(err == Encoder::Status::Complete);
231+
REQUIRE(err == MessageEncoder::Status::Complete);
232232
REQUIRE(bytes_encoded == sizeof(expected_result));
233233
REQUIRE(memcmp(buffer, expected_result, sizeof(expected_result)) == 0);
234234
}

0 commit comments

Comments
 (0)