From 80b8e29c3ff3334bafa22eed294665bc01ea84cb Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Wed, 22 May 2019 18:12:06 -0700
Subject: [PATCH] WvCdmExtendedDurationTest#VerifyLicenseRequestTest fixes

[ Merge of http://go/wvgerrit/79724 ]

Bug: 122982573
Test: WV unit/integration tests
Change-Id: Icb7b192311dc6bbe630d96f993ccca774160774b
---
 .../cdm/test/cdm_extended_duration_test.cpp       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
index 563cbf37..336290c3 100644
--- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
+++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
@@ -255,10 +255,10 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
  protected:
   void GetOfflineConfiguration(std::string* key_id, std::string* client_auth) {
     ConfigTestEnv config(config_.server_id(), false);
-    if (config_.key_id().compare(a2bs_hex(config_.key_id())) == 0)
+    if (binary_key_id().compare(a2bs_hex(config_.key_id())) == 0)
       key_id->assign(a2bs_hex(config.key_id()));
     else
-      key_id->assign(config_.key_id());
+      key_id->assign(binary_key_id());
 
     client_auth->assign(config.client_auth());
   }
@@ -754,7 +754,7 @@ TEST_F(WvCdmExtendedDurationTest, VerifyLicenseRequestTest) {
   Provision();
   decryptor_.OpenSession(config_.key_system(), NULL, kDefaultCdmIdentifier,
                          NULL, &session_id_);
-  GenerateKeyRequest(config_.key_id(), kLicenseTypeStreaming);
+  GenerateKeyRequest(binary_key_id(), kLicenseTypeStreaming);
 
   EXPECT_TRUE(!key_msg_.empty());
 
@@ -788,7 +788,8 @@ TEST_F(WvCdmExtendedDurationTest, VerifyLicenseRequestTest) {
 
   const ClientIdentification::ClientCapabilities& client_capabilities =
       client_id.client_capabilities();
-  EXPECT_FALSE(client_capabilities.has_client_token());
+  EXPECT_TRUE(client_capabilities.has_client_token());
+  EXPECT_TRUE(client_capabilities.client_token());
   EXPECT_TRUE(client_capabilities.has_session_token());
   EXPECT_FALSE(client_capabilities.video_resolution_constraints());
   EXPECT_TRUE(client_capabilities.has_max_hdcp_version());
@@ -804,7 +805,7 @@ TEST_F(WvCdmExtendedDurationTest, VerifyLicenseRequestTest) {
   const LicenseRequest_ContentIdentification_CencDeprecated& cenc_id =
       content_id.cenc_id_deprecated();
   EXPECT_TRUE(std::equal(cenc_id.pssh(0).begin(), cenc_id.pssh(0).end(),
-                         config_.key_id().begin() + 32));
+                         binary_key_id().begin() + 32));
   EXPECT_EQ(video_widevine::STREAMING, cenc_id.license_type());
   EXPECT_TRUE(cenc_id.has_request_id());
 
@@ -822,7 +823,7 @@ TEST_F(WvCdmExtendedDurationTest, VerifyLicenseRenewalTest) {
   Provision();
   decryptor_.OpenSession(config_.key_system(), NULL, kDefaultCdmIdentifier,
                          NULL, &session_id_);
-  GenerateKeyRequest(config_.key_id(), kLicenseTypeStreaming);
+  GenerateKeyRequest(binary_key_id(), kLicenseTypeStreaming);
   VerifyKeyRequestResponse(config_.license_server(), config_.client_auth(),
                            false);
 
@@ -1242,7 +1243,7 @@ TEST_P(WvCdmStreamingNoPstTest, UsageTest) {
 
   decryptor_.OpenSession(config_.key_system(), NULL, kDefaultCdmIdentifier,
                          NULL, &session_id_);
-  GenerateKeyRequest(config_.key_id(), kLicenseTypeStreaming);
+  GenerateKeyRequest(binary_key_id(), kLicenseTypeStreaming);
   VerifyKeyRequestResponse(config_.license_server(), config_.client_auth(),
                            false);