AVInput COM-RPC Support: Debugging unit tests

Author: pahearn73

Tests/L1Tests/tests/test_AVInput.cpp

@@ -54,6 +54,8 @@ class AVInputTest : public ::testing::Test {
     AVInputMock* p_avInputMock = nullptr;
     DECL_CORE_JSONRPC_CONX connection;
     IarmBusImplMock* p_iarmBusImplMock = nullptr;
+    ManagerImplMock* p_managerImplMock = nullptr;
+
     PLUGINHOST_DISPATCHER* dispatcher;
 
     AVInputTest()
@@ -63,6 +65,13 @@ class AVInputTest : public ::testing::Test {
         , workerPool(Core::ProxyType<WorkerPoolImplementation>::Create(
           2, Core::Thread::DefaultStackSize(), 16))
     {
+        p_managerImplMock  = new NiceMock <ManagerImplMock>;
+        device::Manager::setImpl(p_managerImplMock);
+
+        EXPECT_CALL(*p_managerImplMock, Initialize())
+            .Times(::testing::AnyNumber())
+            .WillRepeatedly(::testing::Return());
+
         p_avInputMock  = new NiceMock<AVInputMock>;
 
         dispatcher = static_cast<PLUGINHOST_DISPATCHER*>(
@@ -110,6 +119,13 @@ class AVInputTest : public ::testing::Test {
             delete p_avInputMock;
             p_avInputMock = nullptr;
         }
+
+        device::Manager::setImpl(nullptr);
+        if (p_managerImplMock != nullptr)
+        {
+            delete p_managerImplMock;
+            p_managerImplMock = nullptr;
+        }
     }
 };
 
@@ -153,7 +169,6 @@ class AVInputDsTest : public AVInputTest {
     HdmiInputImplMock* p_hdmiInputImplMock = nullptr;
     CompositeInputImplMock* p_compositeInputImplMock = nullptr;
     HostImplMock* p_HostImplMock = nullptr;
-    ManagerImplMock* p_managerImplMock = nullptr;
 
     AVInputDsTest()
         : AVInputTest()
@@ -166,14 +181,8 @@ class AVInputDsTest : public AVInputTest {
 
         p_HostImplMock = new NiceMock<HostImplMock>;
         device::Host::setImpl(p_HostImplMock);
-
-        p_managerImplMock  = new NiceMock <ManagerImplMock>;
-        device::Manager::setImpl(p_managerImplMock);
-
-        EXPECT_CALL(*p_managerImplMock, Initialize())
-            .Times(::testing::AnyNumber())
-            .WillRepeatedly(::testing::Return());
     }
+
     virtual ~AVInputDsTest() override
     {
         device::HdmiInput::setImpl(nullptr);
@@ -194,13 +203,6 @@ class AVInputDsTest : public AVInputTest {
             delete p_HostImplMock;
             p_HostImplMock = nullptr;
         }
-
-        device::Manager::setImpl(nullptr);
-        if (p_managerImplMock != nullptr)
-        {
-            delete p_managerImplMock;
-            p_managerImplMock = nullptr;
-        }
     }
 };