L1-test

.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,6 @@ 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/rrdEventProcess.c

@@ -401,8 +401,12 @@ issueData* processIssueTypeInStaticProfileappend(data_buf *rbuf, issueNodeData *
 
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Entering.. \n", __FUNCTION__, __LINE__);
     RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Reading Static Profile Commands... \n", __FUNCTION__, __LINE__);
-
+#if !defined(GTEST_ENABLE)
     jsonParsed = readAndParseJSON(RRD_JSON_FILE);
+#else
+    jsonParsed = readAndParseJSON(rbuf->jsonPath);
+#endif
+#if !defined(GTEST_ENABLE)
     if (jsonParsed == NULL)
     { // Static Profile JSON Parsing or Read Fail
         RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Static Profile Parse/Read failed... %s\n", __FUNCTION__, __LINE__, RRD_JSON_FILE);
@@ -427,6 +431,7 @@ issueData* processIssueTypeInStaticProfileappend(data_buf *rbuf, issueNodeData *
     freeParsedJson(jsonParsed);
 
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Exiting...\n", __FUNCTION__, __LINE__);
+    #endif
     return staticdata;
 }
 

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

@@ -301,14 +301,14 @@ void _rdmDownloadEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbu
     free(pkg_name);
     free(pkg_inst_path);
 }
+#endif
 void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription)
 {
     char *dataMsg = NULL;
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Entering... \n", __FUNCTION__, __LINE__);
 
     (void)(handle);
     (void)(subscription);
-
     rbusValue_t value = rbusObject_GetValue(event->data, "value");
 
     RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Received event for RRD_SET_ISSUE_EVENT %s \n", __FUNCTION__, __LINE__, RRD_SET_ISSUE_EVENT);
@@ -335,10 +335,9 @@ void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event,
     {
         pushIssueTypesToMsgQueue(dataMsg, EVENT_MSG);
     }
-
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Exiting...\n", __FUNCTION__, __LINE__);
 }
-
+#if !defined(GTEST_ENABLE)
 void _remoteDebuggerWebCfgDataEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription)
 {
     char *inString = NULL;
@@ -399,7 +398,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

@@ -55,22 +55,23 @@ typedef enum _RemoteDebugger_EventId_t {
 #endif
 
 /*Event Handler Function*/
-#if !defined(GTEST_ENABLE)
 void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbusEventSubscription_t* subscription);
+#if !defined(GTEST_ENABLE)
 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
+//#ifdef IARMBUS_SUPPORT
 int RRD_IARM_subscribe(void);
 int RRD_IARM_unsubscribe(void);
+
 void _rdmManagerEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);
 #if defined(PWRMGR_PLUGIN)
 void _pwrManagerEventHandler(const PowerController_PowerState_t currentState,
     const PowerController_PowerState_t newState, void* userdata);
 #else
 void _pwrManagerEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);
 #endif
-#endif
+//#endif
 void RRD_data_buff_deAlloc(data_buf *sbuf);
 void RRDMsgDeliver(int msgqid, data_buf *sbuf);
 int RRD_subscribe(void);

src/rrdRunCmdThread.c

@@ -416,10 +416,10 @@ 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);
-	    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);
+            //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);
             return true;
         }
     }

src/unittest/Makefile.am

@@ -19,7 +19,7 @@
 bin_PROGRAMS = remotedebugger_gtest
 
 # Define the include directories
-COMMON_CPPFLAGS = -I../ -I../../ -I./mocks -I/usr/include/cjson -I/usr/include/nettle -I/usr/include/msgpack -DGTEST_ENABLE
+COMMON_CPPFLAGS = -I../ -I../../ -I./mocks -I/usr/include/cjson -I/usr/include/nettle  -I/usr/include/msgpack -DGTEST_ENABLE
 
 # Define the libraries to link against
 COMMON_LDADD = -lgtest -lgtest_main -lgmock_main -lgmock -lcjson -lmsgpackc -lgcov

src/unittest/mocks/Client_Mock.cpp

@@ -21,7 +21,7 @@
 #include <cstdarg>
 
 /* -------- IARM ---------------- */
-#ifdef IARMBUS_SUPPORT
+//#ifdef IARMBUS_SUPPORT
 ClientIARMMock *g_mock = nullptr;
 
 void setMock(ClientIARMMock *mock)
@@ -81,7 +81,7 @@ extern "C"
         return IARM_RESULT_SUCCESS;
     }
 }
-#endif
+//#endif
 
 /* ---------- RBUS --------------*/
 RBusApiInterface *RBusApiWrapper::impl = nullptr;
