Rebase the code with new changes and resolve the issues

Author: smanes0213

Tests/L2Tests/tests/HdmiCecSink_L2Test.cpp

@@ -647,29 +647,21 @@ HdmiCecSink_L2Test_STANDBY::HdmiCecSink_L2Test_STANDBY()
     ON_CALL(*p_connectionMock, open())
         .WillByDefault(::testing::Return());
 
-    ON_CALL(*p_iarmBusImplMock, IARM_Bus_Call)
-        .WillByDefault(
-            [](const char* ownerName, const char* methodName, void* arg, size_t argLen) {
-                if (strcmp(methodName, IARM_BUS_PWRMGR_API_GetPowerState) == 0) {
-                    auto* param = static_cast<IARM_Bus_PWRMgr_GetPowerState_Param_t*>(arg);
-                    param->curState = IARM_BUS_PWRMGR_POWERSTATE_ON;
-                }
-                if (strcmp(methodName, IARM_BUS_DSMGR_API_dsHdmiInGetNumberOfInputs) == 0) {
-                    auto* param = static_cast<dsHdmiInGetNumberOfInputsParam_t*>(arg);
-                    param->result = dsERR_NONE;
-                    param->numHdmiInputs = 3;
-                }
-                if (strcmp(methodName, IARM_BUS_DSMGR_API_dsHdmiInGetStatus) == 0) {
-                    auto* param = static_cast<dsHdmiInGetStatusParam_t*>(arg);
-                    param->result = dsERR_NONE;
-                    param->status.isPortConnected[1] = 1;
-                }
-                if (strcmp(methodName, IARM_BUS_DSMGR_API_dsGetHDMIARCPortId) == 0) {
-                    auto* param = static_cast<dsGetHDMIARCPortIdParam_t*>(arg);
-                    param->portId = 1;
-                }
-                return IARM_RESULT_SUCCESS;
-            });
+    EXPECT_CALL(*p_hdmiInputImplMock, getNumberOfInputs())
+        .WillRepeatedly(::testing::Return(3));
+
+    ON_CALL(*p_hdmiInputImplMock, isPortConnected(::testing::_))
+        .WillByDefault(::testing::Invoke(
+            [](int8_t port) {
+                return port == 1 ? true : false;
+            }));
+
+    ON_CALL(*p_hdmiInputImplMock, getHDMIARCPortId(::testing::_))
+        .WillByDefault(::testing::Invoke(
+            [](int& portId) {
+                portId = 1;
+                return dsERR_NONE;
+            }));
 
     /* Activate plugin in constructor */
     status = ActivateService("org.rdk.PowerManager");
@@ -1175,7 +1167,6 @@ TEST_F(HdmiCecSink_L2Test, Set_And_Get_VendorId_COMRPC)
     }
 }
 
-
 // Test cases to validate GetAudioDeviceConnectedStatus COMRPC
 TEST_F(HdmiCecSink_L2Test, GetAudioDeviceConnectedStatus_COMRPC)
 {