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

Use staging provisioning server

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

The android tests should use the staging provisioning server until
production is able to support core messages.

Test: ran WvCdmRequestLicenseTest.ProvisioningTest with v16 mod mock
Bug: 149622735
Change-Id: I4ec0cc8e8474dc4250e092473fef90d7358260de
This commit is contained in:
Fred Gylys-Colwell
2020-02-16 10:33:24 -08:00
parent ea2e110213
commit 3012ff29bd
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2035,7 +2035,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
&key_msg_, &provisioning_server);
EXPECT_EQ(wvcdm::NO_ERROR, status);
if (NO_ERROR != status) return;
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
CdmProvisioningResponse response =
GetCertRequestResponse(config_.provisioning_server());
@@ -2151,7 +2151,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningTest) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
std::string response = GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size()));
@@ -2178,7 +2178,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningTestWithServiceCertificate) {
cert_type, cert_authority, kDefaultCdmIdentifier,
config_.provisioning_service_certificate(), &key_msg_,
&provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
std::string response = GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size()));
@@ -2206,7 +2206,7 @@ TEST_F(WvCdmRequestLicenseTest, L3ProvisioningTest) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
std::string response = GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size()));
@@ -2295,13 +2295,13 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningInterposedRetryTest) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg1, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg2, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
key_msg_ = key_msg2;
std::string response = GetCertRequestResponse(config_.provisioning_server());
@@ -2368,7 +2368,7 @@ TEST_F(WvCdmRequestLicenseTest, ProvisioningInterspersedRetryTest) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msgs[i], &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
}
// First request that we expect to fail.
@@ -2409,7 +2409,7 @@ TEST_F(WvCdmRequestLicenseTest, DISABLED_X509ProvisioningTest) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
std::string response = GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size()));
@@ -2502,7 +2502,7 @@ TEST_F(WvCdmRequestLicenseTest, PropertySetTest) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
std::string response =
GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size()));
@@ -2579,7 +2579,7 @@ TEST_F(WvCdmRequestLicenseTest, ForceL3Test) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
std::string response = GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size()));
EXPECT_EQ(NO_ERROR,
@@ -2842,7 +2842,7 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseRetryL3OfflineKeyTest) {
decryptor_->GetProvisioningRequest(
cert_type, cert_authority, kDefaultCdmIdentifier,
kEmptyServiceCertificate, &key_msg_, &provisioning_server));
EXPECT_EQ(provisioning_server, config_.provisioning_server());
EXPECT_EQ(provisioning_server, kDefaultProvisioningServerUrl);
std::string response =
GetCertRequestResponse(config_.provisioning_server());
EXPECT_NE(0, static_cast<int>(response.size()));