Source release 17.1.2
This commit is contained in:
@@ -5,12 +5,12 @@
|
||||
#include "license_holder.h"
|
||||
|
||||
#include "license_request.h"
|
||||
#include "message_dumper.h"
|
||||
#include "oec_device_features.h"
|
||||
#include "test_base.h"
|
||||
|
||||
namespace wvcdm {
|
||||
namespace {
|
||||
constexpr int kHttpOk = 200;
|
||||
const std::string kCencMimeType = "cenc";
|
||||
} // namespace
|
||||
|
||||
@@ -38,8 +38,14 @@ void LicenseHolder::FetchLicense() {
|
||||
CdmKeyRequest key_request;
|
||||
ASSERT_NO_FATAL_FAILURE(GenerateKeyRequest(init_data, &key_request))
|
||||
<< "Failed for " << content_id();
|
||||
if (config_.dump_golden_data()) {
|
||||
MessageDumper::DumpLicenseRequest(key_request);
|
||||
}
|
||||
ASSERT_NO_FATAL_FAILURE(GetKeyResponse(key_request))
|
||||
<< "Failed for " << content_id();
|
||||
if (config_.dump_golden_data()) {
|
||||
MessageDumper::DumpLicense(key_response_);
|
||||
}
|
||||
}
|
||||
|
||||
void LicenseHolder::LoadLicense() {
|
||||
@@ -69,6 +75,9 @@ void LicenseHolder::GenerateAndPostRenewalRequest(
|
||||
const CdmResponseType result =
|
||||
cdm_engine_->GenerateRenewalRequest(session_id_, &request);
|
||||
ASSERT_EQ(KEY_MESSAGE, result) << "Failed for " << content_id();
|
||||
if (config_.dump_golden_data()) {
|
||||
MessageDumper::DumpRenewalRequest(request);
|
||||
}
|
||||
const std::string url = MakeUrl(config_.renewal_server(), policy_id);
|
||||
renewal_in_flight_.reset(new UrlRequest(url));
|
||||
ASSERT_TRUE(renewal_in_flight_->is_connected())
|
||||
@@ -77,15 +86,17 @@ void LicenseHolder::GenerateAndPostRenewalRequest(
|
||||
}
|
||||
void LicenseHolder::FetchRenewal() {
|
||||
ASSERT_NE(renewal_in_flight_, nullptr) << "Failed for " << content_id();
|
||||
ASSERT_TRUE(renewal_in_flight_->GetResponse(&renewal_response_))
|
||||
<< "Failed for " << content_id();
|
||||
int status_code = renewal_in_flight_->GetStatusCode(renewal_response_);
|
||||
ASSERT_EQ(kHttpOk, status_code) << "Failed for " << content_id();
|
||||
ASSERT_NO_FATAL_FAILURE(
|
||||
renewal_in_flight_->AssertOkResponse(&renewal_response_))
|
||||
<< "Renewal failed for " << content_id();
|
||||
}
|
||||
|
||||
void LicenseHolder::LoadRenewal() {
|
||||
LicenseRequest license_request;
|
||||
license_request.GetDrmMessage(renewal_response_, renewal_message_);
|
||||
if (config_.dump_golden_data()) {
|
||||
MessageDumper::DumpRenewal(renewal_message_);
|
||||
}
|
||||
EXPECT_EQ(KEY_ADDED, cdm_engine_->RenewKey(session_id_, renewal_message_))
|
||||
<< "Failed for " << content_id();
|
||||
}
|
||||
@@ -214,12 +225,8 @@ void LicenseHolder::GetKeyResponse(const CdmKeyRequest& key_request) {
|
||||
|
||||
std::string http_response;
|
||||
url_request.PostRequest(key_request.message);
|
||||
ASSERT_TRUE(url_request.GetResponse(&http_response));
|
||||
int status_code = url_request.GetStatusCode(http_response);
|
||||
ASSERT_EQ(kHttpOk, status_code) << "Error with url = " << url << "\n"
|
||||
<< "content_id = " << content_id() << "\n"
|
||||
<< "response = " << http_response;
|
||||
|
||||
ASSERT_NO_FATAL_FAILURE(url_request.AssertOkResponse(&http_response))
|
||||
<< "Failed for " << content_id();
|
||||
LicenseRequest license_request;
|
||||
license_request.GetDrmMessage(http_response, key_response_);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user