Fix unit-tests

Author: AniruddhaKanhere

MISRA.md

@@ -51,7 +51,7 @@ _Ref 18.2.1_
 
 _Ref 14.3.1_
 
-- MISRA C-2012 Rule 14.3 prohibits use of invarients in conditional statements. Since
+- MISRA C-2012 Rule 14.3 prohibits use of invariants in conditional statements. Since
   coreMQTT is designed to be compiled and executed on different machines with different
   architectures, it is designed to protect against overflows when converting different
   types to one another. In doing so, we have macros which check for such conditions on

docs/doxygen/include/size_table.md

@@ -10,7 +10,7 @@
     <tr>
         <td>core_mqtt.c</td>
         <td><center>8.1K</center></td>
-        <td><center>7.0K</center></td>
+        <td><center>7.1K</center></td>
     </tr>
     <tr>
         <td>core_mqtt_state.c</td>
@@ -19,8 +19,8 @@
     </tr>
     <tr>
         <td>core_mqtt_serializer.c</td>
-        <td><center>9.2K</center></td>
-        <td><center>7.4K</center></td>
+        <td><center>9.3K</center></td>
+        <td><center>7.5K</center></td>
     </tr>
     <tr>
         <td>core_mqtt_serializer_private.c</td>
@@ -30,7 +30,7 @@
     <tr>
         <td>core_mqtt_prop_serializer.c</td>
         <td><center>1.6K</center></td>
-        <td><center>1.3K</center></td>
+        <td><center>1.4K</center></td>
     </tr>
     <tr>
         <td>core_mqtt_prop_deserializer.c</td>
@@ -39,7 +39,7 @@
     </tr>
     <tr>
         <td><b>Total estimates</b></td>
-        <td><b><center>22.7K</center></b></td>
-        <td><b><center>18.7K</center></b></td>
+        <td><b><center>22.8K</center></b></td>
+        <td><b><center>19.0K</center></b></td>
     </tr>
 </table>

source/core_mqtt_serializer.c

