From 92d0e81143738fc6ef1f65d2f37f6de7528623ba Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Mon, 30 Sep 2024 09:41:56 -0700 Subject: [PATCH] Correct CertificateProvisioningTests failures [ Merge of http://go/wvgerrit/207720 ] CertificateProvisioningTests were failing because the expected filename "cert.bin" was not met. The file path being passed in on android was "/data/vendor/mediadrm/IDM0/L[1|3]/cert.bin" Bug: 339917270 Test: CertificateProvisioningTests/CertificateProvisioningTests.ProvisioningResponseSuccess/Keybox Test: CertificateProvisioningTests/CertificateProvisioningTests.ProvisioningResponseSuccess/OemCert Test: CertificateProvisioningTests/CertificateProvisioningTests.ProvisioningResponseSuccess/DrmCertificateReprovisioning Change-Id: I0874b9652d54848d58c202fe197af0da0616e8cd --- .../cdm/core/test/certificate_provisioning_unittest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp index 01328861..fcc62117 100644 --- a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp @@ -131,6 +131,7 @@ namespace wvcdm { using ::testing::_; using ::testing::ByMove; using ::testing::DoAll; +using ::testing::HasSubstr; using ::testing::NiceMock; using ::testing::NotNull; using ::testing::Return; @@ -468,7 +469,7 @@ TEST_P(CertificateProvisioningTest, ProvisioningResponseSuccess) { .WillOnce(DoAll(SaveArg<0>(&stored_certificate), ReturnArg<1>())); MockFileSystem file_system; - EXPECT_CALL(file_system, Open(StrEq(wvutil::kLegacyCertificateFileName), _)) + EXPECT_CALL(file_system, Open(HasSubstr(wvutil::kLegacyCertificateFileName), _)) .Times(1) .WillOnce(Return(ByMove(std::unique_ptr(file))));