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

Merge "Address test failures"

Browse Source
This commit is contained in:
Rahul Frias
2020-11-03 00:52:05 +00:00
committed by Android (Google) Code Review
parent 4447748573 42ecc6404b
commit 37be367712
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
View File

@@ -809,9 +809,8 @@ TEST_F(PolicyEngineTest,
policy->clear_rental_duration_seconds(); policy->clear_rental_duration_seconds();
// Only |playback_duration_seconds| set. // Only |playback_duration_seconds| set.
policy_engine_->BeginDecryption();
EXPECT_CALL(*mock_clock_, GetCurrentTime()) EXPECT_CALL(*mock_clock_, GetCurrentTime())
.WillOnce(Return(kLicenseStartTime - 10))
.WillOnce(Return(kLicenseStartTime + 1)) .WillOnce(Return(kLicenseStartTime + 1))
.WillOnce(Return(kPlaybackStartTime)) .WillOnce(Return(kPlaybackStartTime))
.WillOnce(Return(kPlaybackStartTime + kPlaybackDuration - 10)) .WillOnce(Return(kPlaybackStartTime + kPlaybackDuration - 10))
@@ -823,6 +822,9 @@ TEST_F(PolicyEngineTest,
EXPECT_CALL(mock_event_listener_, EXPECT_CALL(mock_event_listener_,
OnExpirationUpdate(_, kPlaybackStartTime + kPlaybackDuration)); OnExpirationUpdate(_, kPlaybackStartTime + kPlaybackDuration));
// Attempt decryption before the license has been received
policy_engine_->BeginDecryption();
policy_engine_->SetLicense(license_, false, false); policy_engine_->SetLicense(license_, false, false);
policy_engine_->BeginDecryption(); policy_engine_->BeginDecryption();
policy_engine_->OnTimerEvent(); policy_engine_->OnTimerEvent();

14
libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp
View File

@@ -190,8 +190,8 @@ class MockCDM : public WvContentDecryptionModule {
MOCK_METHOD2(Unprovision, CdmResponseType(CdmSecurityLevel, MOCK_METHOD2(Unprovision, CdmResponseType(CdmSecurityLevel,
const CdmIdentifier&)); const CdmIdentifier&));
MOCK_METHOD3(IsProvisioned, bool(CdmSecurityLevel, const std::string&, MOCK_METHOD4(IsProvisioned, bool(CdmSecurityLevel, const std::string&,
const std::string&)); const std::string&, bool));
MOCK_METHOD3(GetUsageInfo, CdmResponseType(const std::string&, MOCK_METHOD3(GetUsageInfo, CdmResponseType(const std::string&,
const CdmIdentifier&, const CdmIdentifier&,
@@ -1764,7 +1764,7 @@ TEST_F(WVDrmPluginTest, ReturnsL3SpoidsWhenL3ProvisionedUsingL3Spoid) {
.Times(kSpoidQuery) .Times(kSpoidQuery)
.WillRepeatedly(Invoke(setSessionIdOnMap<4>)); .WillRepeatedly(Invoke(setSessionIdOnMap<4>));
EXPECT_CALL(*cdm, IsProvisioned(wvcdm::kSecurityLevelL3, _, _)) EXPECT_CALL(*cdm, IsProvisioned(wvcdm::kSecurityLevelL3, _, _, _))
.Times(kSpoidQuery) .Times(kSpoidQuery)
.WillRepeatedly(testing::Return(true)); .WillRepeatedly(testing::Return(true));
@@ -1835,11 +1835,11 @@ TEST_F(WVDrmPluginTest, ReturnsL3SpoidsWhenL3Unprovisioned) {
EXPECT_CALL(*cdm, QueryOemCryptoSessionId(cdmSessionId, _)) EXPECT_CALL(*cdm, QueryOemCryptoSessionId(cdmSessionId, _))
.WillOnce(Invoke(setSessionIdOnMap<4>)); .WillOnce(Invoke(setSessionIdOnMap<4>));
EXPECT_CALL(*cdm, IsProvisioned(wvcdm::kSecurityLevelL3, _, _)) EXPECT_CALL(*cdm, IsProvisioned(wvcdm::kSecurityLevelL3, _, _, _))
.WillOnce(testing::Return(false)) .WillOnce(testing::Return(false))
.WillOnce(testing::Return(true)); .WillOnce(testing::Return(true));
EXPECT_CALL(*cdm, IsProvisioned(wvcdm::kSecurityLevelL1, _, _)) EXPECT_CALL(*cdm, IsProvisioned(wvcdm::kSecurityLevelL1, _, _, _))
.WillOnce(testing::Return(false)); .WillOnce(testing::Return(false));
EXPECT_CALL(*cdm, CloseSession(_)) EXPECT_CALL(*cdm, CloseSession(_))
@@ -1988,10 +1988,10 @@ TEST_F(WVDrmPluginTest, ReturnsL1SpoidsWhenL3ProvisionedUsingL1Spoid) {
EXPECT_CALL(*cdm2, QueryOemCryptoSessionId(cdmSessionId, _)) EXPECT_CALL(*cdm2, QueryOemCryptoSessionId(cdmSessionId, _))
.WillOnce(Invoke(setSessionIdOnMap<4>)); .WillOnce(Invoke(setSessionIdOnMap<4>));
EXPECT_CALL(*cdm2, IsProvisioned(wvcdm::kSecurityLevelL1, _, _)) EXPECT_CALL(*cdm2, IsProvisioned(wvcdm::kSecurityLevelL1, _, _, _))
.WillOnce(testing::Return(true)); .WillOnce(testing::Return(true));
EXPECT_CALL(*cdm2, IsProvisioned(wvcdm::kSecurityLevelL3, _, _)) EXPECT_CALL(*cdm2, IsProvisioned(wvcdm::kSecurityLevelL3, _, _, _))
.WillOnce(testing::Return(false)); .WillOnce(testing::Return(false));
EXPECT_CALL(*cdm2, CloseSession(_)); EXPECT_CALL(*cdm2, CloseSession(_));