defining testing suite for cbor encoders/decoders

Author: andreagilardoni

extras/test/CMakeLists.txt

@@ -27,13 +27,26 @@ set(TEST_SRCS
   src/crc16/test_crc16.cpp
   src/sha256/test_sha256.cpp
   src/hex/test_hex.cpp
+  src/cbor/test_cbor_encoder.cpp
+  src/cbor/test_cbor_decoder.cpp
 )
 
 set(TEST_DUT_SRCS
   ../../src/crc/crc32.cpp
   ../../src/crc/crc16.cpp
   ../../src/sha256/sha2.c
   ../../src/hex/chex.h
+  ../../src/cbor/tinycbor
+  ../../src/cbor/tinycbor/src/cborencoder.c
+  ../../src/cbor/tinycbor/src/cborencoder_close_container_checked.c
+  ../../src/cbor/tinycbor/src/cborerrorstrings.c
+  ../../src/cbor/tinycbor/src/cborparser.c
+  ../../src/cbor/tinycbor/src/cborparser_dup_string.c
+  ../../src/cbor/tinycbor/src/cborpretty.c
+  ../../src/cbor/tinycbor/src/cborpretty_stdio.c
+  ../../src/cbor/tinycbor/src/cbortojson.c
+  ../../src/cbor/tinycbor/src/cborvalidation.c
+  ../../src/cbor/tinycbor/src/open_memstream.c
 )
 
 ##########################################################################

extras/test/src/cbor/test_cbor_decoder.cpp

@@ -0,0 +1,77 @@
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
+#include <cbor/CborDecoder.h>
+
+#include <stdio.h>
+
+enum : MessageId {
+    CBORTestMessageId = 0x0123,
+};
+
+enum : CBORTag {
+    CBORTestMessageTag = 0x0321,
+};
+
+struct CBORTestMessage {
+    Message m;
+    char parameter[20];
+};
+
+//TODO should this be a singleton?
+class CustomMessageDecoder: public CBORMessageDecoderInterface { // FIXME better names
+public:
+    CustomMessageDecoder()
+    : CBORMessageDecoderInterface(CBORTestMessageTag, CBORTestMessageId) {}
+
+protected:
+    Decoder::Status decode(CborValue* iter, Message *msg) override {
+        CBORTestMessage* test = (CBORTestMessage*) msg;
+        size_t dest_size = 20;
+
+        if(!cbor_value_is_text_string(iter)) {
+            return Decoder::Status::Error;
+        }
+
+        // NOTE: keep in mind that _cbor_value_copy_string tries to put a \0 at the end of the string
+        if(_cbor_value_copy_string(iter, test->parameter, &dest_size, NULL) != CborNoError) {
+            return Decoder::Status::Error;
+        }
+
+        return Decoder::Status::Complete;
+    }
+} customMessageDecoder;
+
+SCENARIO( "A custom decoder is defined", "[cbor][decode]" ) {
+
+    GIVEN( "A buffer containing a cbor encoded message" ) {
+        CBORTestMessage expected_result {
+            CBORTestMessageId,
+            "abcdef",
+        };
+
+        uint8_t buffer[] {
+            0xD9, 0x03, 0x21, 0x81, 0x66, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+        };
+        size_t buffer_len = sizeof(buffer);
+
+        CBORTestMessage cmd_res;
+
+        Decoder::Status res = CBORMessageDecoder.decode((Message*)&cmd_res, buffer, buffer_len);
+
+        THEN( "Message decode result is Complete" ) {
+            REQUIRE(res == Decoder::Status::Complete);
+        }
+
+        THEN( "the decode result matches the expectations" ) {
+            REQUIRE(buffer_len == sizeof(buffer));
+
+            REQUIRE(expected_result.m.id == cmd_res.m.id);
+
+            std::string parameter_expected(expected_result.parameter);
+            std::string parameter_result(cmd_res.parameter);
+
+            REQUIRE_THAT(parameter_result, Catch::Matchers::Equals(parameter_expected));
+        }
+    }
+}

extras/test/src/cbor/test_cbor_encoder.cpp

@@ -0,0 +1,71 @@
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_vector.hpp>
+#include <cbor/CborEncoder.h>
+
+enum : MessageId {
+    CBORTestMessageId = 0x0123,
+};
+
+enum : CBORTag {
+    CBORTestMessageTag = 0x0321,
+};
+
+
+struct CBORTestMessage {
+    Message m;
+    char parameter[20];
+};
+
+//TODO should this be a singleton?
+class CustomMessageEncoder: public CBORMessageEncoderInterface { // FIXME better names
+public:
+    CustomMessageEncoder()
+    : CBORMessageEncoderInterface(CBORTestMessageTag, CBORTestMessageId) {}
+
+protected:
+    Encoder::Status encode(CborEncoder* encoder, Message *msg) override {
+        CBORTestMessage * testMessage = (CBORTestMessage *) msg;
+        CborEncoder array_encoder;
+
+        if(cbor_encoder_create_array(encoder, &array_encoder, 1) != CborNoError) {
+            return Encoder::Status::Error;
+        }
+
+        if(cbor_encode_text_stringz(&array_encoder, testMessage->parameter) != CborNoError) {
+            return Encoder::Status::Error;
+        }
+
+        if(cbor_encoder_close_container(encoder, &array_encoder) != CborNoError) {
+            return Encoder::Status::Error;
+        }
+        return Encoder::Status::Complete;
+    }
+} customMessageEncoder;
+
+SCENARIO( "A custom encoder is defined", "[cbor][encode]" ) {
+    uint8_t buffer[100]; // shared buffer for encoding
+    const size_t buf_len = sizeof(buffer);
+
+    GIVEN( "A Message with an id that the global encoder is able to encode" ) {
+        CBORTestMessage cmd {
+            CBORTestMessageId,
+            "abcdef",
+        };
+        size_t res_len=buf_len;
+        Encoder::Status res = CBORMessageEncoder.encode((Message*)&cmd, buffer, res_len);
+
+        THEN( "Message encode result is Complete" ) {
+            REQUIRE(res == Encoder::Status::Complete);
+        }
+
+        THEN( "the encode result matches the expectations" ) {
+            std::vector<uint8_t> res(buffer, buffer+res_len);
+
+            REQUIRE_THAT(res, Catch::Matchers::Equals(std::vector<uint8_t>{
+                0xD9, 0x03, 0x21, 0x81, 0x66, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+            }));
+        }
+    }
+}