Skip to content

Commit 053b1c3

Browse files
andreagilardoniandreagilardoni
committed
[TMP] readapting cmake testing by using cloudutils
1 parent 23a2c36 commit 053b1c3

File tree

5 files changed

+128
-117
lines changed

5 files changed

+128
-117
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "extras/test/Arduino_CloudUtils"]
2+
path = extras/test/Arduino_CloudUtils
3+
url = git@github.com:arduino-libraries/Arduino_CloudUtils.git

‎extras/test/Arduino_CloudUtils‎

Submodule Arduino_CloudUtils added at 234e9ca

‎extras/test/CMakeLists.txt‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ include_directories(../../src/cbor)
2424
include_directories(../../src/property)
2525
include_directories(../../src/utility/time)
2626

27+
include_directories(Arduino_CloudUtils/src/)
28+
include_directories(Arduino_CloudUtils/src/cbor)
29+
include_directories(Arduino_CloudUtils/src/interfaces)
30+
2731
##########################################################################
2832

2933
set(CMAKE_CXX_STANDARD 11)
@@ -69,19 +73,21 @@ set(TEST_DUT_SRCS
6973
../../src/cbor/CBOREncoder.cpp
7074
../../src/cbor/MessageDecoder.cpp
7175
../../src/cbor/MessageEncoder.cpp
72-
../../src/cbor/CBOR.cpp
73-
../../src/cbor/lib/tinycbor/src/cborencoder.c
74-
../../src/cbor/lib/tinycbor/src/cborencoder_close_container_checked.c
75-
../../src/cbor/lib/tinycbor/src/cborerrorstrings.c
76-
../../src/cbor/lib/tinycbor/src/cborparser.c
77-
../../src/cbor/lib/tinycbor/src/cborparser_dup_string.c
78-
../../src/cbor/lib/tinycbor/src/cborpretty.c
79-
../../src/cbor/lib/tinycbor/src/cborpretty_stdio.c
80-
../../src/cbor/lib/tinycbor/src/cbortojson.c
81-
../../src/cbor/lib/tinycbor/src/cborvalidation.c
82-
../../src/cbor/lib/tinycbor/src/open_memstream.c
83-
)
8476

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
90+
)
8591
##########################################################################
8692

8793
set(TEST_TARGET_SRCS

‎extras/test/src/test_command_decode.cpp‎

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

1414
#include <util/CBORTestUtil.h>
15+
#include <CborDecoder.h>
1516
#include <MessageDecoder.h>
1617

1718
/******************************************************************************
@@ -38,8 +39,8 @@ SCENARIO("Test the decoding of command messages") {
3839
0x33, 0x39, 0x34, 0x63};
3940

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

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

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

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

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

9899
THEN("The decode is unsuccessful") {
99100
REQUIRE(err == Decoder::Status::Error);
@@ -113,8 +114,8 @@ SCENARIO("Test the decoding of command messages") {
113114
0xDC, 0xB8, 0x21};
114115

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

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

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

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

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

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

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

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

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

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

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

457458
THEN("The decode is successful") {
458459
REQUIRE(err == Decoder::Status::Error);
@@ -510,8 +511,8 @@ SCENARIO("Test the decoding of command messages") {
510511
0xdc, 0x49};
511512

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

516517
THEN("The decode is successful") {
517518
REQUIRE(err == Decoder::Status::Error);
@@ -569,8 +570,8 @@ SCENARIO("Test the decoding of command messages") {
569570
0xB8, 0x21};
570571

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

575576
THEN("The decode is successful") {
576577
REQUIRE(err == Decoder::Status::Error);
@@ -595,8 +596,8 @@ SCENARIO("Test the decoding of command messages") {
595596
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
596597

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

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

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

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

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

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

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

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

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

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

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

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

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

740741
THEN("The decode is unsuccessful") {
741742
REQUIRE(err == Decoder::Status::Error);
@@ -758,8 +759,8 @@ SCENARIO("Test the decoding of command messages") {
758759
0xAC, 0xA1, 0x91};
759760

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

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

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

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

0 commit comments

Comments
 (0)