widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I34aab2b5,I0874b965 into vic-widevine-dev

Browse Source 
* changes:
  Skip ProvisioningStableSpoidTest if L3
  Correct CertificateProvisioningTests failures
This commit is contained in:
Rahul Frias
2024-11-05 18:05:14 +00:00
committed by Android (Google) Code Review
parent 45739aeaa2 a5a02ac1fb
commit b06655fc59
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp
View File

@@ -131,6 +131,7 @@ namespace wvcdm {
using ::testing::_; using ::testing::_;
using ::testing::ByMove; using ::testing::ByMove;
using ::testing::DoAll; using ::testing::DoAll;
using ::testing::HasSubstr;
using ::testing::NiceMock; using ::testing::NiceMock;
using ::testing::NotNull; using ::testing::NotNull;
using ::testing::Return; using ::testing::Return;
@@ -468,7 +469,7 @@ TEST_P(CertificateProvisioningTest, ProvisioningResponseSuccess) {
.WillOnce(DoAll(SaveArg<0>(&stored_certificate), ReturnArg<1>())); .WillOnce(DoAll(SaveArg<0>(&stored_certificate), ReturnArg<1>()));
MockFileSystem file_system; MockFileSystem file_system;
EXPECT_CALL(file_system, Open(StrEq(wvutil::kLegacyCertificateFileName), _)) EXPECT_CALL(file_system, Open(HasSubstr(wvutil::kLegacyCertificateFileName), _))
.Times(1) .Times(1)
.WillOnce(Return(ByMove(std::unique_ptr<File>(file)))); .WillOnce(Return(ByMove(std::unique_ptr<File>(file))));

7
libwvdrmengine/cdm/core/test/core_integration_test.cpp
View File

@@ -141,8 +141,11 @@ TEST_F(CoreIntegrationTest, ProvisioningStableSpoidTest) {
cdm_engine_.QueryStatus(kLevelDefault, QUERY_KEY_SECURITY_LEVEL, &level) cdm_engine_.QueryStatus(kLevelDefault, QUERY_KEY_SECURITY_LEVEL, &level)
.code()); .code());
ASSERT_TRUE(level == QUERY_VALUE_SECURITY_LEVEL_L1 || if (level == QUERY_VALUE_SECURITY_LEVEL_L3) {
level == QUERY_VALUE_SECURITY_LEVEL_L3) GTEST_SKIP(); // SPOID is not expected to be stable for L3
}
ASSERT_TRUE(level == QUERY_VALUE_SECURITY_LEVEL_L1)
<< "Unknown security level: " << level; << "Unknown security level: " << level;
CdmSecurityLevel security_level = level == QUERY_VALUE_SECURITY_LEVEL_L1 CdmSecurityLevel security_level = level == QUERY_VALUE_SECURITY_LEVEL_L1