From ff2120ec335e0e2a0a0c2a871316cf2fceaeaee1 Mon Sep 17 00:00:00 2001 From: smohap466 Date: Tue, 12 Aug 2025 11:04:32 +0530 Subject: [PATCH 1/4] RDKEMW-6680: Adding Boost lib for AVOutput Reason for change: Resolving undefined error for Boost lib Test Procedure: Regression Risks: Low Priority: P1 Signed-off-by: smohap466 --- AVOutput/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AVOutput/CMakeLists.txt b/AVOutput/CMakeLists.txt index a3589428..f67c24aa 100644 --- a/AVOutput/CMakeLists.txt +++ b/AVOutput/CMakeLists.txt @@ -30,6 +30,8 @@ set(PLUGIN_AVOUTPUT_AUTOSTART "true" CACHE STRING "Automatically start AVOutput find_package(WPEFramework) find_package(${NAMESPACE}Plugins REQUIRED) +find_package(Boost COMPONENTS system filesystem REQUIRED) + set (CMAKE_CXX_STANDARD 11) find_path (STAGING_INCDIR glib-2.0) @@ -88,6 +90,9 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${NAMESPACE}Plugins::${NAMESPACE}Plugins) +target_link_libraries(${MODULE_NAME} PRIVATE ${Boost_SYSTEM_LIBRARY}) +target_link_libraries(${MODULE_NAME} PRIVATE ${Boost_FILESYSTEM_LIBRARY}) + install(TARGETS ${MODULE_NAME} DESTINATION lib/wpeframework/plugins) From 51419c721e105acdd0e1a588ad436444e58adad2 Mon Sep 17 00:00:00 2001 From: smohap466 Date: Tue, 12 Aug 2025 11:04:32 +0530 Subject: [PATCH 2/4] RDKEMW-6680: Adding Boost lib for AVOutput Reason for change: Resolving undefined error for Boost lib Test Procedure: Regression Risks: Low Priority: P1 Signed-off-by: smohap466 --- .github/workflows/L2-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 70b3894a..be54f093 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -460,6 +460,7 @@ jobs: /tmp/persistent /tmp/persistent/rdkservicestore /opt/logs + /opt/panel /lib/rdk /run/media/sda1/logs/PreviousLogs /run/media/sda2/logs/PreviousLogs @@ -485,6 +486,7 @@ jobs: /opt/tmtryoptout /opt/fwdnldstatus.txt /opt/dcm.properties + /opt/panel/AVOutput.ini /etc/device.properties /etc/dcm.properties /etc/authService.conf @@ -515,6 +517,7 @@ jobs: /opt/tmtryoptout /opt/fwdnldstatus.txt /opt/dcm.properties + /opt/panel/AVOutput.ini /etc/device.properties /etc/dcm.properties /etc/authService.conf From c2b1e1c263baac94f6667892fe71e6d76ef4ac15 Mon Sep 17 00:00:00 2001 From: srinibas15 <113517102+srinibas15@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:27:52 +0530 Subject: [PATCH 3/4] Update AVOutputTV_L2Test.cpp --- Tests/L2Tests/tests/AVOutputTV_L2Test.cpp | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp b/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp index e7e3b47d..0661bc34 100755 --- a/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp +++ b/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp @@ -183,18 +183,18 @@ TEST_F(AVOutput_L2test, AVOUTPUT_GETINPUTDEVICE_Test) uint32_t status = Core::ERROR_GENERAL; JsonObject result, params; - ON_CALL(*p_tvSettingsImplMock, ReadCapablitiesFromConfODM(testing::_, testing::_, testing::_, testing::_, testing::_, testing::_, testing::_)) - .WillByDefault([](std::string& rangeInfo, std::string& pqmodeInfo, std::string& formatInfo, std::string& sourceInfo, std::string param, std::string& platformsupport, std::string& index) { - printf("ReadCapablitiesFromConfODM\n"); - rangeInfo = "\"Standard\",\"Vivid\",\"EnergySaving\",\"Custom\",\"Theater\",\"Game\""; - pqmodeInfo = ""; - formatInfo = "\"SDR\""; - sourceInfo = "\"HDMI\",\"HDMI2\""; - platformsupport = ""; - index = "0"; - - return tvERROR_NONE; - }); + // ON_CALL(*p_tvSettingsImplMock, ReadCapablitiesFromConfODM(testing::_, testing::_, testing::_, testing::_, testing::_, testing::_, testing::_)) + // .WillByDefault([](std::string& rangeInfo, std::string& pqmodeInfo, std::string& formatInfo, std::string& sourceInfo, std::string param, std::string& platformsupport, std::string& index) { + // printf("ReadCapablitiesFromConfODM\n"); + // rangeInfo = "\"Standard\",\"Vivid\",\"EnergySaving\",\"Custom\",\"Theater\",\"Game\""; + // pqmodeInfo = ""; + // formatInfo = "\"SDR\""; + // sourceInfo = "\"HDMI\",\"HDMI2\""; + // platformsupport = ""; + // index = "0"; + + // return tvERROR_NONE; + // }); status = InvokeServiceMethod("org.rdk.AVOutput.1", "getPictureModeCaps", params, result); From f7dd413abd627c1c706afb2ded3a241611468928 Mon Sep 17 00:00:00 2001 From: smohap466 Date: Tue, 12 Aug 2025 11:04:32 +0530 Subject: [PATCH 4/4] RDKEMW-6680: Rename mock functions for AVOutput Reason for change: Renaming mock function for AVOutput Test Procedure: Regression Risks: Low Priority: P1 Signed-off-by: smohap466 --- .github/workflows/L2-tests.yml | 3 +++ Tests/L2Tests/tests/AVOutputTV_L2Test.cpp | 26 +++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 70b3894a..be54f093 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -460,6 +460,7 @@ jobs: /tmp/persistent /tmp/persistent/rdkservicestore /opt/logs + /opt/panel /lib/rdk /run/media/sda1/logs/PreviousLogs /run/media/sda2/logs/PreviousLogs @@ -485,6 +486,7 @@ jobs: /opt/tmtryoptout /opt/fwdnldstatus.txt /opt/dcm.properties + /opt/panel/AVOutput.ini /etc/device.properties /etc/dcm.properties /etc/authService.conf @@ -515,6 +517,7 @@ jobs: /opt/tmtryoptout /opt/fwdnldstatus.txt /opt/dcm.properties + /opt/panel/AVOutput.ini /etc/device.properties /etc/dcm.properties /etc/authService.conf diff --git a/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp b/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp index e7e3b47d..2e03e0f5 100755 --- a/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp +++ b/Tests/L2Tests/tests/AVOutputTV_L2Test.cpp @@ -136,7 +136,7 @@ AVOutput_L2test::AVOutput_L2test() return tvERROR_NONE; })); - ON_CALL(*p_tvSettingsImplMock, GetCurrentSource(testing::_)) + ON_CALL(*p_tvSettingsImplMock, GetCurrentVideoSource(testing::_)) .WillByDefault(testing::Invoke( [&](tvVideoSrcType_t *currentSource) { EXPECT_EQ(*currentSource, VIDEO_SOURCE_IP); @@ -183,18 +183,18 @@ TEST_F(AVOutput_L2test, AVOUTPUT_GETINPUTDEVICE_Test) uint32_t status = Core::ERROR_GENERAL; JsonObject result, params; - ON_CALL(*p_tvSettingsImplMock, ReadCapablitiesFromConfODM(testing::_, testing::_, testing::_, testing::_, testing::_, testing::_, testing::_)) - .WillByDefault([](std::string& rangeInfo, std::string& pqmodeInfo, std::string& formatInfo, std::string& sourceInfo, std::string param, std::string& platformsupport, std::string& index) { - printf("ReadCapablitiesFromConfODM\n"); - rangeInfo = "\"Standard\",\"Vivid\",\"EnergySaving\",\"Custom\",\"Theater\",\"Game\""; - pqmodeInfo = ""; - formatInfo = "\"SDR\""; - sourceInfo = "\"HDMI\",\"HDMI2\""; - platformsupport = ""; - index = "0"; - - return tvERROR_NONE; - }); + // ON_CALL(*p_tvSettingsImplMock, ReadCapablitiesFromConfODM(testing::_, testing::_, testing::_, testing::_, testing::_, testing::_, testing::_)) + // .WillByDefault([](std::string& rangeInfo, std::string& pqmodeInfo, std::string& formatInfo, std::string& sourceInfo, std::string param, std::string& platformsupport, std::string& index) { + // printf("ReadCapablitiesFromConfODM\n"); + // rangeInfo = "\"Standard\",\"Vivid\",\"EnergySaving\",\"Custom\",\"Theater\",\"Game\""; + // pqmodeInfo = ""; + // formatInfo = "\"SDR\""; + // sourceInfo = "\"HDMI\",\"HDMI2\""; + // platformsupport = ""; + // index = "0"; + + // return tvERROR_NONE; + // }); status = InvokeServiceMethod("org.rdk.AVOutput.1", "getPictureModeCaps", params, result);