AVInput COM-RPC Support: WIP

Author: pahearn73

AVInput/AVInput.h

@@ -44,9 +44,9 @@ namespace Plugin {
         virtual ~AVInput();
 
         BEGIN_INTERFACE_MAP(AVInput)
-        INTERFACE_ENTRY(PluginHost::IPlugin)
-        INTERFACE_ENTRY(PluginHost::IDispatcher)
-        INTERFACE_AGGREGATE(Exchange::IAVInput, _avInput)
+            INTERFACE_ENTRY(PluginHost::IPlugin)
+            INTERFACE_ENTRY(PluginHost::IDispatcher)
+            INTERFACE_AGGREGATE(Exchange::IAVInput, _avInput)
         END_INTERFACE_MAP
 
         //  IPlugin methods
@@ -94,13 +94,13 @@ namespace Plugin {
             }
 
             BEGIN_INTERFACE_MAP(Notification)
-            INTERFACE_ENTRY(Exchange::IAVInput::IDevicesChangedNotification)
-            INTERFACE_ENTRY(Exchange::IAVInput::ISignalChangedNotification)
-            INTERFACE_ENTRY(Exchange::IAVInput::IInputStatusChangedNotification)
-            INTERFACE_ENTRY(Exchange::IAVInput::IVideoStreamInfoUpdateNotification)
-            INTERFACE_ENTRY(Exchange::IAVInput::IGameFeatureStatusUpdateNotification)
-            INTERFACE_ENTRY(Exchange::IAVInput::IHdmiContentTypeUpdateNotification)
-            INTERFACE_ENTRY(RPC::IRemoteConnection::INotification)
+                INTERFACE_ENTRY(Exchange::IAVInput::IDevicesChangedNotification)
+                INTERFACE_ENTRY(Exchange::IAVInput::ISignalChangedNotification)
+                INTERFACE_ENTRY(Exchange::IAVInput::IInputStatusChangedNotification)
+                INTERFACE_ENTRY(Exchange::IAVInput::IVideoStreamInfoUpdateNotification)
+                INTERFACE_ENTRY(Exchange::IAVInput::IGameFeatureStatusUpdateNotification)
+                INTERFACE_ENTRY(Exchange::IAVInput::IHdmiContentTypeUpdateNotification)
+                INTERFACE_ENTRY(RPC::IRemoteConnection::INotification)
             END_INTERFACE_MAP
 
             void Activated(RPC::IRemoteConnection*) override

Tests/L1Tests/tests/test_AVInput.cpp

@@ -18,6 +18,8 @@
 **/
 
 #include <gtest/gtest.h>
+#include "COMLinkMock.h"
+#include <gmock/gmock.h>
 
 #include "AVInput.h"
 
@@ -29,24 +31,51 @@
 #include "ServiceMock.h"
 #include "ThunderPortability.h"
 
+#include "AVInputImplementation.h"
+
 using namespace WPEFramework;
 
 using ::testing::NiceMock;
 
 class AVInputTest : public ::testing::Test {
 protected:
     Core::ProxyType<Plugin::AVInput> plugin;
+    Core::ProxyType<Plugin::AVInputImplementation> AVInputImpl;
+
+    NiceMock<COMLinkMock> comLinkMock;
+
     Core::JSONRPC::Handler& handler;
     DECL_CORE_JSONRPC_CONX connection;
     string response;
 
+    AVInputMock* p_avInputMock = nullptr;
+
     AVInputTest()
         : plugin(Core::ProxyType<Plugin::AVInput>::Create())
         , handler(*(plugin))
         , INIT_CONX(1, 0)
     {
+        p_avInputMock  = new NiceMock<AVInputMock>;
+
+        #ifdef USE_THUNDER_R4
+        ON_CALL(comLinkMock, Instantiate(::testing::_, ::testing::_, ::testing::_))
+                .WillByDefault(::testing::Invoke(
+                    [&](const RPC::Object& object, const uint32_t waitTime, uint32_t& connectionId) {
+                        AVInputImpl = Core::ProxyType<Plugin::AVInputImplementation>::Create();
+                        return &AVInputImpl;
+                    }));
+        #else
+            ON_CALL(comLinkMock, Instantiate(::testing::_, ::testing::_, ::testing::_, ::testing::_, ::testing::_))
+                .WillByDefault(::testing::Return(AVInputImpl));
+        #endif
+
+        plugin->Initialize(&service);
+
+    }
+    virtual ~AVInputTest()
+    {
+        plugin->Deinitialize(&service);
     }
-    virtual ~AVInputTest() = default;
 };
 
 TEST_F(AVInputTest, RegisteredMethods)