Skip to content

Commit 519991f

Browse files
PrathyushakothuruPrathyushakothuru
committed
build issue
1 parent adce966 commit 519991f

File tree

1 file changed

+35
-59
lines changed

1 file changed

+35
-59
lines changed

‎Tests/L1Tests/tests/test_AVInput.cpp‎

Lines changed: 35 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,11 @@ TEST_F(AVInputInit, onDevicesChangedCOMPOSITE)
657657

658658
EVENT_SUBSCRIBE(0, _T("onDevicesChanged"), _T("org.rdk.AVInput"), message);
659659

660-
plugin->OnCompositeInEventHotPlug(dsCOMPOSITE_IN_PORT_0, true);
660+
ASSERT_TRUE(dsAVEventHandler != nullptr);
661+
IARM_Bus_DSMgr_EventData_t eventData;
662+
eventData.data.composite_in_connect.port = dsCOMPOSITE_IN_PORT_0;
663+
eventData.data.composite_in_connect.isPortConnected = true;
664+
dsAVEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_HOTPLUG, &eventData, 0);
661665

662666
EXPECT_EQ(Core::ERROR_NONE, onDevicesChanged.Lock());
663667

@@ -684,7 +688,12 @@ TEST_F(AVInputInit, onSignalChangedStableHDMI)
684688

685689
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
686690

687-
plugin->OnHdmiInSignalStatus(dsHDMI_IN_PORT_0, dsHDMI_IN_SIGNAL_STATUS_STABLE);
691+
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
692+
IARM_Bus_DSMgr_EventData_t eventData;
693+
eventData.data.hdmi_in_sig_status.port = dsHDMI_IN_PORT_0;
694+
eventData.data.hdmi_in_sig_status.status = dsHDMI_IN_SIGNAL_STATUS_STABLE;
695+
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_SIGNAL_STATUS, &eventData, 0);
696+
688697

689698
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
690699

@@ -711,7 +720,12 @@ TEST_F(AVInputInit, onSignalChangedNoSignalHDMI)
711720

712721
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
713722

714-
plugin->OnHdmiInSignalStatus(dsHDMI_IN_PORT_0, dsHDMI_IN_SIGNAL_STATUS_NOSIGNAL);
723+
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
724+
725+
IARM_Bus_DSMgr_EventData_t eventData;
726+
eventData.data.hdmi_in_sig_status.port = dsHDMI_IN_PORT_0;
727+
eventData.data.hdmi_in_sig_status.status = dsHDMI_IN_SIGNAL_STATUS_NOSIGNAL;
728+
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_SIGNAL_STATUS, &eventData, 0);
715729

716730
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
717731

@@ -737,7 +751,12 @@ TEST_F(AVInputInit, onSignalChangedUnstableHDMI)
737751
}));
738752

739753
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
740-
plugin->OnHdmiInSignalStatus(dsHDMI_IN_PORT_0, dsHDMI_IN_SIGNAL_STATUS_UNSTABLE);
754+
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
755+
756+
IARM_Bus_DSMgr_EventData_t eventData;
757+
eventData.data.hdmi_in_sig_status.port = dsHDMI_IN_PORT_0;
758+
eventData.data.hdmi_in_sig_status.status = dsHDMI_IN_SIGNAL_STATUS_UNSTABLE;
759+
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_SIGNAL_STATUS, &eventData, 0);
741760

742761
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
743762

@@ -764,10 +783,7 @@ TEST_F(AVInputInit, onSignalChangedNotSupportedHDMI)
764783
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
765784
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
766785

767-
IARM_Bus_DSMgr_EventData_t eventData;
768-
eventData.data.hdmi_in_sig_status.port = dsHDMI_IN_PORT_0;
769-
eventData.data.hdmi_in_sig_status.status = dsHDMI_IN_SIGNAL_STATUS_NOTSUPPORTED;
770-
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_SIGNAL_STATUS, &eventData, 0);
786+
plugin->OnHdmiInSignalStatus(dsHDMI_IN_PORT_0, dsHDMI_IN_SIGNAL_STATUS_NOTSUPPORTED);
771787

772788
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
773789

@@ -792,12 +808,7 @@ TEST_F(AVInputInit, onSignalChangedDefaultHDMI)
792808
}));
793809