@@ -128,6 +128,26 @@ 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);
+}
+rbusValue_t RBusApiWrapper::rbusObject_GetValue(rbusObject_t object, char const* name)
+{
+    EXPECT_NE(impl, nullptr);
+    return impl->rbusObject_GetValue(object, name);
+}
+char const* RBusApiWrapper::rbusValue_GetString(rbusValue_t value, int* len)
+{
+    EXPECT_NE(impl, nullptr);
+    return impl->rbusValue_GetString(value,len);
+}
+char* RBusApiWrapper::rbusValue_ToString(rbusValue_t v, char* buf, size_t buflen)
+{ 
+    EXPECT_NE(impl, nullptr);
+    return impl->rbusValue_ToString(v, buf,buflen);
+}
 const char* rbusError_ToString(rbusError_t e)
 {
     #define rbusError_String(E, S) case E: s = S; break;
@@ -148,6 +168,10 @@ rbusError_t (*rbus_close)(rbusHandle_t) = &RBusApiWrapper::rbus_close;
 rbusError_t (*rbusValue_Init)(rbusValue_t *) = &RBusApiWrapper::rbusValue_Init;
 rbusError_t (*rbusValue_SetString)(rbusValue_t, char const *) = &RBusApiWrapper::rbusValue_SetString;
 rbusError_t (*rbus_set)(rbusHandle_t, char const *, rbusValue_t, rbusMethodAsyncRespHandler_t) = &RBusApiWrapper::rbus_set;
+char const* (*rbusValue_GetString)(rbusValue_t, int*) = &RBusApiWrapper::rbusValue_GetString;
+char* (*rbusValue_ToString)(rbusValue_t, char*, size_t);
+rbusValue_t (*rbusObject_GetValue)(rbusObject_t, char const*);
+
 
 /* -------- RFC ---------------*/
 SetParamInterface *SetParamWrapper::impl = nullptr;
@@ -242,4 +266,14 @@ extern "C"
         return;
     }
 }
+/*
+uint32_t PowerController_RegisterPowerModeChangedCallback(PowerController_PowerModeChangedCb callback, void* userdata)
+{
+    return POWER_CONTROLLER_ERROR_NONE;
+}
+uint32_t PowerController_Connect()
+{
+    return POWER_CONTROLLER_ERROR_NONE;
+}
 
+*/

src/unittest/mocks/Client_Mock.h

@@ -21,7 +21,12 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#ifdef IARMBUS_SUPPORT
+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;
+//#ifdef IARMBUS_SUPPORT
 /* ----------------- RDMMgr ---------- */
 #define IARM_BUS_RDMMGR_NAME "RDMMgr"
 #define RDM_PKG_NAME_MAX_SIZE 128
@@ -119,7 +124,7 @@
         int32_t reset_sequence_progress;
     } data;
 } IARM_Bus_PWRMgr_EventData_t;
-#endif
+//#endif
 
 /* ---------------- WebConf ------------*/
 #define SUBDOC_NAME_SZ 64
@@ -229,18 +234,65 @@
 struct _rbusObject
 {
 };
-typedef struct _rbusObject *rbusObject_t;
 
+typedef struct _rbusObject *rbusObject_t;
 struct _rbusValue
 {
 };
 typedef struct _rbusValue *rbusValue_t;
-
 typedef void (*rbusMethodAsyncRespHandler_t)(rbusHandle_t handle, char const *methodName, rbusError_t error, rbusObject_t params);
