From 6dd2d97452dd1520a619b5bfbbcff23d939e2f2e Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Tue, 24 Mar 2015 11:02:38 -0700 Subject: [PATCH] Fix CDM request license unit test failures Merged from Widevine CDM repo: https://widevine-internal-review.googlesource.com/#/c/13821/ Change-Id: Iad889388c7d38679a0c5cb881a53c94e9d30f4f1 --- .../cdm/test/request_license_test.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp index 494f670d..d7fa3e48 100644 --- a/libwvdrmengine/cdm/test/request_license_test.cpp +++ b/libwvdrmengine/cdm/test/request_license_test.cpp @@ -1379,6 +1379,9 @@ TEST_F(WvCdmRequestLicenseTest, QueryModifiedSessionStatus) { } TEST_F(WvCdmRequestLicenseTest, QueryKeyStatus) { + Unprovision(); + Provision(kLevelDefault); + decryptor_.OpenSession(g_key_system, NULL, NULL, &session_id_); GenerateKeyRequest(g_key_id, kLicenseTypeStreaming); VerifyKeyRequestResponse(g_license_server, g_client_auth, false); @@ -1449,6 +1452,9 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatus) { } TEST_F(WvCdmRequestLicenseTest, QueryKeyControlInfo) { + Unprovision(); + Provision(kLevelDefault); + decryptor_.OpenSession(g_key_system, NULL, NULL, &session_id_); GenerateKeyRequest(g_key_id, kLicenseTypeStreaming); VerifyKeyRequestResponse(g_license_server, g_client_auth, false); @@ -1570,16 +1576,9 @@ TEST_F(WvCdmRequestLicenseTest, SecurityLevelPathBackwardCompatibility) { TestWvCdmClientPropertySet property_set; property_set.set_security_level(QUERY_VALUE_SECURITY_LEVEL_L3); - EXPECT_EQ(NO_ERROR, decryptor_.OpenSession(g_key_system, &property_set, NULL, - &session_id_)); - - wvcdm::CdmAppParameterMap app_parameters; - std::string server_url; - EXPECT_EQ(wvcdm::NEED_PROVISIONING, - decryptor_.GenerateKeyRequest(session_id_, key_set_id, "video/mp4", - key_id, kLicenseTypeStreaming, - app_parameters, NULL, &key_msg_, - &server_url)); + EXPECT_EQ( + wvcdm::NEED_PROVISIONING, + decryptor_.OpenSession(g_key_system, &property_set, NULL, &session_id_)); EXPECT_EQ(NO_ERROR, decryptor_.GetProvisioningRequest( cert_type, cert_authority, &key_msg_, &provisioning_server_url));