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

Merge "Android CDM: Restored secure stop tests." into udc-dev

Browse Source
This commit is contained in:
Alex Dale
2023-03-30 06:11:58 +00:00
committed by Android (Google) Code Review
parent 98543b50cb e928670c85
commit 9d82b224eb
11 changed files with 1842 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp
View File

@@ -95,8 +95,8 @@ class MockCdmEngineImpl : public CdmEngine {
(override));
MOCK_METHOD(CdmResponseType, Unprovision, (CdmSecurityLevel), (override));
MOCK_METHOD(CdmResponseType, ListUsageIds,
(const std::string&, CdmSecurityLevel, std::vector<std::string>*,
std::vector<std::string>*),
(const std::string&, CdmSecurityLevel, std::vector<CdmKeySetId>*,
std::vector<CdmSecureStopId>*),
(override));
MOCK_METHOD(CdmResponseType, RemoveAllUsageInfo, (const std::string&),
(override));
@@ -104,8 +104,8 @@ class MockCdmEngineImpl : public CdmEngine {
(const std::string&, CdmSecurityLevel), (override));
MOCK_METHOD(CdmResponseType, RemoveUsageInfo,
(const std::string&, const CdmSecureStopId&), (override));
MOCK_METHOD(CdmResponseType, ReleaseUsageInfo,
(const CdmUsageInfoReleaseMessage&), (override));
MOCK_METHOD(CdmResponseType, ReleaseUsageInfo, (const CdmKeyResponse&),
(override));
MOCK_METHOD(CdmResponseType, DecryptV16,
(const CdmSessionId&, const CdmDecryptionParametersV16&),
(override));
@@ -464,17 +464,17 @@ TEST_F(WvCdmEngineMetricsImplTest, ReleaseUsageInfo) {
}
TEST_F(WvCdmEngineMetricsImplTest, ListUsageIds) {
std::vector<std::string> ksids;
std::vector<std::string> provider_session_tokens;
std::vector<CdmKeySetId> ksids;
std::vector<CdmSecureStopId> ssids;
EXPECT_CALL(*test_cdm_metrics_engine_,
ListUsageIds(Eq("fake app id"), Eq(kSecurityLevelL2), Eq(&ksids),
Eq(&provider_session_tokens)))
Eq(&ssids)))
.WillOnce(Return(CdmResponseType(UNKNOWN_ERROR)));
ASSERT_EQ(wvcdm::UNKNOWN_ERROR, test_cdm_metrics_engine_->ListUsageIds(
"fake app id", kSecurityLevelL2, &ksids,
&provider_session_tokens));
ASSERT_EQ(wvcdm::UNKNOWN_ERROR,
test_cdm_metrics_engine_->ListUsageIds(
"fake app id", kSecurityLevelL2, &ksids, &ssids));
drm_metrics::WvCdmMetrics metrics_proto;
test_cdm_metrics_engine_->GetMetricsSnapshot(&metrics_proto);