@@ -2821,7 +2821,7 @@ static MQTTStatus_t deserializePublishProperties( MQTTPublishInfo_t * pPublishIn
     }
     else
     {
-        /* For QoS > 0, 2 byte packet ID is included. See whether the remaining length can accomodate that. */
+        /* For QoS > 0, 2 byte packet ID is included. See whether the remaining length can accommodate that. */
         uint32_t qosEncodedLength = ( pPublishInfo->qos > MQTTQoS0 ) ? 2U : 0U;
 
         /* Topic is encoded as 2 bytes for the length and topic string. */
@@ -4139,11 +4139,11 @@ MQTTStatus_t MQTT_SerializePublishHeader( const MQTTPublishInfo_t * pPublishInfo
          *                               + Remaining length
          *                               - Payload Length.
          */
-        uint32_t packetSizeu32 = 1U + variableLengthEncodedSize( remainingLength )
+        uint32_t packetSizeU32 = 1U + variableLengthEncodedSize( remainingLength )
                                  + remainingLength
                                  - ( ( uint32_t ) pPublishInfo->payloadLength );
 
-        if( CHECK_U32T_OVERFLOWS_SIZE_T( packetSizeu32 ) )
+        if( CHECK_U32T_OVERFLOWS_SIZE_T( packetSizeU32 ) )
         {
             LogError( ( "Length of serialized packet will not fit in size_t variable." ) );
 
@@ -4153,7 +4153,7 @@ MQTTStatus_t MQTT_SerializePublishHeader( const MQTTPublishInfo_t * pPublishInfo
         }
         else
         {
-            packetSize = ( size_t ) packetSizeu32;
+            packetSize = ( size_t ) packetSizeU32;
         }
     }
 
@@ -4591,17 +4591,6 @@ MQTTStatus_t MQTT_DeserializePublish( const MQTTPacketInfo_t * pIncomingPacket,
         LogError( ( "The incoming packet length is greater than the maximum packet size." ) );
         status = MQTTBadResponse;
     }
-    else if( CHECK_SIZE_T_OVERFLOWS_16BIT( pPublishInfo->topicNameLength ) )
-    {
-        LogError( ( "Topic name length must be smaller than 65535" ) );
-        status = MQTTBadParameter;
-    }
-    else if( CHECK_SIZE_T_OVERFLOWS_32BIT( pPublishInfo->propertyLength ) ||
-             ( pPublishInfo->propertyLength >= MQTT_REMAINING_LENGTH_INVALID ) )
-    {
-        LogError( ( "Property length cannot be larger than MQTT maximum 268435455." ) );
-        status = MQTTBadParameter;
-    }
     else
     {
         status = deserializePublish( pIncomingPacket, pPacketId, pPublishInfo, propBuffer, topicAliasMax );

test/unit-test/core_mqtt_serializer_utest.c

@@ -42,7 +42,6 @@ struct NetworkContext
     uint8_t ** buffer;
 };
 
-#define MQTT_MAX_REMAINING_LENGTH                   ( 268435455UL )
 #define MQTT_PACKET_CONNACK_REMAINING_LENGTH        ( ( uint8_t ) 2U )    /**< @brief A CONNACK packet always has a "Remaining length" of 2. */
 #define MQTT_PACKET_CONNACK_SESSION_PRESENT_MASK    ( ( uint8_t ) 0x01U ) /**< @brief The "Session Present" bit is always the lowest bit. */
 #define MQTT_PACKET_SIMPLE_ACK_REMAINING_LENGTH     ( ( uint8_t ) 2 )     /**< @brief PUBACK, PUBREC, PUBREl, PUBCOMP, UNSUBACK Remaining length. */

test/unit-test/core_mqtt_utest.c

@@ -615,7 +615,7 @@ static MQTTStatus_t MQTT_SerializeAck_SuccessAndSetDisconnect( const MQTTFixedBu
                                                                uint8_t packetType,
                                                                uint16_t packetId,
                                                                const MQTTPropBuilder_t * pAckProperties,
-                                                               MQTTSuccessFailReasonCode_t * pReasonCode,
+                                                               const MQTTSuccessFailReasonCode_t * pReasonCode,
                                                                int numcallbacks )
 {
     ( void ) numcallbacks;
@@ -634,7 +634,7 @@ static MQTTStatus_t MQTT_SerializeAck_SuccessAndSetDisconnPending( const MQTTFix
                                                                    uint8_t packetType,
                                                                    uint16_t packetId,
                                                                    const MQTTPropBuilder_t * pAckProperties,
-                                                                   MQTTSuccessFailReasonCode_t * pReasonCode,
+                                                                   const MQTTSuccessFailReasonCode_t * pReasonCode,
                                                                    int numcallbacks )
 {
     ( void ) numcallbacks;
@@ -713,7 +713,7 @@ MQTTStatus_t MQTT_SerializeAck_StubSuccess( const MQTTFixedBuffer_t * pFixedBuff
 }
 
 static uint8_t * MQTTV5_SerializeDisconnectFixed_cb( uint8_t * pIndex,
-                                                     MQTTSuccessFailReasonCode_t * pReasonCode,
+                                                     const MQTTSuccessFailReasonCode_t * pReasonCode,
                                                      uint32_t remainingLength,
                                                      int numcallbacks )
 {
@@ -784,7 +784,7 @@ static MQTTStatus_t MQTT_GetDisconnectPacketSize_ExpectReasonMalformed( const MQ
                                                                         uint32_t * pRemainingLength,
                                                                         uint32_t * pPacketSize,
                                                                         uint32_t maxPacketSize,
-                                                                        MQTTSuccessFailReasonCode_t * pReasonCode,
+                                                                        const MQTTSuccessFailReasonCode_t * pReasonCode,
                                                                         int numcallbacks )
 {
     ( void ) pDisconnectProperties;
@@ -800,7 +800,7 @@ static MQTTStatus_t MQTT_GetDisconnectPacketSize_ExpectReasonMalformed( const MQ
 }
 
 static uint8_t * serializeDisconnectFixed_cb_OneByte( uint8_t * pIndex,
-                                                      MQTTSuccessFailReasonCode_t * pReasonCode,
+                                                      const MQTTSuccessFailReasonCode_t * pReasonCode,
                                                       uint32_t remainingLength,
                                                       int numcallbacks )
 {
@@ -2518,7 +2518,7 @@ void test_MQTT_Connect_error_path()
     MQTT_ValidateWillProperties_ExpectAnyArgsAndReturn( MQTTSuccess );
 
     MQTT_ValidateConnectProperties_ExpectAnyArgsAndReturn( MQTTSuccess );
-    MQTT_ValidateConnectProperties_ReturnThruPtr_pPacketSizeMaxValue( &receiveMax );
+    MQTT_ValidateConnectProperties_ReturnThruPtr_pPacketMaxSizeValue( &receiveMax );
     MQTTPropAdd_MaxPacketSize_IgnoreAndReturn( MQTTSuccess );
     MQTT_GetConnectPacketSize_ExpectAnyArgsAndReturn( MQTTSuccess );
     serializeConnectFixedHeader_Stub( serializeConnectFixedHeader_cb );
@@ -3504,7 +3504,7 @@ void test_MQTT_Connect_happy_path1()
     willInfo.topicNameLength = 10;
     MQTT_ValidateWillProperties_ExpectAnyArgsAndReturn( MQTTSuccess );
     MQTT_ValidateConnectProperties_ExpectAnyArgsAndReturn( MQTTSuccess );
-    MQTT_ValidateConnectProperties_ReturnThruPtr_pPacketSizeMaxValue( &receiveMax );
+    MQTT_ValidateConnectProperties_ReturnThruPtr_pPacketMaxSizeValue( &receiveMax );
     MQTT_GetConnectPacketSize_IgnoreAndReturn( MQTTSuccess );
     serializeConnectFixedHeader_Stub( serializeConnectFixedHeader_cb );
     MQTT_GetIncomingPacketTypeAndLength_ExpectAnyArgsAndReturn( MQTTSuccess );
@@ -10162,7 +10162,7 @@ void test_MQTT_Connect_MaxPacketSizeBiggerThanBuffer( void )
     uint32_t receiveMax = UINT32_MAX;
 
     MQTT_ValidateConnectProperties_ExpectAnyArgsAndReturn( MQTTSuccess );
-    MQTT_ValidateConnectProperties_ReturnThruPtr_pPacketSizeMaxValue( &receiveMax );
+    MQTT_ValidateConnectProperties_ReturnThruPtr_pPacketMaxSizeValue( &receiveMax );
 
     status = MQTT_Connect( &mqttContext, &connectInfo, NULL, timeout, &sessionPresentResult, &PropertyBuilder, NULL );
     TEST_ASSERT_EQUAL_INT( MQTTBadParameter, status );