diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index 668d0aeb..9dec2447 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -88,7 +88,7 @@ jobs: with: repository: rdkcentral/entservices-testframework path: entservices-testframework - ref: develop + ref: RDKEMW-4719_upto_date_validation_L1 token: ${{ secrets.RDKCM_RDKE }} - name: Checkout googletest diff --git a/Tests/L1Tests/tests/test_FirmwareUpdate.cpp b/Tests/L1Tests/tests/test_FirmwareUpdate.cpp index a9320f65..fba71e07 100644 --- a/Tests/L1Tests/tests/test_FirmwareUpdate.cpp +++ b/Tests/L1Tests/tests/test_FirmwareUpdate.cpp @@ -153,8 +153,6 @@ TEST_F(FirmwareUpdateTest, EmptyFirmwareFilepath) { EXPECT_EQ(Core::ERROR_INVALID_PARAMETER, handler.Invoke(connection, _T("updateFirmware"), _T("{\"firmwareFilepath\":\"\" ,\"firmwareType\":\"PCI\"}"), response)); - EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getUpdateState"), _T("{}"), response)); - EXPECT_EQ(response, string("{\"state\":\"VALIDATION_FAILED\",\"substate\":\"FIRMWARE_NOT_FOUND\"}")); } TEST_F(FirmwareUpdateTest, FirmwareFilepath_not_exist) @@ -162,8 +160,6 @@ TEST_F(FirmwareUpdateTest, FirmwareFilepath_not_exist) const char* filePath = "/tmp/ELTE11MWR_MIDDLEWARE_DEV_default_20241122145614.bin"; std::remove(filePath); EXPECT_EQ(Core::ERROR_INVALID_PARAMETER, handler.Invoke(connection, _T("updateFirmware"), _T("{\"firmwareFilepath\":\"/tmp/ELTE11MWR_MIDDLEWARE_DEV_default_20241122145614.bin\" ,\"firmwareType\":\"PCI\"}"), response)); - EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getUpdateState"), _T("{}"), response)); - EXPECT_EQ(response, string("{\"state\":\"VALIDATION_FAILED\",\"substate\":\"FIRMWARE_NOT_FOUND\"}")); } TEST_F(FirmwareUpdateTest, EmptyFirmwareType) @@ -172,10 +168,6 @@ TEST_F(FirmwareUpdateTest, EmptyFirmwareType) if (outfile.is_open()) { EXPECT_EQ(Core::ERROR_INVALID_PARAMETER, handler.Invoke(connection, _T("updateFirmware"), _T("{\"firmwareFilepath\":\"/tmp/ELTE11MWR_MIDDLEWARE_DEV_default_20241122145614.bin\" ,\"firmwareType\":\"\"}"), response)); - - - EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getUpdateState"), _T("{}"), response)); - EXPECT_EQ(response, string("{\"state\":\"VALIDATION_FAILED\",\"substate\":\"NOT_APPLICABLE\"}")); } } @@ -185,10 +177,6 @@ TEST_F(FirmwareUpdateTest, InvalidFirmwareType) if (outfile.is_open()) { EXPECT_EQ(Core::ERROR_INVALID_PARAMETER, handler.Invoke(connection, _T("updateFirmware"), _T("{\"firmwareFilepath\":\"/tmp/ELTE11MWR_MIDDLEWARE_DEV_default_20241122145614.bin\" ,\"firmwareType\":\"ABC\"}"), response)); - - - EXPECT_EQ(Core::ERROR_NONE, handler.Invoke(connection, _T("getUpdateState"), _T("{}"), response)); - EXPECT_EQ(response, string("{\"state\":\"VALIDATION_FAILED\",\"substate\":\"NOT_APPLICABLE\"}")); } } diff --git a/build_dependencies.sh b/build_dependencies.sh index d2708f15..bf4c8409 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -33,7 +33,7 @@ git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git git clone --branch main https://github.com/rdkcentral/entservices-apis.git -git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git +git clone --branch RDKEMW-4719_upto_date_validation_L1 https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git ############################ # Build Thunder-Tools