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

Use renewal URL in license tests

Browse Source 
After a change to the GPlay license server, it no longer accepts heartbeats
at the license server URL ( https://jmt17.google.com/video-dev/license/ ).
The CDM correctly reports https://jmt17.google.com/video-dev/heartbeat/
as the renewal URL but the current test code ignores the reported URL.
The license server then rejects the request and send back an empty
license response.

This causes WvCdmRequestLicenseTest.StreamingLicenseRenewal
and WvCdmRequestLicenseTest.StreamingLicenseRenewal to fail. Request
license tests have been modified to respect the renewal URL.

Merge of https://widevine-internal-review.googlesource.com/#/c/8188
from the widevine cdm repo

b/11290339

Change-Id: I1dcf8277edce99633086fb3db8ffeb7a32a5500d
This commit is contained in:
Rahul Frias
2013-10-25 13:15:56 -07:00
parent e385ff3a7f
commit 64c3cb986a
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -282,19 +282,19 @@ class WvCdmRequestLicenseTest : public testing::Test {
}
void GenerateRenewalRequest(const std::string& key_system,
CdmLicenseType license_type) {
CdmLicenseType license_type,
std::string* server_url) {
// TODO application makes a license request, CDM will renew the license
// when appropriate.
std::string init_data;
wvcdm::CdmAppParameterMap app_parameters;
std::string server_url;
EXPECT_EQ(wvcdm::KEY_MESSAGE,
decryptor_.GenerateKeyRequest(session_id_, key_set_id_, init_data,
license_type, app_parameters,
&key_msg_, &server_url));
&key_msg_, server_url));
// TODO(edwinwong, rfrias): Add tests cases for when license server url
// is empty on renewal. Need appropriate key id at the server.
EXPECT_NE(0u, server_url.size());
EXPECT_NE(0u, server_url->size());
}
void GenerateKeyRelease(CdmKeySetId key_set_id) {
@@ -690,8 +690,11 @@ TEST_F(WvCdmRequestLicenseTest, StreamingLicenseRenewal) {
GenerateKeyRequest(g_key_system, g_key_id, kLicenseTypeStreaming);
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, false);
GenerateRenewalRequest(g_key_system, kLicenseTypeStreaming);
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, true);
std::string license_server;
GenerateRenewalRequest(g_key_system, kLicenseTypeStreaming, &license_server);
if (license_server.empty())
license_server = g_license_server;
VerifyKeyRequestResponse(license_server, g_client_auth, g_key_id, true);
decryptor_.CloseSession(session_id_);
}
@@ -700,8 +703,11 @@ TEST_F(WvCdmRequestLicenseTest, OfflineLicenseRenewal) {
GenerateKeyRequest(g_key_system, g_key_id, kLicenseTypeOffline);
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, false);
GenerateRenewalRequest(g_key_system, kLicenseTypeOffline);
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, true);
std::string license_server;
GenerateRenewalRequest(g_key_system, kLicenseTypeOffline, &license_server);
if (license_server.empty())
license_server = g_license_server;
VerifyKeyRequestResponse(license_server, g_client_auth, g_key_id, true);
decryptor_.CloseSession(session_id_);
}