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

am 7db580d6: am dd672f0c: Merge "Use renewal URL in license tests" into klp-dev

Browse Source 
* commit '7db580d6b9a96fff5567a6fc5d5db460872b76c2':
  Use renewal URL in license tests
This commit is contained in:
Jeff Tinker
2013-11-06 09:46:52 -08:00
committed by Android Git Automerger
parent 6308988a4a 7db580d6b9
commit 6b51eee87c
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, 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 // TODO application makes a license request, CDM will renew the license
// when appropriate. // when appropriate.
std::string init_data; std::string init_data;
wvcdm::CdmAppParameterMap app_parameters; wvcdm::CdmAppParameterMap app_parameters;
std::string server_url;
EXPECT_EQ(wvcdm::KEY_MESSAGE, EXPECT_EQ(wvcdm::KEY_MESSAGE,
decryptor_.GenerateKeyRequest(session_id_, key_set_id_, init_data, decryptor_.GenerateKeyRequest(session_id_, key_set_id_, init_data,
license_type, app_parameters, license_type, app_parameters,
&key_msg_, &server_url)); &key_msg_, server_url));
// 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.
EXPECT_NE(0u, server_url.size()); EXPECT_NE(0u, server_url->size());
} }
void GenerateKeyRelease(CdmKeySetId key_set_id) { void GenerateKeyRelease(CdmKeySetId key_set_id) {
@@ -694,8 +694,11 @@ TEST_F(WvCdmRequestLicenseTest, StreamingLicenseRenewal) {
GenerateKeyRequest(g_key_system, g_key_id, kLicenseTypeStreaming); GenerateKeyRequest(g_key_system, g_key_id, kLicenseTypeStreaming);
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, false); VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, false);
GenerateRenewalRequest(g_key_system, kLicenseTypeStreaming); std::string license_server;
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, true); 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_); decryptor_.CloseSession(session_id_);
} }
@@ -704,8 +707,11 @@ TEST_F(WvCdmRequestLicenseTest, OfflineLicenseRenewal) {
GenerateKeyRequest(g_key_system, g_key_id, kLicenseTypeOffline); GenerateKeyRequest(g_key_system, g_key_id, kLicenseTypeOffline);
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, false); VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, false);
GenerateRenewalRequest(g_key_system, kLicenseTypeOffline); std::string license_server;
VerifyKeyRequestResponse(g_license_server, g_client_auth, g_key_id, true); 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_); decryptor_.CloseSession(session_id_);
} }