Fix existing unit test cases build issue

xmidt-org · Dec 13, 2023 · 0d2b062 · 0d2b062
1 parent e574643
commit 0d2b062
Show file tree

Hide file tree

Showing 10 changed files with 510 additions and 133 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -37,63 +37,95 @@ add_executable(test_webpa_rbus test_webpa_rbus.c ../source/broadband/webpa_rbus.
 target_link_libraries (test_webpa_rbus ${WEBPA_COMMON_LIBS} -llibparodus -lrbus)
 target_link_libraries (test_webpa_rbus gcov -Wl,--no-as-needed )
 
-# #-------------------------------------------------------------------------------
-# #   test_webpa_adapter
-# #-------------------------------------------------------------------------------
-# add_test(NAME test_webpa_adapter COMMAND ${MEMORY_CHECK} ./test_webpa_adapter)
-# add_executable(test_webpa_adapter test_webpa_adapter.c ../source/broadband/webpa_adapter.c)
-# target_link_libraries (test_webpa_adapter -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS})
+#-------------------------------------------------------------------------------
+#   test_webpa_adapter
+#-------------------------------------------------------------------------------
+add_test(NAME test_webpa_adapter COMMAND ${MEMORY_CHECK} ./test_webpa_adapter)
+add_executable(test_webpa_adapter test_webpa_adapter.c ../source/broadband/webpa_adapter.c)
+target_link_libraries (test_webpa_adapter -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS})
+target_link_libraries (test_webpa_adapter gcov -Wl,--no-as-needed )
 
