AVInput COM-RPC Support: WIP

Author: pahearn73

AVInput/AVInputImplementation.cpp

@@ -47,23 +47,20 @@ namespace Plugin {
         : _adminLock()
         , _service(nullptr)
     {
-        printf("*** _DEBUG: AVInputImplementation::AVInputImplementation(): entry");
         LOGINFO("Create AVInputImplementation Instance");
         AVInputImplementation::_instance = this;
         InitializeIARM();
     }
 
     AVInputImplementation::~AVInputImplementation()
     {
-        printf("*** _DEBUG: AVInputImplementation::~AVInputImplementation(): entry");
         DeinitializeIARM();
         AVInputImplementation::_instance = nullptr;
         _service = nullptr;
     }
 
     void AVInputImplementation::InitializeIARM()
     {
-        printf("*** _DEBUG: AVInputImplementation::InitializeIARM: entry");
         if (Utils::IARM::init()) {
             IARM_Result_t res;
             IARM_CHECK(IARM_Bus_RegisterEventHandler(

Tests/L1Tests/tests/test_AVInput.cpp

@@ -250,18 +250,13 @@ TEST_F(AVInputDsTest, getVRRFrameRate_ErrorCase)
 
 class AVInputInit : public AVInputDsTest {
 protected:
-    IarmBusImplMock* p_iarmBusImplMock = nullptr;
     NiceMock<FactoriesImplementation> factoriesImplementation;
     PLUGINHOST_DISPATCHER* dispatcher;
-    NiceMock<ServiceMock> service;
     Core::JSONRPC::Message message;
 
     AVInputInit()
         : AVInputDsTest()
     {
-        p_iarmBusImplMock = new NiceMock<IarmBusImplMock>;
-        IarmBus::setImpl(p_iarmBusImplMock);
-
         ON_CALL(*p_iarmBusImplMock, IARM_Bus_RegisterEventHandler(::testing::_, ::testing::_, ::testing::_))
             .WillByDefault(::testing::Invoke(
                 [&](const char* ownerName, IARM_EventId_t eventId, IARM_EventHandler_t handler) {
@@ -311,7 +306,6 @@ class AVInputInit : public AVInputDsTest {
                     }
                     return IARM_RESULT_SUCCESS;
                 }));
-        EXPECT_EQ(string(""), plugin->Initialize(&service));
 
         PluginHost::IFactories::Assign(&factoriesImplementation);
         dispatcher = static_cast<PLUGINHOST_DISPATCHER*>(
@@ -324,14 +318,6 @@ class AVInputInit : public AVInputDsTest {
         dispatcher->Deactivate();
         dispatcher->Release();
         PluginHost::IFactories::Assign(nullptr);
-
-        plugin->Deinitialize(&service);
-
-        IarmBus::setImpl(nullptr);
-        if (p_iarmBusImplMock != nullptr) {
-            delete p_iarmBusImplMock;
-            p_iarmBusImplMock = nullptr;
-        }
     }
 };