794810
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
795-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
796-
797-
IARM_Bus_DSMgr_EventData_t eventData;
798-
eventData.data.hdmi_in_sig_status.port = dsHDMI_IN_PORT_0;
799-
eventData.data.hdmi_in_sig_status.status = dsHDMI_IN_SIGNAL_STATUS_MAX;
800-
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_SIGNAL_STATUS, &eventData, 0);
811+
plugin->OnHdmiInSignalStatus(dsHDMI_IN_PORT_0, dsHDMI_IN_SIGNAL_STATUS_MAX);
801812

802813
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
803814

@@ -822,12 +833,7 @@ TEST_F(AVInputInit, onSignalChangedStableCOMPOSITE)
822833
}));
823834

824835
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
825-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
826-
827-
IARM_Bus_DSMgr_EventData_t eventData;
828-
eventData.data.composite_in_sig_status.port = dsCOMPOSITE_IN_PORT_0;
829-
eventData.data.composite_in_sig_status.status = dsCOMP_IN_SIGNAL_STATUS_STABLE;
830-
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_SIGNAL_STATUS, &eventData, 0);
836+
plugin->OnCompositeInSignalStatus(dsCOMPOSITE_IN_PORT_0, dsCOMP_IN_SIGNAL_STATUS_STABLE);
831837

832838
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
833839

@@ -854,10 +860,7 @@ TEST_F(AVInputInit, onSignalChangedNoSignalCOMPOSITE)
854860
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
855861
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
856862

857-
IARM_Bus_DSMgr_EventData_t eventData;
858-
eventData.data.composite_in_sig_status.port = dsCOMPOSITE_IN_PORT_0;
859-
eventData.data.composite_in_sig_status.status = dsCOMP_IN_SIGNAL_STATUS_NOSIGNAL;
860-
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_SIGNAL_STATUS, &eventData, 0);
863+
plugin->OnCompositeInSignalStatus(dsCOMPOSITE_IN_PORT_0, dsCOMP_IN_SIGNAL_STATUS_NOSIGNAL);
861864

862865
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
863866

@@ -884,10 +887,7 @@ TEST_F(AVInputInit, onSignalChangedUnstableCOMPOSITE)
884887
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
885888
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
886889

887-
IARM_Bus_DSMgr_EventData_t eventData;
888-
eventData.data.composite_in_sig_status.port = dsCOMPOSITE_IN_PORT_0;
889-
eventData.data.composite_in_sig_status.status = dsCOMP_IN_SIGNAL_STATUS_UNSTABLE;
890-
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_SIGNAL_STATUS, &eventData, 0);
890+
plugin->OnCompositeInSignalStatus(dsCOMPOSITE_IN_PORT_0, dsCOMP_IN_SIGNAL_STATUS_UNSTABLE);
891891

892892
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
893893

@@ -912,12 +912,7 @@ TEST_F(AVInputInit, onSignalChangedNotSupportedCOMPOSITE)
912912
}));
913913

914914
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
915-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
916-
917-
IARM_Bus_DSMgr_EventData_t eventData;
918-
eventData.data.composite_in_sig_status.port = dsCOMPOSITE_IN_PORT_0;
919-
eventData.data.composite_in_sig_status.status = dsCOMP_IN_SIGNAL_STATUS_NOTSUPPORTED;
920-
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_SIGNAL_STATUS, &eventData, 0);
915+
plugin->OnCompositeInSignalStatus(dsCOMPOSITE_IN_PORT_0, dsCOMP_IN_SIGNAL_STATUS_NOTSUPPORTED);
921916

922917
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
923918

@@ -942,12 +937,7 @@ TEST_F(AVInputInit, onSignalChangedDefaultCOMPOSITE)
942937
}));
943938

944939
EVENT_SUBSCRIBE(0, _T("onSignalChanged"), _T("org.rdk.AVInput"), message);
945-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
946-
947-
IARM_Bus_DSMgr_EventData_t eventData;
948-
eventData.data.composite_in_sig_status.port = dsCOMPOSITE_IN_PORT_0;
949-
eventData.data.composite_in_sig_status.status = dsCOMP_IN_SIGNAL_STATUS_MAX;
950-
dsAVSignalStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_SIGNAL_STATUS, &eventData, 0);
940+
plugin->OnCompositeInSignalStatus(dsCOMPOSITE_IN_PORT_0, dsCOMP_IN_SIGNAL_STATUS_MAX);
951941

952942
EXPECT_EQ(Core::ERROR_NONE, onSignalChanged.Lock());
953943

