Skip to content

Commit 6872c74

Browse files
andreagilardoniandreagilardoni
committed
fixup! [TMP] readapting cmake testing by using cloudutils
1 parent d9c7f30 commit 6872c74

File tree

5 files changed

+107
-84
lines changed

5 files changed

+107
-84
lines changed

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "extras/test/Arduino_CloudUtils"]
2-
path = extras/test/Arduino_CloudUtils
3-
url = [email protected]:arduino-libraries/Arduino_CloudUtils.git

‎extras/test/Arduino_CloudUtils

-1
This file was deleted.

‎extras/test/CMakeLists.txt

+43-16
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,21 @@ FetchContent_Declare(
1414
GIT_TAG v3.4.0
1515
)
1616

17+
FetchContent_Declare(
18+
cloudutils
19+
GIT_REPOSITORY https://github.com/andreagilardoni/Arduino_CloudUtils.git
20+
GIT_TAG cbor-messages
21+
CONFIGURE_COMMAND ""
22+
BUILD_COMMAND ""
23+
)
24+
1725
FetchContent_MakeAvailable(Catch2)
1826

27+
FetchContent_GetProperties(cloudutils)
28+
if(NOT cloudutils_POPULATED)
29+
FetchContent_Populate(cloudutils)
30+
endif()
31+
1932
##########################################################################
2033

2134
include_directories(include)
@@ -24,9 +37,23 @@ include_directories(../../src/cbor)
2437
include_directories(../../src/property)
2538
include_directories(../../src/utility/time)
2639

27-
include_directories(Arduino_CloudUtils/src/)
28-
include_directories(Arduino_CloudUtils/src/cbor)
29-
include_directories(Arduino_CloudUtils/src/interfaces)
40+
# add_library(cloudutils STATIC IMPORTED GLOBAL)
41+
add_library(cloudutils INTERFACE)
42+
43+
target_include_directories(
44+
cloudutils INTERFACE
45+
${cloudutils_SOURCE_DIR}/src/
46+
)
47+
48+
target_include_directories(
49+
cloudutils INTERFACE
50+
${cloudutils_SOURCE_DIR}/src/cbor
51+
)
52+
53+
target_include_directories(
54+
cloudutils INTERFACE
55+
${cloudutils_SOURCE_DIR}/src/interfaces
56+
)
3057

3158
##########################################################################
3259

