Rebase

.github/workflows/code-coverage.yml

@@ -2,7 +2,7 @@ name: Code Coverage
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main, develop]
 
 jobs:
   execute-unit-code-coverage-report-on-release:

src/rrdDynamic.c

@@ -159,7 +159,7 @@ int RRDGetProfileStringLength(issueNodeData *pissueStructNode, bool isDeepSleepA
  * @param bool isDeepSleepAwakeEvent - Flag to indicate if this is a deep sleep awake event.
  * @return void
  */
-#if !defined(GTEST_ENABLE)
+
 void RRDRdmManagerDownloadRequest(issueNodeData *pissueStructNode, char *dynJSONPath, data_buf *rbuf, bool isDeepSleepAwakeEvent)
 {
     char *paramString = NULL;
@@ -282,7 +282,7 @@ void RRDRdmManagerDownloadRequest(issueNodeData *pissueStructNode, char *dynJSON
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Exiting...\n", __FUNCTION__, __LINE__);
     return;
 }
-#endif
+
 /*
  * @function RRDCheckIssueInDynamicProfile
  * @brief Checks for a specific issue in the dynamic JSON profile associated with the given

src/rrdIarmEvents.c

@@ -244,7 +244,9 @@ void _pwrManagerEventHandler(const char *owner, IARM_EventId_t eventId, void *da
                 return;
             }
             strncpy((char *)sbuf->mdata, (const char *)DEEP_SLEEP_STR, msgLen);
+#if !defined(GTEST_ENABLE)
             RRDMsgDeliver(msqid, sbuf);
+#endif
 #ifdef USECOV
 	    RRD_data_buff_deAlloc(sbuf);
 #endif

src/rrdInterface.c

@@ -399,7 +399,7 @@ int RRD_unsubscribe()
     int ret = 0;
 
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Entering... \n", __FUNCTION__, __LINE__);
-#ifdef IARMBUS_SUPPORT
+#if defined(IARMBUS_SUPPORT) || defined(GTEST_ENABLE)
     ret = RRD_IARM_unsubscribe();
     if (ret != 0)
     {

src/rrdInterface.h

@@ -45,22 +45,20 @@ extern "C"
 #define RRD_PROCESS_NAME "remotedebugger"
 #define RRD_RBUS_TIMEOUT 60
 
-#ifdef IARMBUS_SUPPORT
 /*Enum for IARM Events*/
 typedef enum _RemoteDebugger_EventId_t {
         IARM_BUS_RDK_REMOTE_DEBUGGER_ISSUETYPE = 0,
         IARM_BUS_RDK_REMOTE_DEBUGGER_WEBCFGDATA,
         IARM_BUS_RDK_REMOTE_DEBUGGER_MAX_EVENT
 } IARM_Bus_RemoteDebugger_EventId_t;
-#endif
 
 /*Event Handler Function*/
 #if !defined(GTEST_ENABLE)
 void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription);
 void _remoteDebuggerWebCfgDataEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription);
 void _rdmDownloadEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription);
 #endif
-#ifdef IARMBUS_SUPPORT
+#if defined(IARMBUS_SUPPORT) || defined(GTEST_ENABLE)
 int RRD_IARM_subscribe(void);
 int RRD_IARM_unsubscribe(void);
 void _rdmManagerEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);

src/rrdRunCmdThread.c

@@ -416,10 +416,12 @@ bool executeCommands(issueData *cmdinfo)
 
             /*Stop or Reset runtime service for issue*/
             RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Stopping remote_debugger_%s service...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);
+#if !defined(GTEST_ENABLE)
 	    v_secure_system("systemctl stop %s", remoteDebuggerServiceStr);
             free(cmdData->rfcvalue); // free rfcvalue received from RRDEventThreadFunc
             free(cmdData->command); // free updated command info received from RRDEventThreadFunc
             free(cmdData);
+#endif
             return true;
         }
     }

src/unittest/mocks/Client_Mock.cpp

@@ -21,7 +21,6 @@
 #include <cstdarg>
 
 /* -------- IARM ---------------- */
-#ifdef IARMBUS_SUPPORT
 ClientIARMMock *g_mock = nullptr;
 
 void setMock(ClientIARMMock *mock)
@@ -81,7 +80,6 @@ extern "C"
         return IARM_RESULT_SUCCESS;
     }
 }
-#endif
 
 /* ---------- RBUS --------------*/
 RBusApiInterface *RBusApiWrapper::impl = nullptr;
