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

Clean up duration tests

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/120903

Some comments in the duration tests had stale numbers in them. This
was fixed.

Also, the tests CdmUseCase_LicenseDuration were failing with a v16 CDM
and a v15 OEMCrypto because the exact cutoff time is different in
those two cases. That is exactly why specifying the license duration
is not recommended. The tests have been modified to handle both
acceptable behaviors.

Bug: 182237739
Change-Id: I05765beacfe69d02e7366bb3f651f0d5888ab3e5
This commit is contained in:
Fred Gylys-Colwell
2021-04-09 18:21:22 -07:00
parent 504b05492b
commit e998b08de7
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libwvdrmengine/cdm/core/test/duration_use_case_test.cpp
View File

@@ -468,7 +468,7 @@ class CdmDurationTest : public WvCdmTestBaseWithEngine,
//
// In the document, we use realistic rental times in hours or days. In these
// tests, we will use round numbers so that it is easier to read. For example,
// instead of a seven day rental duration, we will use a 200 rental duration.
// instead of a seven day rental duration, we will use a 100 rental duration.
/*****************************************************************************/
/*****************************************************************************/
@@ -477,8 +477,6 @@ class CdmDurationTest : public WvCdmTestBaseWithEngine,
class CdmUseCase_Streaming : public CdmDurationTest {
public:
CdmUseCase_Streaming() : CdmDurationTest("CDM_Streaming") {
// Rental duration = 3 hours hard. (use 300 for readability)
// Playback duration = 0 (unlimited)
timer_limits_.soft_enforce_rental_duration = false;
timer_limits_.rental_duration_seconds = 40;
timer_limits_.total_playback_duration_seconds = 0;
@@ -1055,11 +1053,11 @@ class RenewalTest : public CdmDurationTest {
void LoadRenewal(uint64_t time_of_load, const RenewalPolicy& renewal_policy) {
ASSERT_NE(renewal_in_flight_, nullptr);
std::string http_response;
// TODO(fredgc): Tune this. Most of the network latency will probably show
// up in the next few commands. I think the tests have enough slop to
// account for reasonable latency with the current value of
// kRoundTripTime. But We'll know I made a mistake if we see errors about
// "Test Clock skew..." in the SleepUntil call below.
// Most of the network latency will probably show up in the next few
// commands. I think the tests have enough slop to account for reasonable
// latency with the current value of kRoundTripTime. But We'll know I made a
// mistake if we see errors about "Test Clock skew..." in the SleepUntil
// call below.
ASSERT_TRUE(renewal_in_flight_->GetResponse(&http_response));
int status_code = renewal_in_flight_->GetStatusCode(http_response);
ASSERT_EQ(kHttpOk, status_code);
@@ -1683,9 +1681,9 @@ INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_UnlimitedStreaming,
class CdmUseCase_LicenseDuration : public CdmDurationTest {
public:
CdmUseCase_LicenseDuration() : CdmDurationTest("CDM_LicenseDuration") {
// Rental duration = 3 hours hard. (use 300 for readability)
// Playback duration = 0 (unlimited)
timer_limits_.soft_enforce_rental_duration = true;
// The policy does not specify a rental duration, but the server adjusts it
// so that it looks like this to a v16 device.
timer_limits_.rental_duration_seconds = 40u;
timer_limits_.soft_enforce_playback_duration = false;
timer_limits_.total_playback_duration_seconds = 40u;
@@ -1695,13 +1693,18 @@ class CdmUseCase_LicenseDuration : public CdmDurationTest {
// Playback within rental duration.
TEST_P(CdmUseCase_LicenseDuration, Case1) {
// Allow playback within the playback window.
LoadAndAllowPlayback(start_of_playback_, EndOfPlaybackWindow());
LoadAndAllowPlayback(start_of_playback_, EndOfRentalWindow());
}
// Playback exceeds rental duration.
TEST_P(CdmUseCase_LicenseDuration, Case2) {
// Allow playback within the playback window, but not beyond.
LoadAndTerminatePlayback(start_of_playback_, EndOfPlaybackWindow());
LoadAndAllowPlayback(start_of_playback_, EndOfRentalWindow());
// Do not allow playback after playback window. For a v16 CDM with a v15
// OEMCrypto, playback is cutoff at the rental window, and for a v16 CDM with
// a v16 OEMCrypto, playback is allowed a little longer. In both cases,
// playback is not allowed after the end of the playback window.
SleepUntil(EndOfPlaybackWindow() + kFudge);
FailDecrypt();
}
// Playback with stops/restarts within rental duration, last one exceeds
@@ -1713,8 +1716,12 @@ TEST_P(CdmUseCase_LicenseDuration, Case3) {
start_of_playback_ + 3 * kPlayDuration);
UnloadLicense();
AllowLenience();
LoadAndTerminatePlayback(start_of_playback_ + 4 * kPlayDuration,
EndOfPlaybackWindow());
LoadAndAllowPlayback(start_of_playback_ + 4 * kPlayDuration,
EndOfRentalWindow());
// As above, do not allow playback after playback window.
AllowLenience();
SleepUntil(EndOfPlaybackWindow() + kFudge);
FailDecrypt();
}
// Playback within rental duration, restart exceeds playback duration.