@@ -74,19 +101,18 @@ set(TEST_DUT_SRCS
74101
../../src/cbor/MessageDecoder.cpp
75102
../../src/cbor/MessageEncoder.cpp
76103

77-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborencoder.c
78-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborencoder_close_container_checked.c
79-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborerrorstrings.c
80-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborparser.c
81-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborparser_dup_string.c
82-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborpretty.c
83-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborpretty_stdio.c
84-
Arduino_CloudUtils/src/cbor/tinycbor/src/cbortojson.c
85-
Arduino_CloudUtils/src/cbor/tinycbor/src/cborvalidation.c
86-
Arduino_CloudUtils/src/cbor/tinycbor/src/open_memstream.c
87-
88-
Arduino_CloudUtils/src/cbor/CborDecoder.cpp
89-
Arduino_CloudUtils/src/cbor/CborEncoder.cpp
104+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder.c
105+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder_close_container_checked.c
106+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborerrorstrings.c
107+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborparser.c
108+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborparser_dup_string.c
109+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborpretty.c
110+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborpretty_stdio.c
111+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cbortojson.c
112+
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborvalidation.c
113+
${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
90116
)
91117
##########################################################################
92118

@@ -114,6 +140,7 @@ add_executable(
114140
${TEST_TARGET_SRCS}
115141
)
116142

143+
target_link_libraries( ${TEST_TARGET} cloudutils)
117144
target_link_libraries( ${TEST_TARGET} Catch2WithMain )
118145

119146
##########################################################################

‎extras/test/src/test_command_decode.cpp

+40-40
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ SCENARIO("Test the decoding of command messages") {
3939
0x33, 0x39, 0x34, 0x63};
4040

4141
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
42-
// CBORMessageDecoder decoder;
43-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
42+
CBORMessageDecoder decoder;
43+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
4444
const char *thingIdToMatch = "e4494d55-872a-4fd2-9646-92f87949394c";
4545

4646
THEN("The decode is successful") {
@@ -68,8 +68,8 @@ SCENARIO("Test the decoding of command messages") {
6868
0x33, 0x39, 0x34, 0x63};
6969

7070
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
71-
// CBORMessageDecoder decoder;
72-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
71+
CBORMessageDecoder decoder;
72+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
7373
const char *thingIdToMatch = "e4494d55-872a-4fd2-9646-92f87949394c";
7474

7575
THEN("The decode is successful") {
@@ -93,8 +93,8 @@ SCENARIO("Test the decoding of command messages") {
9393
0xDC, 0xB8, 0x21};
9494

9595
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
96-
// CBORMessageDecoder decoder;
97-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
96+
CBORMessageDecoder decoder;
97+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
9898

9999
THEN("The decode is unsuccessful") {
100100
REQUIRE(err == Decoder::Status::Error);
@@ -114,8 +114,8 @@ SCENARIO("Test the decoding of command messages") {
114114
0xDC, 0xB8, 0x21};
115115

116116
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
117-
// CBORMessageDecoder decoder;
118-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
117+
CBORMessageDecoder decoder;
118+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
119119

120120
THEN("The decode is successful") {
121121
REQUIRE(err == Decoder::Status::Error);
@@ -139,8 +139,8 @@ SCENARIO("Test the decoding of command messages") {
139139
0xDC, 0xB8, 0x21, 0x1A, 0x78, 0xAC, 0xA1, 0x91};
140140

141141
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
142-
// CBORMessageDecoder decoder;
143-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
142+
CBORMessageDecoder decoder;
143+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
144144

145145
THEN("The decode is successful") {
146146
REQUIRE(err == Decoder::Status::Complete);
@@ -169,8 +169,8 @@ SCENARIO("Test the decoding of command messages") {
169169
0x09, 0x10, 0x11, 0x12};
170170

171171
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
172-
// CBORMessageDecoder decoder;
173-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
172+
CBORMessageDecoder decoder;
173+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
174174

175175
THEN("The decode is successful") {
176176
REQUIRE(err == Decoder::Status::Complete);
@@ -249,8 +249,8 @@ SCENARIO("Test the decoding of command messages") {
249249
0x2b, 0x09, 0x49, 0xbc, 0x16, 0xdc, 0x49};
250250

251251
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
252-
// CBORMessageDecoder decoder;
253-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
252+
CBORMessageDecoder decoder;
253+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
254254

255255
uint8_t otaIdToMatch[ID_SIZE] = { 0xC7, 0x3C, 0xB0, 0x45, 0xF9, 0xC2, 0x43, 0x45,
256256
0x85, 0xAF, 0xFA, 0x36, 0xA3, 0x07, 0xBF, 0xE7};
@@ -388,8 +388,8 @@ SCENARIO("Test the decoding of command messages") {
388388
0x2b, 0x09, 0x49, 0xbc, 0x16, 0xdc, 0x49};
389389

390390
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
391-
// CBORMessageDecoder decoder;
392-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
391+
CBORMessageDecoder decoder;
392+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
393393

394394
THEN("The decode is successful") {
395395
REQUIRE(err == Decoder::Status::Error);
@@ -452,8 +452,8 @@ SCENARIO("Test the decoding of command messages") {
452452
0x2b, 0x09, 0x49, 0xbc, 0x16, 0xdc, 0x49};
453453

454454
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
455-
// CBORMessageDecoder decoder;
456-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
455+
CBORMessageDecoder decoder;
456+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
457457

458458
THEN("The decode is successful") {
459459
REQUIRE(err == Decoder::Status::Error);
@@ -511,8 +511,8 @@ SCENARIO("Test the decoding of command messages") {
511511
0xdc, 0x49};
512512

513513
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
514-
// CBORMessageDecoder decoder;
515-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
514+
CBORMessageDecoder decoder;
515+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
516516

517517
THEN("The decode is successful") {
518518
REQUIRE(err == Decoder::Status::Error);
@@ -570,8 +570,8 @@ SCENARIO("Test the decoding of command messages") {
570570
0xB8, 0x21};
571571

572572
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
573-
// CBORMessageDecoder decoder;
574-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
573+
CBORMessageDecoder decoder;
574+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
575575

576576
THEN("The decode is successful") {
577577
REQUIRE(err == Decoder::Status::Error);
@@ -596,8 +596,8 @@ SCENARIO("Test the decoding of command messages") {
596596
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
597597

598598
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
599-
// CBORMessageDecoder decoder;
600-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
599+
CBORMessageDecoder decoder;
600+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
601601

602602
THEN("The decode is unsuccessful - OtaBeginUp is not supported") {
603603
REQUIRE(err == Decoder::Status::Error);
@@ -619,8 +619,8 @@ SCENARIO("Test the decoding of command messages") {
619619
0x68, 0x69, 0x6e, 0x67, 0x5f, 0x69, 0x64};
620620

621621
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
622-
// CBORMessageDecoder decoder;
623-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
622+
CBORMessageDecoder decoder;
623+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
624624

625625
THEN("The decode is unsuccessful - ThingBeginCmd is not supported") {
626626
REQUIRE(err == Decoder::Status::Error);
@@ -639,8 +639,8 @@ SCENARIO("Test the decoding of command messages") {
639639
uint8_t const payload[] = {0xda, 0x00, 0x01, 0x05, 0x00, 0x80};
640640

641641
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
642-
// CBORMessageDecoder decoder;
643-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
642+
CBORMessageDecoder decoder;
643+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
644644

645645
THEN("The decode is unsuccessful - LastValuesBeginCmd is not supported") {
646646
REQUIRE(err == Decoder::Status::Error);
@@ -662,8 +662,8 @@ SCENARIO("Test the decoding of command messages") {
662662
0x2e, 0x30, 0x2e, 0x30};
663663

664664
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
665-
// CBORMessageDecoder decoder;
666-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
665+
CBORMessageDecoder decoder;
666+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
667667

668668
THEN("The decode is unsuccessful - DeviceBeginCmd is not supported") {
669669
REQUIRE(err == Decoder::Status::Error);
@@ -690,8 +690,8 @@ SCENARIO("Test the decoding of command messages") {
690690
0x20, 0x18, 0x64};
691691

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

696696
THEN("The decode is unsuccessful - OtaProgressCmdUp is not supported") {
697697
REQUIRE(err == Decoder::Status::Error);
@@ -710,8 +710,8 @@ SCENARIO("Test the decoding of command messages") {
710710
uint8_t const payload[] = {0xda, 0x00, 0x01, 0x08, 0x00, 0x80};
711711

712712
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
713-
// CBORMessageDecoder decoder;
714-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
713+
CBORMessageDecoder decoder;
714+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
715715

716716
THEN("The decode is unsuccessful - TimezoneCommandUp is not supported") {
717717
REQUIRE(err == Decoder::Status::Error);
@@ -735,8 +735,8 @@ SCENARIO("Test the decoding of command messages") {
735735
0xDC, 0xB8, 0x21, 0x1A, 0x78, 0xAC, 0xA1, 0x91};
736736

737737
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
738-
// CBORMessageDecoder decoder;
739-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
738+
CBORMessageDecoder decoder;
739+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
740740

741741
THEN("The decode is unsuccessful") {
742742
REQUIRE(err == Decoder::Status::Error);
@@ -759,8 +759,8 @@ SCENARIO("Test the decoding of command messages") {
759759
0xAC, 0xA1, 0x91};
760760

761761
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
762-
// CBORMessageDecoder decoder;
763-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
762+
CBORMessageDecoder decoder;
763+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
764764

765765
THEN("The decode is unsuccessful") {
766766
REQUIRE(err == Decoder::Status::Error);
@@ -776,8 +776,8 @@ SCENARIO("Test the decoding of command messages") {
776776
uint8_t const payload[] = {0xFF};
777777

778778
size_t payload_length = sizeof(payload) / sizeof(uint8_t);
779-
// CBORMessageDecoder decoder;
780-
Decoder::Status err = CBORMessageDecoder.decode((Message*)&command, payload, payload_length);
779+
CBORMessageDecoder decoder;
780+
Decoder::Status err = decoder.decode((Message*)&command, payload, payload_length);
781781

782782
THEN("The decode is unsuccessful") {
783783
REQUIRE(err == Decoder::Status::Error);

0 commit comments

Comments
 (0)