-# #-------------------------------------------------------------------------------
-# #   test_webpa_get
-# #-------------------------------------------------------------------------------
-# add_test(NAME test_webpa_get COMMAND ${MEMORY_CHECK} ./test_webpa_get)
-# add_executable(test_webpa_get test_webpa_get.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
-# target_link_libraries (test_webpa_get -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+#-------------------------------------------------------------------------------
+#   test_webpa_get
+#-------------------------------------------------------------------------------
+add_test(NAME test_webpa_get COMMAND ${MEMORY_CHECK} ./test_webpa_get)
+add_executable(test_webpa_get test_webpa_get.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
+target_link_libraries (test_webpa_get -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+target_link_libraries (test_webpa_get gcov -Wl,--no-as-needed )
 
-# #-------------------------------------------------------------------------------
-# #   test_webpa_set
-# #-------------------------------------------------------------------------------
-# add_test(NAME test_webpa_set COMMAND ${MEMORY_CHECK} ./test_webpa_set)
-# add_executable(test_webpa_set test_webpa_set.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
-# target_link_libraries (test_webpa_set -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+#-------------------------------------------------------------------------------
+#   test_webpa_set
+#-------------------------------------------------------------------------------
+add_test(NAME test_webpa_set COMMAND ${MEMORY_CHECK} ./test_webpa_set)
+add_executable(test_webpa_set test_webpa_set.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
+target_link_libraries (test_webpa_set -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+target_link_libraries (test_webpa_set gcov -Wl,--no-as-needed )
 
-# #-------------------------------------------------------------------------------
-# #   test_webpa_notification
-# #-------------------------------------------------------------------------------
-# add_test(NAME test_webpa_notification COMMAND ${MEMORY_CHECK} ./test_webpa_notification)
-# add_executable(test_webpa_notification test_webpa_notification.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
-# target_link_libraries (test_webpa_notification -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+#-------------------------------------------------------------------------------
+#   test_webpa_notification
+#-------------------------------------------------------------------------------
+add_test(NAME test_webpa_notification COMMAND ${MEMORY_CHECK} ./test_webpa_notification)
+add_executable(test_webpa_notification test_webpa_notification.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
+target_link_libraries (test_webpa_notification -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+target_link_libraries (test_webpa_notification gcov -Wl,--no-as-needed )
 
-# #-------------------------------------------------------------------------------
-# #   test_webpa_get_attributes
-# #-------------------------------------------------------------------------------
-# add_test(NAME test_webpa_get_attr COMMAND ${MEMORY_CHECK} ./test_webpa_get_attr)
-# add_executable(test_webpa_get_attr test_webpa_get_attr.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
-# target_link_libraries (test_webpa_get_attr -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+#-------------------------------------------------------------------------------
+#   test_webpa_get_attributes
+#-------------------------------------------------------------------------------
+add_test(NAME test_webpa_get_attr COMMAND ${MEMORY_CHECK} ./test_webpa_get_attr)
+add_executable(test_webpa_get_attr test_webpa_get_attr.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
+target_link_libraries (test_webpa_get_attr -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+target_link_libraries (test_webpa_get_attr gcov -Wl,--no-as-needed )
 
-# #-------------------------------------------------------------------------------
-# #   test_webpa_set_attributes
-# #-------------------------------------------------------------------------------
-# add_test(NAME test_webpa_set_attr COMMAND ${MEMORY_CHECK} ./test_webpa_set_attr)
-# add_executable(test_webpa_set_attr test_webpa_set_attr.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
-# target_link_libraries (test_webpa_set_attr -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+#-------------------------------------------------------------------------------
+#   test_webpa_set_attributes
+#-------------------------------------------------------------------------------
+add_test(NAME test_webpa_set_attr COMMAND ${MEMORY_CHECK} ./test_webpa_set_attr)
+add_executable(test_webpa_set_attr test_webpa_set_attr.c mock_stack.c mock_cache.c ../source/app/libpd.c ${WEBPA_COMMON_SOURCES} ${WEBPA_TABLE_SOURCES})
+target_link_libraries (test_webpa_set_attr -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+target_link_libraries (test_webpa_set_attr gcov -Wl,--no-as-needed )
 
-# #-------------------------------------------------------------------------------
-# #   test_webpa_replace
-# #-------------------------------------------------------------------------------
-# add_test(NAME test_webpa_replace COMMAND ${MEMORY_CHECK} ./test_webpa_replace)
-# add_executable(test_webpa_replace test_webpa_replace.c mock_stack.c mock_cache.c ../source/app/libpd.c ../source/broadband/webpa_replace.c ${WEBPA_COMMON_SOURCES})
-# target_link_libraries (test_webpa_replace -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+#-------------------------------------------------------------------------------
+#   test_webpa_replace
+#-------------------------------------------------------------------------------
+add_test(NAME test_webpa_replace COMMAND ${MEMORY_CHECK} ./test_webpa_replace)
+add_executable(test_webpa_replace test_webpa_replace.c mock_stack.c mock_cache.c ../source/app/libpd.c ../source/broadband/webpa_replace.c ${WEBPA_COMMON_SOURCES})
+target_link_libraries (test_webpa_replace -lwrp-c -ldbus-1 -lccsp_common -lwdmp-c -lcjson ${WEBPA_COMMON_LIBS} -llibparodus)
+target_link_libraries (test_webpa_replace gcov -Wl,--no-as-needed )
 
 # Code coverage
 
 add_custom_target(coverage
 COMMAND lcov -q --capture --directory 
 ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_libpd.dir/__/src --output-file test_libpd.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_rbus.dir/__/src --output-file test_webpa_rbus.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_adapter.dir/__/src --output-file test_webpa_adapter.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_get.dir/__/src --output-file test_webpa_get.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_set.dir/__/src --output-file test_webpa_set.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_get_attr.dir/__/src --output-file test_webpa_get_attr.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_set_attr.dir/__/src --output-file test_webpa_set_attr.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_replace.dir/__/src --output-file test_webpa_replace.info
+COMMAND lcov -q --capture --directory 
+${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/test_webpa_notification.dir/__/src --output-file test_webpa_notification.info
 
 COMMAND lcov
 -a test_libpd.info
+-a test_webpa_rbus.info
+-a test_webpa_adapter.info
+-a test_webpa_get.info
+-a test_webpa_set.info
+-a test_webpa_get_attr.info
+-a test_webpa_set_attr.info
+-a test_webpa_replace.info
+-a test_webpa_notification.info
+--output-file coverage.info
 
 COMMAND genhtml coverage.info
 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
diff --git a/tests/mock_stack.c b/tests/mock_stack.c
@@ -41,6 +41,20 @@ char *faultParam;
 /*----------------------------------------------------------------------------*/
 /*                             External Functions                             */
 /*----------------------------------------------------------------------------*/
+void clearTraceContext()
+{
+
+}
+
+rbusError_t getTraceContext(char* traceContext[])
+{
+    UNUSED(traceContext);
+}
+
+rbusError_t setTraceContext(char* traceContext[])
+{
+    UNUSED(traceContext);
+}
 
 void set_global_components(componentStruct_t **components)
 {

diff --git a/tests/mock_stack.h b/tests/mock_stack.h
@@ -18,6 +18,7 @@
 #define _MOCK_SATCK_H_
 
 #include <ccsp_base_api.h>
+#include <rbus/rbus.h>
 #define UNUSED(x) (void )(x)
 /*----------------------------------------------------------------------------*/
 /*                             Function Prototypes                            */
@@ -33,6 +34,9 @@ void set_global_parameters_count(int count);
 int get_global_parameters_count();
 void set_global_attributes(parameterAttributeStruct_t **attributes);
 parameterAttributeStruct_t ** get_global_attributes();
+void clearTraceContext();
+rbusError_t getTraceContext(char* traceContext[]);
+rbusError_t setTraceContext(char* traceContext[]);
 
 #endif
 
diff --git a/tests/test_webpa_adapter.c b/tests/test_webpa_adapter.c
@@ -21,6 +21,7 @@
 #include <stddef.h>
 #include <setjmp.h>
 #include <cmocka.h>
+#include <rbus/rbus.h>
 
 #include "../source/include/webpa_adapter.h"
 #include <cimplog/cimplog.h>
@@ -39,6 +40,16 @@ WDMP_STATUS status;
 /*----------------------------------------------------------------------------*/
 /*                                   Mocks                                    */
 /*----------------------------------------------------------------------------*/
+rbusError_t getTraceContext(char* traceContext[])
+{
+    UNUSED(traceContext);
+}
+
+rbusError_t setTraceContext(char* traceContext[])
+{
+    UNUSED(traceContext);
+}
+
 void getValues(const char *paramName[], const unsigned int paramCount, int index, money_trace_spans *timeSpan, param_t ***paramArr, int *retValCount, WDMP_STATUS *retStatus)
 {
     UNUSED(paramName); UNUSED(paramCount); UNUSED(index); UNUSED(timeSpan);
@@ -131,6 +142,8 @@ void test_processRequest_singleGet()
     char *reqPayload = "{ \"names\":[\"Device.DeviceInfo.Webpa.Enable\"],\"command\": \"GET\"}";
     char *transactionId = "aasfsdfgeh"; 
     char *resPayload = NULL;
+    headers_t *res_headers = NULL;
+    headers_t *req_headers = NULL;    
     cJSON *response = NULL, *paramArray = NULL, *resParamObj = NULL;
     count = 1;
     parameterList = (param_t **) malloc(sizeof(param_t*));
@@ -144,7 +157,7 @@ void test_processRequest_singleGet()
     expect_value(getValues, paramCount, 1);
     expect_value(getValues, index, 0);
     expect_function_call(getValues);
-    processRequest(reqPayload, transactionId, &resPayload);
+    processRequest(reqPayload, transactionId, &resPayload, req_headers, res_headers);
     WalInfo("resPayload : %s\n",resPayload);
     assert_non_null(resPayload);
     response = cJSON_Parse(resPayload);
@@ -175,6 +188,9 @@ void test_processRequest_WildcardsGet()
     count = 3;
     char *names[MAX_PARAMETER_LEN] = {"Device.DeviceInfo.Webpa.CMC", "Device.DeviceInfo.Webpa.CID", "Device.DeviceInfo.Webpa.Version"};
     char *values[MAX_PARAMETER_LEN] = {"32","abcd", "1"};
+    headers_t *res_headers = NULL;
+    headers_t *req_headers = NULL;
+
     parameterList = (param_t **) malloc(sizeof(param_t*));
     parameterList[0] = (param_t *) malloc(sizeof(param_t)*count);
 
@@ -190,7 +206,7 @@ void test_processRequest_WildcardsGet()
     expect_value(getValues, paramCount, 1);
     expect_value(getValues, index, 0);
     expect_function_call(getValues);
-    processRequest(reqPayload, transactionId, &resPayload);
+    processRequest(reqPayload, transactionId, &resPayload, req_headers, res_headers);
     WalInfo("resPayload : %s\n",resPayload);
     assert_non_null(resPayload);
     response = cJSON_Parse(resPayload);