Fix unit tests and coverage

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>

Author: aggarg

test/unit-test/core_http_send_utest.c

@@ -760,6 +760,32 @@ static llhttp_errno_t llhttp_execute_partial_body( llhttp_t * pParser,
     return HPE_OK;
 }
 
+
+/* Mocked llhttp_execute callback that will be called when partial body has been
+ * received from the network. It returns HPE_PAUSED to mimic stopping parsing
+ * the body because user set HTTP_RESPONSE_DO_NOT_PARSE_BODY_FLAG. */
+static llhttp_errno_t llhttp_execute_partial_body_do_not_parse( llhttp_t * pParser,
+                                                                const char * pData,
+                                                                size_t len,
+                                                                int cmock_num_calls )
+{
+    ( void ) cmock_num_calls;
+    ( void ) len;
+
+    const char * pNext = pData;
+    llhttp_settings_t * pSettings = ( llhttp_settings_t * ) pParser->settings;
+
+    pSettings->on_message_begin( pParser );
+
+    helper_parse_status_line( &pNext, pParser, pSettings );
+    helper_parse_headers( &pNext, pParser, pSettings );
+    helper_parse_headers_finish( &pNext, pParser, pSettings, NULL );
+
+    pParser->error_pos = pNext;
+    pParser->error = HPE_PAUSED;
+    return HPE_PAUSED;
+}
+
 /* Mocked llhttp_execute callback that will be on a response of type
  * transfer-encoding chunked. */
 static llhttp_errno_t llhttp_execute_chunked_body( llhttp_t * pParser,
@@ -768,6 +794,7 @@ static llhttp_errno_t llhttp_execute_chunked_body( llhttp_t * pParser,
                                                    int cmock_num_calls )
 {
     ( void ) cmock_num_calls;
+    ( void ) len;
 
     const char * pNext = pData;
     uint8_t isHeadResponse = 0;
@@ -1158,6 +1185,47 @@ void test_HTTPClient_Send_parse_partial_body( void )
 
 /*-----------------------------------------------------------*/
 
+/* Test successfully parsing a response where up to the middle of the body
+ * is received on the first network read, then the rest of the response is not
+ * received from the network because HTTP_RESPONSE_DO_NOT_PARSE_BODY_FLAG is set.
+ */
+void test_HTTPClient_Send_do_not_parse_partial_body( void )
+{
+    HTTPStatus_t returnStatus = HTTPSuccess;
+
+    llhttp_execute_Stub( llhttp_execute_partial_body_do_not_parse );
+
+    memcpy( requestHeaders.pBuffer,
+            HTTP_TEST_REQUEST_GET_HEADERS,
+            HTTP_TEST_REQUEST_GET_HEADERS_LENGTH );
+    requestHeaders.headersLen = HTTP_TEST_REQUEST_GET_HEADERS_LENGTH;
+    pNetworkData = ( uint8_t * ) HTTP_TEST_RESPONSE_GET;
+    networkDataLen = HTTP_TEST_RESPONSE_GET_LENGTH;
+    firstPartBytes = HTTP_TEST_RESPONSE_GET_PARTIAL_BODY_LENGTH;
+
+    response.respOptionFlags |= HTTP_RESPONSE_DO_NOT_PARSE_BODY_FLAG;
+
+    returnStatus = HTTPClient_Send( &transportInterface,
+                                    &requestHeaders,
+                                    NULL,
+                                    0,
+                                    &response,
+                                    0 );
+    TEST_ASSERT_EQUAL( HTTPSuccess, returnStatus );
+    TEST_ASSERT_EQUAL( response.pBuffer + ( sizeof( HTTP_STATUS_LINE_OK ) - 1 ), response.pHeaders );
+    TEST_ASSERT_EQUAL( HTTP_TEST_RESPONSE_GET_HEADERS_LENGTH - HTTP_HEADER_END_INDICATOR_LEN,
+                       response.headersLen );
+    TEST_ASSERT_EQUAL( response.pHeaders + HTTP_TEST_RESPONSE_GET_HEADERS_LENGTH, response.pBody );
+    TEST_ASSERT_EQUAL( HTTP_TEST_RESPONSE_GET_PARTIAL_BODY_LENGTH - HTTP_TEST_RESPONSE_HEAD_LENGTH, response.bodyLen );
+    TEST_ASSERT_EQUAL( HTTP_STATUS_CODE_OK, response.statusCode );
+    TEST_ASSERT_EQUAL( HTTP_TEST_RESPONSE_GET_CONTENT_LENGTH, response.contentLength );
+    TEST_ASSERT_EQUAL( HTTP_TEST_RESPONSE_GET_HEADER_COUNT, response.headerCount );
+    TEST_ASSERT_BITS_HIGH( HTTP_RESPONSE_CONNECTION_CLOSE_FLAG, response.respFlags );
+    TEST_ASSERT_BITS_LOW( HTTP_RESPONSE_CONNECTION_KEEP_ALIVE_FLAG, response.respFlags );
+}
+
+/*-----------------------------------------------------------*/
+
 /* Test receiving a response where the body is of Transfer-Encoding chunked. */
 void test_HTTPClient_Send_parse_chunked_body( void )
 {

tools/cmock/coverage.cmake

@@ -14,9 +14,9 @@ execute_process( COMMAND lcov --directory ${CMAKE_BINARY_DIR}
                          --base-directory ${CMAKE_BINARY_DIR}
                          --initial
                          --capture
-                         --rc lcov_branch_coverage=1
-                         --rc genhtml_branch_coverage=1
+                         --rc branch_coverage=1
                          --output-file=${CMAKE_BINARY_DIR}/base_coverage.info
+                         --include "*source*"
         )
 file(GLOB files "${CMAKE_BINARY_DIR}/bin/tests/*")
 
@@ -46,10 +46,10 @@ execute_process(COMMAND ruby
 execute_process(
             COMMAND lcov --capture
                          --rc lcov_branch_coverage=1
-                         --rc genhtml_branch_coverage=1
                          --base-directory ${CMAKE_BINARY_DIR}
                          --directory ${CMAKE_BINARY_DIR}
                          --output-file ${CMAKE_BINARY_DIR}/second_coverage.info
+                         --include "*source*"
         )
 
 # combile baseline results (zeros) with the one after running the tests
@@ -60,10 +60,12 @@ execute_process(
                          --add-tracefile ${CMAKE_BINARY_DIR}/second_coverage.info
                          --output-file ${CMAKE_BINARY_DIR}/coverage.info
                          --no-external
-                         --rc lcov_branch_coverage=1
+                         --rc branch_coverage=1
+                         --include "*source*"
+                         --exclude "*dependency*"
         )
 execute_process(
-            COMMAND genhtml --rc lcov_branch_coverage=1
+            COMMAND genhtml --rc branch_coverage=1
                             --branch-coverage
                             --output-directory ${CMAKE_BINARY_DIR}/coverage
                                 ${CMAKE_BINARY_DIR}/coverage.info