@@ -128,6 +126,11 @@ rbusError_t RBusApiWrapper::rbus_set(rbusHandle_t handle, char const *objectName
     EXPECT_NE(impl, nullptr);
     return impl->rbus_set(handle, objectName, value, respHandler);
 }
+rbusError_t RBusApiWrapper::rbus_get(rbusHandle_t handle, char const *objectName, rbusValue_t value, rbusMethodAsyncRespHandler_t respHandler)
+{
+    EXPECT_NE(impl, nullptr);
+    return impl->rbus_get(handle, objectName, value, respHandler);
+}
 const char* rbusError_ToString(rbusError_t e)
 {
     #define rbusError_String(E, S) case E: s = S; break;

src/unittest/mocks/Client_Mock.h

@@ -21,7 +21,6 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#ifdef IARMBUS_SUPPORT
 /* ----------------- RDMMgr ---------- */
 #define IARM_BUS_RDMMGR_NAME "RDMMgr"
 #define RDM_PKG_NAME_MAX_SIZE 128
@@ -119,7 +118,6 @@ typedef struct _PWRMgr_EventData_t
         int32_t reset_sequence_progress;
     } data;
 } IARM_Bus_PWRMgr_EventData_t;
-#endif
 
 /* ---------------- WebConf ------------*/
 #define SUBDOC_NAME_SZ 64
@@ -240,7 +238,7 @@ typedef void (*rbusMethodAsyncRespHandler_t)(rbusHandle_t handle, char const *me
 
 /* =============== Implementations ============== */
 /* ---------- IARM Impl -----------*/
-#ifdef IARMBUS_SUPPORT
+
 class ClientIARMMock
 {
 public:
@@ -253,7 +251,7 @@ class ClientIARMMock
 };
 
 void setMock(ClientIARMMock *mock);
-#endif
+
 /* ------------------- RBUS Impl--------------- */
 class RBusApiInterface
 {
@@ -264,6 +262,7 @@ class RBusApiInterface
     virtual rbusError_t rbusValue_Init(rbusValue_t *value) = 0;
     virtual rbusError_t rbusValue_SetString(rbusValue_t value, char const *str) = 0;
     virtual rbusError_t rbus_set(rbusHandle_t handle, char const *objectName, rbusValue_t value, rbusMethodAsyncRespHandler_t respHandler) = 0;
+    virtual rbusError_t rbus_get(rbusHandle_t handle, char const *objectName, rbusValue_t value, rbusMethodAsyncRespHandler_t respHandler) = 0;
 };
 
 class RBusApiWrapper
@@ -280,13 +279,15 @@ class RBusApiWrapper
     static rbusError_t rbusValue_Init(rbusValue_t *value);
     static rbusError_t rbusValue_SetString(rbusValue_t value, char const *str);
     static rbusError_t rbus_set(rbusHandle_t handle, char const *objectName, rbusValue_t value, rbusMethodAsyncRespHandler_t respHandler);
+    static rbusError_t rbus_get(rbusHandle_t handle, char const *objectName, rbusValue_t value, rbusMethodAsyncRespHandler_t respHandler);
 };
 
 extern rbusError_t (*rbus_open)(rbusHandle_t *, char const *);
 extern rbusError_t (*rbus_close)(rbusHandle_t);
 extern rbusError_t (*rbusValue_Init)(rbusValue_t *);
 extern rbusError_t (*rbusValue_SetString)(rbusValue_t, char const *);
 extern rbusError_t (*rbus_set)(rbusHandle_t, char const *, rbusValue_t, rbusMethodAsyncRespHandler_t);
+extern rbusError_t (*rbus_get)(rbusHandle_t, char const *, rbusValue_t, rbusMethodAsyncRespHandler_t);
 
 class MockRBusApi : public RBusApiInterface
 {
@@ -296,6 +297,7 @@ class MockRBusApi : public RBusApiInterface
     MOCK_METHOD1(rbusValue_Init, rbusError_t(rbusValue_t *));
     MOCK_METHOD2(rbusValue_SetString, rbusError_t(rbusValue_t, char const *));
     MOCK_METHOD4(rbus_set, rbusError_t(rbusHandle_t, char const *, rbusValue_t, rbusMethodAsyncRespHandler_t));
+    MOCK_METHOD4(rbus_get, rbusError_t(rbusHandle_t, char const *, rbusValue_t, rbusMethodAsyncRespHandler_t));
 };
 
 /* ------------------- WebConfig Impl ------------ */