@@ -972,15 +962,11 @@ TEST_F(AVInputInit, onInputStatusChangeOn_HDMI)
972962
}));
973963

974964
EVENT_SUBSCRIBE(0, _T("onInputStatusChanged"), _T("org.rdk.AVInput"), message);
975-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
976965

977966
EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("startInput"), _T("{\"portId\": \"0\" , \"typeOfInput\":\"HDMI\", \"requestAudioMix\": true, \"plane\" : 1, \"topMost\" : true}"), response));
978967
EXPECT_EQ(response, string("{\"success\":true}"));
979968

980-
IARM_Bus_DSMgr_EventData_t eventData;
981-
eventData.data.hdmi_in_status.port = dsHDMI_IN_PORT_0;
982-
eventData.data.hdmi_in_status.isPresented = true;
983-
dsAVStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_STATUS, &eventData, 0);
969+
plugin->OnHdmiInStatus(dsHDMI_IN_PORT_0, true);
984970

985971
EXPECT_EQ(Core::ERROR_NONE, onInputStatusChanged.Lock());
986972

@@ -1005,13 +991,11 @@ TEST_F(AVInputInit, onInputStatusChangeOff_HDMI)
1005991
}));
1006992

1007993
EVENT_SUBSCRIBE(0, _T("onInputStatusChanged"), _T("org.rdk.AVInput"), message);
1008-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
994+
1009995

1010996
EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("stopInput"), _T("{\"typeOfInput\":\"HDMI\"}"), response));
1011997
EXPECT_EQ(response, string("{\"success\":true}"));
1012-
IARM_Bus_DSMgr_EventData_t eventData;
1013-
eventData.data.hdmi_in_status.port = dsHDMI_IN_PORT_0;
1014-
eventData.data.hdmi_in_status.isPresented = false;
998+
plugin->OnHdmiInStatus(dsHDMI_IN_PORT_0, false);
1015999

10161000
dsAVStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_HDMI_IN_STATUS, &eventData, 0);
10171001

@@ -1038,14 +1022,10 @@ TEST_F(AVInputInit, onInputStatusChangeOn_COMPOSITE)
10381022
}));
10391023

10401024
EVENT_SUBSCRIBE(0, _T("onInputStatusChanged"), _T("org.rdk.AVInput"), message);
1041-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
10421025

10431026
EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("startInput"), _T("{\"portId\": \"0\" , \"typeOfInput\":\"COMPOSITE\", \"requestAudioMix\": true, \"plane\" : 1, \"topMost\" : true}"), response));
10441027
EXPECT_EQ(response, string("{\"success\":true}"));
1045-
IARM_Bus_DSMgr_EventData_t eventData;
1046-
eventData.data.composite_in_status.port = dsCOMPOSITE_IN_PORT_0;
1047-
eventData.data.composite_in_status.isPresented = true;
1048-
dsAVStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_STATUS, &eventData, 0);
1028+
plugin->OnCompositeInStatus(dsCOMPOSITE_IN_PORT_0, true);
10491029

10501030
EXPECT_EQ(Core::ERROR_NONE, onInputStatusChanged.Lock());
10511031

@@ -1070,14 +1050,10 @@ TEST_F(AVInputInit, onInputStatusChangeOff_COMPOSITE)
10701050
}));
10711051

10721052
EVENT_SUBSCRIBE(0, _T("onInputStatusChanged"), _T("org.rdk.AVInput"), message);
1073-
ASSERT_TRUE(dsAVSignalStatusEventHandler != nullptr);
10741053

10751054
EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("stopInput"), _T("{\"typeOfInput\":\"COMPOSITE\"}"), response));
10761055
EXPECT_EQ(response, string("{\"success\":true}"));
1077-
IARM_Bus_DSMgr_EventData_t eventData;
1078-
eventData.data.composite_in_status.port = dsCOMPOSITE_IN_PORT_0;
1079-
eventData.data.composite_in_status.isPresented = false;
1080-
dsAVStatusEventHandler(IARM_BUS_DSMGR_NAME, IARM_BUS_DSMGR_EVENT_COMPOSITE_IN_STATUS, &eventData, 0);
1056+
plugin->OnCompositeInStatus(dsCOMPOSITE_IN_PORT_0, false);
10811057

10821058
EXPECT_EQ(Core::ERROR_NONE, onInputStatusChanged.Lock());
10831059

0 commit comments

Comments
 (0)