Skip to content

Commit 14207b8

Browse files
pahearn73pahearn73
committed
AVInput COM-RPC Support: Debugging unit tests
1 parent 62412f5 commit 14207b8

File tree

4 files changed

+27
-74
lines changed

4 files changed

+27
-74
lines changed

‎AVInput/AVInput.cpp‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ namespace Plugin {
8686

8787
if (nullptr != _avInput) {
8888

89-
// <pca> 2
90-
_avInput->initialize(_avInputNotification);
91-
// </pca>
92-
9389
// Register for notifications
9490
_avInput->RegisterDevicesChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::IDevicesChangedNotification>());
9591
_avInput->RegisterSignalChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::ISignalChangedNotification>());
@@ -119,11 +115,6 @@ namespace Plugin {
119115

120116
if (nullptr != _avInput) {
121117

122-
// <pca> 2
123-
_avInput->deinitialize();
124-
// If this works move the stuff below to AVInputImplementation::deinitialize()
125-
// </pca>
126-
127118
_avInput->UnregisterDevicesChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::IDevicesChangedNotification>());
128119
_avInput->UnregisterSignalChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::ISignalChangedNotification>());
129120
_avInput->UnregisterInputStatusChangedNotification(_avInputNotification.baseInterface<Exchange::IAVInput::IInputStatusChangedNotification>());

‎AVInput/AVInputImplementation.cpp‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -53,73 +53,37 @@ namespace Plugin {
5353

5454
AVInputImplementation::_instance = this;
5555

56-
// <pca> 2
57-
// try {
58-
// device::Manager::Initialize();
59-
// LOGINFO("device::Manager::Initialize success");
60-
// if (!_registeredDsEventHandlers) {
61-
// _registeredDsEventHandlers = true;
62-
// device::Host::getInstance().Register(baseInterface<device::Host::IHdmiInEvents>(), "WPE::AVInputHdmi");
63-
// device::Host::getInstance().Register(baseInterface<device::Host::ICompositeInEvents>(), "WPE::AVInputComp");
64-
// }
65-
// }
66-
// catch(const device::Exception& err) {
67-
// LOGINFO("AVInput: Initialization failed due to device::manager::Initialize()");
68-
// LOG_DEVICE_EXCEPTION0();
69-
// }
70-
// </pca>
71-
}
72-
73-
AVInputImplementation::~AVInputImplementation()
74-
{
75-
device::Host::getInstance().UnRegister(baseInterface<device::Host::IHdmiInEvents>());
76-
device::Host::getInstance().UnRegister(baseInterface<device::Host::ICompositeInEvents>());
77-
_registeredDsEventHandlers = false;
78-
try {
79-
device::Manager::DeInitialize();
80-
LOGINFO("device::Manager::DeInitialize success");
81-
}
82-
catch(const device::Exception& err) {
83-
LOGINFO("device::Manager::DeInitialize failed due to device::Manager::DeInitialize()");
84-
LOG_DEVICE_EXCEPTION0();
85-
}
86-
87-
AVInputImplementation::_instance = nullptr;
88-
}
89-
90-
// <pca> 2
91-
void initialize()
92-
{
9356
try {
9457
device::Manager::Initialize();
95-
LOGINFO("initialize: device::Manager::Initialize success");
58+
LOGINFO("device::Manager::Initialize success");
9659
if (!_registeredDsEventHandlers) {
9760
_registeredDsEventHandlers = true;
9861
device::Host::getInstance().Register(baseInterface<device::Host::IHdmiInEvents>(), "WPE::AVInputHdmi");
9962
device::Host::getInstance().Register(baseInterface<device::Host::ICompositeInEvents>(), "WPE::AVInputComp");
10063
}
10164
}
10265
catch(const device::Exception& err) {
103-
LOGINFO("initialize: Initialization failed due to device::manager::Initialize()");
66+
LOGINFO("AVInput: Initialization failed due to device::manager::Initialize()");
10467
LOG_DEVICE_EXCEPTION0();
10568
}
10669
}
10770

