Added test

Author: rjtokenring

extras/test/src/test_command_decode.cpp

@@ -0,0 +1,80 @@
+/*
+   Copyright (c) 2019 Arduino.  All rights reserved.
+*/
+
+/**************************************************************************************
+   INCLUDE
+ **************************************************************************************/
+
+#include <catch.hpp>
+
+#include <memory>
+
+#include <util/CBORTestUtil.h>
+#include <MessageDecoder.h>
+
+/**************************************************************************************
+   TEST CODE
+ **************************************************************************************/
+
+SCENARIO("Test the decoding of command messages") {
+  /************************************************************************************/
+
+  WHEN("Decode the ThingGetIdCmdDown message")
+  {
+    ThingGetIdCmdDown * message = new ThingGetIdCmdDown();
+
+    /*
+    
+      DA 00010300                             # tag(66304)
+        81                                    # array(1)
+            78 24                             # text(36)
+              65343439346435352D383732612D346664322D393634362D393266383739343933393463 # "e4494d55-872a-4fd2-9646-92f87949394c"   
+    
+    */
+
+    uint8_t const payload[] = {0xDA, 0x00, 0x01, 0x03, 0x00, 0x81, 0x78, 0x24, 0x65, 0x34, 0x34, 0x39, 0x34, 0x64, 0x35, 0x35, 0x2D, 0x38, 0x37, 0x32, 0x61, 0x2D, 0x34, 0x66, 0x64, 0x32, 0x2D, 0x39, 0x36, 0x34, 0x36, 0x2D, 0x39, 0x32, 0x66, 0x38, 0x37, 0x39, 0x34, 0x39, 0x33, 0x39, 0x34, 0x63};
+
+    int payload_length = sizeof(payload) / sizeof(uint8_t);
+    CborError err =  MessageDecoder::decode((Message*) message, payload, payload_length);
+
+    THEN("The decode is successful") {
+      REQUIRE(err == CborNoError);
+      REQUIRE(message->fields.params.thing_id == "e4494d55-872a-4fd2-9646-92f87949394c");
+      REQUIRE(message->command == 66304);
+    }
+
+    delete message;
+  }
+
+  /************************************************************************************/
+
+  WHEN("Decode the SetTimezoneCommand message")
+  {
+    SetTimezoneCommand * message = new SetTimezoneCommand();
+
+    /*
+    
+      DA 00010764       # tag(67428)
+         82             # array(2)
+            1A 65DCB821 # unsigned(1708963873)
+            1A 78ACA191 # unsigned(2024579473)
+    
+    */
+
+    uint8_t const payload[] = {0xDA, 0x00, 0x01, 0x07, 0x64, 0x82, 0x1A, 0x65, 0xDC, 0xB8, 0x21, 0x1A, 0x78, 0xAC, 0xA1, 0x91};
+
+    int payload_length = sizeof(payload) / sizeof(uint8_t);
+    CborError err =  MessageDecoder::decode((Message*) message, payload, payload_length);
+
+    THEN("The decode is successful") {
+      REQUIRE(err == CborNoError);
+      REQUIRE(message->fields.params.offset == (uint32_t)1708963873);
+      REQUIRE(message->fields.params.until == (uint32_t)2024579473);
+      REQUIRE(message->command == 67428);
+    }
+
+    delete message;
+  }
+
+}

src/ArduinoIoTCloudTCP.cpp

@@ -309,7 +309,7 @@ void ArduinoIoTCloudTCP::decode(){
 
   DEBUG_INFO("Message THING id is %d", message->command);
 
-  GetThingIdCommand * thingCommand = (GetThingIdCommand*) message;
+  ThingGetIdCmdDown * thingCommand = (ThingGetIdCmdDown*) message;
   DEBUG_INFO("Thing id is %s", thingCommand->fields.params.thing_id);
 
   delete message;

src/models/models.h

@@ -34,19 +34,6 @@ struct GenericCommand {
     uint8_t content[MAX_PAYLOAD_SIZE];
 };
 
-struct ThingIdCommand {
-    Command command;
-};
-
-union GetThingIdCommand {
-    struct {
-        ThingIdCommand thingIdCommand;
-        struct {
-            char thing_id[THING_ID_SIZE];
-        } params;
-    } fields;
-};
-
 struct ThingGetIdCmdUpCommand {
     Command command;
 };