+typedef enum
+{
+    RBUS_EVENT_OBJECT_CREATED,   /**< Notification that an object instance was created in table. */
+    RBUS_EVENT_OBJECT_DELETED,   /**< Notification that an object instance was deleted in table. */
+    RBUS_EVENT_VALUE_CHANGED,    /**< Notification that a property value was changed. */
+    RBUS_EVENT_GENERAL,          /**< Provider defined event.*/
+    RBUS_EVENT_INITIAL_VALUE,    /**< Notification of initial value immediately after subscription*/
+    RBUS_EVENT_INTERVAL,         /**< For event with interval*/
+    RBUS_EVENT_DURATION_COMPLETE /**< For event with duration timeout*/
+} rbusEventType_t;
+
+typedef struct
+{
+    char const*     name;       /**< Fully qualified event name */
+    rbusEventType_t type;       /**< The type of event */
+    rbusObject_t    data;       /**< The data for the event */
+} rbusEvent_t;
+typedef struct _rbusFilter* rbusFilter_t;
+
+
+typedef struct _rbusEventSubscription
+{
+    char const*         eventName;  /** Fully qualified event name */
+    rbusFilter_t        filter;     /** Optional filter that the client would like 
+                                        the sender to apply before sending the event
+                                      */
+    uint32_t             interval;   /**< Total interval period after which
+                                         the event needs to be fired. Should
+                                         be in multiples of minInterval
+                                      */
+    uint32_t            duration;   /** Optional maximum duration in seconds until which
+                                        the subscription should be in effect. Beyond this 
+                                        duration, the event would be unsubscribed automatically. 
+                                        Pass "0" for indefinite event subscription which requires 
+                                        the rbusEvent_Unsubscribe API to be called explicitly.
+                                      */
+    void*               handler;    /** fixme rbusEventHandler_t internal*/
+    void*               userData;   /** The userData set when subscribing to the event. */
+    rbusHandle_t        handle;     /** Private use only: The rbus handle associated with this subscription */
+    bool                publishOnSubscribe;
+} rbusEventSubscription_t;
+
+typedef struct _rbusEventSubscription rbusEventSubscription_t;
+
+typedef void (*rbusSubscribeAsyncRespHandler_t)(
+    rbusHandle_t handle, 
+    rbusEventSubscription_t* subscription,
+    rbusError_t error);
 
 /* =============== Implementations ============== */
 /* ---------- IARM Impl -----------*/
-#ifdef IARMBUS_SUPPORT
+
 class ClientIARMMock
 {
 public:
@@ -253,7 +305,7 @@
 };
 
 void setMock(ClientIARMMock *mock);
-#endif
+
 /* ------------------- RBUS Impl--------------- */
 class RBusApiInterface
 {
@@ -264,6 +316,10 @@
     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;
+    virtual rbusValue_t rbusObject_GetValue(rbusObject_t object, char const* name) = 0;
+    virtual char const* rbusValue_GetString(rbusValue_t value, int* len) = 0;
+    virtual char* rbusValue_ToString(rbusValue_t v, char* buf, size_t buflen) = 0;
 };
 
 class RBusApiWrapper
@@ -280,13 +336,21 @@
     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);
+    static rbusValue_t rbusObject_GetValue(rbusObject_t object, char const* name);
+    static char const* rbusValue_GetString(rbusValue_t value, int* len);
+    static char* rbusValue_ToString(rbusValue_t v, char* buf, size_t buflen);
 };
 
 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);
+extern rbusValue_t (*rbusObject_GetValue)(rbusObject_t , char const *);
+extern char const* (*rbusValue_GetString)(rbusValue_t, int*);
+extern char* (*rbusValue_ToString)(rbusValue_t, char*, size_t);
 
 class MockRBusApi : public RBusApiInterface
 {
@@ -295,7 +359,11 @@
     MOCK_METHOD1(rbus_close, rbusError_t(rbusHandle_t));
     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_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));
+    MOCK_METHOD2(rbusObject_GetValue, rbusValue_t(rbusObject_t , char const *));
+    MOCK_METHOD2(rbusValue_GetString, char const*(rbusValue_t, int*));
+    MOCK_METHOD3(rbusValue_ToString,char*(rbusValue_t, char*, size_t));
 };
 
 /* ------------------- WebConfig Impl ------------ */
@@ -363,3 +431,22 @@
     MOCK_METHOD(void, PushBlobRequest, (execData * execDataLan), ());
     MOCK_METHOD(void, rdk_logger_init, (char* testStr), ());
 };
+
+
+/*
+#define POWER_CONTROLLER_ERROR_NONE 0
+typedef enum PowerController_PowerState {
+    POWER_STATE_UNKNOWN = 0 ,
+    POWER_STATE_OFF = 1 ,
+    POWER_STATE_STANDBY = 2 ,
+    POWER_STATE_ON = 3 ,
+POWER_STATE_STANDBY_LIGHT_SLEEP = 4 ,
+      POWER_STATE_STANDBY_DEEP_SLEEP = 5
+} PowerController_PowerState_t;
+
+
+typedef void (*PowerController_PowerModeChangedCb)(const PowerController_PowerState_t currentState, const PowerController_PowerState_t newState, void* userdata);
+typedef void (*PowerController_RebootBeginCb)(const char* rebootReasonCustom, const char* rebootReasonOther, const char* rebootRequestor, void* userdata);
+uint32_t PowerController_Connect();
+uint32_t PowerController_UnRegisterRebootBeginCallback(PowerController_RebootBeginCb callback);
+*/