108-
void deinitialize()
71+
AVInputImplementation::~AVInputImplementation()
10972
{
11073
device::Host::getInstance().UnRegister(baseInterface<device::Host::IHdmiInEvents>());
11174
device::Host::getInstance().UnRegister(baseInterface<device::Host::ICompositeInEvents>());
11275
_registeredDsEventHandlers = false;
11376
try {
11477
device::Manager::DeInitialize();
115-
LOGINFO("deinitialize: device::Manager::DeInitialize success");
78+
LOGINFO("device::Manager::DeInitialize success");
11679
}
11780
catch(const device::Exception& err) {
118-
LOGINFO("deinitialize: device::Manager::DeInitialize failed due to device::Manager::DeInitialize()");
81+
LOGINFO("device::Manager::DeInitialize failed due to device::Manager::DeInitialize()");
11982
LOG_DEVICE_EXCEPTION0();
12083
}
84+
85+
AVInputImplementation::_instance = nullptr;
12186
}
122-
// </pca>
12387

12488
template <typename T>
12589
Core::hresult AVInputImplementation::Register(std::list<T*>& list, T* notification)

‎AVInput/AVInputImplementation.h‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ using ParamsType = boost::variant<
6363
namespace WPEFramework {
6464
namespace Plugin {
6565

66-
// <pca> debug
66+
// <pca>
6767
//class AVInputImplementation : public Exchange::IAVInput {
6868
class AVInputImplementation :
6969
public Exchange::IAVInput,
@@ -105,11 +105,6 @@ namespace Plugin {
105105
return static_cast<T*>(this);
106106
}
107107

108-
// <pca> 2
109-
void initialize();
110-
void deinitialize();
111-
// </pca>
112-
113108
class EXTERNAL Job : public Core::IDispatch {
114109

115110
public:

‎Tests/L1Tests/tests/test_AVInput.cpp‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,27 @@ class AVInputTest : public ::testing::Test {
5454
AVInputMock* p_avInputMock = nullptr;
5555
DECL_CORE_JSONRPC_CONX connection;
5656
IarmBusImplMock* p_iarmBusImplMock = nullptr;
57-
ManagerImplMock* p_managerImplMock = nullptr;
57+
// <pca> debug
58+
//ManagerImplMock* p_managerImplMock = nullptr;
59+
// </pca>
5860
PLUGINHOST_DISPATCHER* dispatcher;
5961

6062
AVInputTest()
6163
: plugin(Core::ProxyType<Plugin::AVInput>::Create())
62-
// <pca> debug added
63-
//, AVInputImpl(Core::ProxyType<Plugin::AVInputImplementation>::Create())
64-
// </pca>
6564
, handler(*(plugin))
6665
, INIT_CONX(1, 0)
6766
, workerPool(Core::ProxyType<WorkerPoolImplementation>::Create(
6867
2, Core::Thread::DefaultStackSize(), 16))
6968
{
70-
p_managerImplMock = new NiceMock <ManagerImplMock>;
71-
device::Manager::setImpl(p_managerImplMock);
69+
// <pca> debug
70+
// p_managerImplMock = new NiceMock <ManagerImplMock>;
71+
// device::Manager::setImpl(p_managerImplMock);
72+
73+
// EXPECT_CALL(*p_managerImplMock, Initialize())
74+
// .Times(::testing::AnyNumber())
75+
// .WillRepeatedly(::testing::Return());
76+
// </pca>
7277

73-
EXPECT_CALL(*p_managerImplMock, Initialize())
74-
.Times(::testing::AnyNumber())
75-
.WillRepeatedly(::testing::Return());
76-
7778
p_avInputMock = new NiceMock<AVInputMock>;
7879

7980
dispatcher = static_cast<PLUGINHOST_DISPATCHER*>(
@@ -122,12 +123,14 @@ class AVInputTest : public ::testing::Test {
122123
p_avInputMock = nullptr;
123124
}
124125

125-
device::Manager::setImpl(nullptr);
126-
if (p_managerImplMock != nullptr)
127-
{
128-
delete p_managerImplMock;
129-
p_managerImplMock = nullptr;
130-
}
126+
// <pca> debug
127+
// device::Manager::setImpl(nullptr);
128+
// if (p_managerImplMock != nullptr)
129+
// {
130+
// delete p_managerImplMock;
131+
// p_managerImplMock = nullptr;
132+
// }
133+
// </pca>
131134
}
132135
};
133136

0 commit comments

Comments
 (0)