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

Address failures in Widevine CDM extended duration tests

Browse Source 
[ Merge of http://go/wvgerrit/17250 ]

This appears to be the result of a bad merge.

b/27657766

Change-Id: I890162595623f1c13973cedc17eb611fac7e5535
This commit is contained in:
Rahul Frias
2016-03-24 13:38:00 -07:00
parent 9bf25bc67f
commit e9f15858f0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
View File

@@ -260,6 +260,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
license_type, app_parameters, NULL, EMPTY_ORIGIN, license_type, app_parameters, NULL, EMPTY_ORIGIN,
&key_request)); &key_request));
EXPECT_EQ(kKeyRequestTypeInitial, key_request.type); EXPECT_EQ(kKeyRequestTypeInitial, key_request.type);
key_msg_ = key_request.message;
EXPECT_EQ(0u, key_request.url.size()); EXPECT_EQ(0u, key_request.url.size());
} }
@@ -278,7 +279,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
&key_request)); &key_request));
*server_url = key_request.url; *server_url = key_request.url;
key_msg_ = key_request.message;
EXPECT_EQ(kKeyRequestTypeRenewal, key_request.type); EXPECT_EQ(kKeyRequestTypeRenewal, key_request.type);
// TODO(edwinwong, rfrias): Add tests cases for when license server url // TODO(edwinwong, rfrias): Add tests cases for when license server url
// is empty on renewal. Need appropriate key id at the server. // is empty on renewal. Need appropriate key id at the server.
@@ -296,6 +297,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
kLicenseTypeRelease, app_parameters, NULL, kLicenseTypeRelease, app_parameters, NULL,
EMPTY_ORIGIN, &key_request)); EMPTY_ORIGIN, &key_request));
key_msg_ = key_request.message;
EXPECT_EQ(kKeyRequestTypeRelease, key_request.type); EXPECT_EQ(kKeyRequestTypeRelease, key_request.type);
} }
@@ -533,7 +535,6 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
EXPECT_EQ(license_id_.type(), id.type()); EXPECT_EQ(license_id_.type(), id.type());
EXPECT_EQ(license_id_.version(), id.version()); EXPECT_EQ(license_id_.version(), id.version());
EXPECT_TRUE(!id.provider_session_token().empty()); EXPECT_TRUE(!id.provider_session_token().empty());
EXPECT_NEAR(existing_license.seconds_since_started(), EXPECT_NEAR(existing_license.seconds_since_started(),
expected_seconds_since_first_playback, kClockTolerance); expected_seconds_since_first_playback, kClockTolerance);
EXPECT_NEAR(existing_license.seconds_since_last_played(), EXPECT_NEAR(existing_license.seconds_since_last_played(),