Revert change for stripping static keywords for testing

Author: bradleysmith23

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Run Coverage
         run: |
           make -C build/ coverage
-          declare -a EXCLUDE=("\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*source\*" "\*vendor/unity\*" "\*_deps\*")
+          declare -a EXCLUDE=("\*test\*" "\*CMakeCCompilerId\*" "\*mocks\*" "\*vendor/unity\*" "\*_deps\*")
           echo ${EXCLUDE[@]} | xargs lcov --rc lcov_branch_coverage=1 -r build/coverage.info -o build/coverage.info
           lcov --rc lcov_branch_coverage=1 --list build/coverage.info
       - name: Check Coverage

test/unit-test/CMakeLists.txt

@@ -31,43 +31,16 @@ list(APPEND mock_define_list "")
 
 # ================= Create the library under test here (edit) ==================
 
-# Base name for temporary files
-set( TEMP_BASE "${CMAKE_BINARY_DIR}/MQTTFileDownloader_base64" )
-
-# Strip static constraints so unit tests may call internal functions
-execute_process( COMMAND sed "s/^static //"
-                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                 INPUT_FILE ../source/MQTTFileDownloader_base64.c
-                 OUTPUT_FILE ${TEMP_BASE}.c
-        )
-
-# Generate a header file for internal functions
-execute_process( COMMAND sed -n "/^static.*(/,/^{\$/{s/^static //; s/)\$/&;/; /{/d; p;}"
-                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                 INPUT_FILE ../source/MQTTFileDownloader_base64.c
-                 OUTPUT_FILE ${TEMP_BASE}_annex.h
-        )
-
-execute_process(COMMAND cp ./source/MQTTFileDownloader.c ./build/MQTTFileDownloader.c )
-
-execute_process(COMMAND cp ./source/MQTTFileDownloader_cbor.c ./build/MQTTFileDownloader_cbor.c )
-
-set (TEST_SOURCES
-         ${MODULE_ROOT_DIR}/build/MQTTFileDownloader.c
-         ${MODULE_ROOT_DIR}/build/MQTTFileDownloader_base64.c
-         ${MODULE_ROOT_DIR}/build/MQTTFileDownloader_cbor.c)
-
 # list the files you would like to test here
+list(APPEND real_source_files ${MQTT_FILE_DOWNLOADER_SOURCES} ${JSON_SOURCES} ${TINYCBOR_SOURCES})
 list(APPEND real_source_files ${TEST_SOURCES} ${JSON_SOURCES} ${TINYCBOR_SOURCES})
 # list the directories the module under test includes
 list(APPEND real_include_directories .
     ${MQTT_FILE_DOWNLOADER_INCLUDES}
     ${JSON_INCLUDE_PUBLIC_DIRS}
-    "${MODULE_ROOT_DIR}/build/"
     "${MODULE_ROOT_DIR}/test/unit-test/dependencies/"
 )
 
-
 # =====================  Create UnitTest Code here (edit)  =====================
 
 # list the directories your test needs to include

test/unit-test/downloader_base64_utest.c

@@ -15,7 +15,6 @@
 #include "MQTTFileDownloader.h"
 
 #include "MQTTFileDownloader_base64.h"
-#include "MQTTFileDownloader_base64_annex.h"
 
 #define GET_STREAM_REQUEST_BUFFER_SIZE    256U