From 5482b602f68722d63a97e3a4e75435d3bba6cb2b Mon Sep 17 00:00:00 2001
From: balav08 <54432605+balav08@users.noreply.github.com>
Date: Thu, 16 Apr 2026 11:58:20 +0530
Subject: [PATCH 1/5] Update Iarm.cpp

---
 Tests/mocks/Iarm.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Tests/mocks/Iarm.cpp b/Tests/mocks/Iarm.cpp
index f99fc88..ac453e2 100755
--- a/Tests/mocks/Iarm.cpp
+++ b/Tests/mocks/Iarm.cpp
@@ -48,6 +48,20 @@ IARM_Result_t IarmBus::IARM_Bus_Connect()
     return impl->IARM_Bus_Connect();
 }
 
+IARM_Result_t IarmBus::IARM_Bus_Disconnect()
+{
+    TEST_LOG("Inside IARM_Bus_Disconnect");
+    EXPECT_NE(impl, nullptr);
+    return impl->IARM_Bus_Disconnect();
+}
+
+IARM_Result_t IarmBus::IARM_Bus_Term()
+{
+    TEST_LOG("Inside IARM_Bus_Term");
+    EXPECT_NE(impl, nullptr);
+    return impl->IARM_Bus_Term();
+}
+
 IARM_Result_t IarmBus::IARM_Bus_IsConnected(const char* memberName, int* isRegistered)
 {
     TEST_LOG("Inside IARM_Bus_IsConnected");
@@ -106,6 +120,8 @@ IARM_Result_t IarmBus::IARM_Bus_Call_with_IPCTimeout(const char *ownerName,  con
 
 IARM_Result_t (*IARM_Bus_Init)(const char*) = &IarmBus::IARM_Bus_Init;
 IARM_Result_t (*IARM_Bus_Connect)() = &IarmBus::IARM_Bus_Connect;
+IARM_Result_t (*IARM_Bus_Disconnect)() = &IarmBus::IARM_Bus_Disconnect;
+IARM_Result_t (*IARM_Bus_Term)() = &IarmBus::IARM_Bus_Term;
 IARM_Result_t (*IARM_Bus_IsConnected)(const char*,int*) = &IarmBus::IARM_Bus_IsConnected;
 IARM_Result_t (*IARM_Bus_RegisterEventHandler)(const char*,IARM_EventId_t,IARM_EventHandler_t) = &IarmBus::IARM_Bus_RegisterEventHandler;
 IARM_Result_t (*IARM_Bus_UnRegisterEventHandler)(const char*,IARM_EventId_t) = &IarmBus::IARM_Bus_UnRegisterEventHandler;

From 0d35f2c73bd2a986f08518f7f41ecaa114493729 Mon Sep 17 00:00:00 2001
From: balav08 <54432605+balav08@users.noreply.github.com>
Date: Mon, 25 May 2026 17:34:02 +0530
Subject: [PATCH 2/5] Update CMakeLists.txt

---
 Tests/L2Tests/L2TestsPlugin/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt b/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt
index 5ab9bd2..275404d 100755
--- a/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt
+++ b/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt
@@ -100,8 +100,8 @@ target_link_directories(${MODULE_NAME} PUBLIC ${CMAKE_INSTALL_PREFIX}/lib ${CMAK
 target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins gtest_main gmock gtest)
 
 set(ENTSERVICES_INC ../../../../entservices-deviceanddisplay/helpers ../../../../entservices-infra/helpers ../../../../entservices-mediaanddrm/helpers ../../../../entservices-softwareupdate/helpers ../../../../entservices-inputoutput/helpers ../../../../entservices-peripherals/helpers ../../../../entservices-connectivity/helpers)
+set(ENTSERVICES_INC ../../../../entservices-helpers/helpers)
 
-target_include_directories(${MODULE_NAME} PRIVATE ../../../helpers)
 target_include_directories(${MODULE_NAME} PRIVATE ./)
 target_include_directories(${MODULE_NAME} PRIVATE ../../mocks)
 target_include_directories(${MODULE_NAME} PRIVATE ../../mocks/thunder)

From 45185f62c9759d5dcefb5e06d4ab060a5da2f6f8 Mon Sep 17 00:00:00 2001
From: balav08 <54432605+balav08@users.noreply.github.com>
Date: Mon, 25 May 2026 17:35:08 +0530
Subject: [PATCH 3/5] Update mocks/CMakeLists.txt

---
 Tests/mocks/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/mocks/CMakeLists.txt b/Tests/mocks/CMakeLists.txt
index c87c0c5..3d38ceb 100755
--- a/Tests/mocks/CMakeLists.txt
+++ b/Tests/mocks/CMakeLists.txt
@@ -26,7 +26,7 @@ if(L2_TEST_OOP_RPC)
         target_include_directories(MockAccessor PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}
             ${CMAKE_INSTALL_PREFIX}/include/WPEFramework/core
-            ${CMAKE_SOURCE_DIR}/helpers
+            ${CMAKE_SOURCE_DIR}/entservices-helpers/helpers
             ${CMAKE_SOURCE_DIR}/Tests/mocks
             ${CMAKE_SOURCE_DIR}/Tests/mocks/thunder
             ${CMAKE_INSTALL_PREFIX}/include

From 03ca6344ced526611d1a67e8b1d55b57ce2ff5e7 Mon Sep 17 00:00:00 2001
From: balav08 <54432605+balav08@users.noreply.github.com>
Date: Mon, 25 May 2026 17:36:24 +0530
Subject: [PATCH 4/5] Update CMakeLists.txt

---
 Tests/mocks/MockPlugin/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/mocks/MockPlugin/CMakeLists.txt b/Tests/mocks/MockPlugin/CMakeLists.txt
index 2344a2c..78f1c0e 100755
--- a/Tests/mocks/MockPlugin/CMakeLists.txt
+++ b/Tests/mocks/MockPlugin/CMakeLists.txt
@@ -33,7 +33,7 @@ add_library(${MODULE_NAME} SHARED
 )
 
 # Include directories
-target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../../../helpers ../../mocks)
+target_include_directories(${MODULE_NAME} PRIVATE ${IARMBUS_INCLUDE_DIRS} ../../../entservices-helpers/helpers ../../mocks)
 
 # Link libraries
 target_link_libraries(${MODULE_NAME}

From 15e7f2da8e0f5f363aa6b0fc55440bb2293ef1f9 Mon Sep 17 00:00:00 2001
From: balav08 <54432605+balav08@users.noreply.github.com>
Date: Mon, 25 May 2026 20:28:20 +0530
Subject: [PATCH 5/5] Update Iarm.cpp

---
 Tests/mocks/Iarm.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Tests/mocks/Iarm.cpp b/Tests/mocks/Iarm.cpp
index 068bc0c..844c7dc 100755
--- a/Tests/mocks/Iarm.cpp
+++ b/Tests/mocks/Iarm.cpp
@@ -48,20 +48,6 @@ IARM_Result_t IarmBus::IARM_Bus_Connect()
     return impl->IARM_Bus_Connect();
 }
 
-IARM_Result_t IarmBus::IARM_Bus_Disconnect()
-{
-    TEST_LOG("Inside IARM_Bus_Disconnect");
-    EXPECT_NE(impl, nullptr);
-    return impl->IARM_Bus_Disconnect();
-}
-
-IARM_Result_t IarmBus::IARM_Bus_Term()
-{
-    TEST_LOG("Inside IARM_Bus_Term");
-    EXPECT_NE(impl, nullptr);
-    return impl->IARM_Bus_Term();
-}
-
 IARM_Result_t IarmBus::IARM_Bus_IsConnected(const char* memberName, int* isRegistered)
 {
     TEST_LOG("Inside IARM_Bus_IsConnected");