Merge branch 'main' into RDKTV-31102-stable2

RDKDoc · Jul 12, 2024 · ed15828 · ed15828
2 parents 7278a3d + be5b1fa
commit ed15828
Show file tree

Hide file tree

Showing 5 changed files with 1,262 additions and 12 deletions.
diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml
@@ -229,6 +229,7 @@ jobs:
           -DCMAKE_DISABLE_FIND_PACKAGE_RBus=ON
           -DPLUGIN_SYSTEMSERVICES=ON
           -DPLUGIN_TELEMETRY=ON
+          -DPLUGIN_WAREHOUSE=ON
           -DPLUGIN_HDCPPROFILE=ON
           -DPLUGIN_NETWORK=ON
           -DPLUGIN_TEXTTOSPEECH=ON

diff --git a/Tests/L2Tests/L2TestsPlugin/tests/Telemetry_L2Test.cpp b/Tests/L2Tests/L2TestsPlugin/tests/Telemetry_L2Test.cpp
@@ -285,7 +285,6 @@ JSONRPC::LinkType<Core::JSON::IElement> jsonrpc(TELEMETRY_CALLSIGN, TELEMETRYL2T
     JsonObject result;
     std::string message;
     JsonObject expected_status;
-    uint32_t signalled = TELEMETRYL2TEST_STATE_INVALID;
 
     /* Without params and with Params as "No status" expecting Fail case*/
     status = InvokeServiceMethod("org.rdk.Telemetry.1", "setReportProfileStatus", params, result);
@@ -343,7 +342,6 @@ TEST_F(Telemetry_L2test, TelemetrylogApplicationEvent){
     JsonObject result;
     std::string message;
     JsonObject expected_status;
-    uint32_t signalled = TELEMETRYL2TEST_STATE_INVALID;
 
     /* Without params expecting Fail case*/
     status = InvokeServiceMethod("org.rdk.Telemetry.1", "logApplicationEvent", params, result);
@@ -384,7 +382,6 @@ TEST_F(Telemetry_L2test, TelemetryAbortReport){
     JsonObject result;
     std::string message;
     JsonObject expected_status;
-    uint32_t signalled = TELEMETRYL2TEST_STATE_INVALID;
     struct _rbusObject rbObject;
 
     status = InvokeServiceMethod("org.rdk.Telemetry.1", "abortReport", params, result);
@@ -451,9 +448,6 @@ TEST_F(Telemetry_L2test, TelemetryImplementationMock){
     JsonObject result;
     std::string message;
     JsonObject expected_status;
-    uint32_t signalled = TELEMETRYL2TEST_STATE_INVALID;
-    struct _rbusObject rbObject;
-
 
     EXPECT_CALL(*p_telemetryApiImplMock, t2_init(::testing::_))
          .Times(::testing::AnyNumber());
@@ -520,8 +514,6 @@ TEST_F(Telemetry_L2test, TelemetryRbusOpeningErrorCheck){
     JsonObject result;
     std::string message;
     JsonObject expected_status;
-    uint32_t signalled = TELEMETRYL2TEST_STATE_INVALID;
-    struct _rbusObject rbObject;
 
     EXPECT_CALL(*p_rBusApiImplMock, rbus_open(::testing::_, ::testing::_))
         .Times(2)
@@ -563,9 +555,7 @@ TEST_F(Telemetry_L2test, TelemetryReportUploadErrorCheck){
     JsonObject result;
     std::string message;
     JsonObject expected_status;
-    uint32_t signalled = TELEMETRYL2TEST_STATE_INVALID;
     struct _rbusObject rbObject;
-    struct _rbusValue rbValue;
 
     ON_CALL(*p_rBusApiImplMock, rbus_open(::testing::_, ::testing::_))
         .WillByDefault(
@@ -596,4 +586,4 @@ TEST_F(Telemetry_L2test, TelemetryReportUploadErrorCheck){
     status = InvokeServiceMethod("org.rdk.Telemetry.1", "uploadReport", params, result);
     EXPECT_EQ(Core::ERROR_NONE, status);
 
-}
+}