From 8230484de255fb8b9b9e64c7fd7caf86c1c6eaa1 Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Mon, 29 Jan 2018 17:48:46 -0800
Subject: [PATCH] Fix some unit tests

Merge from Widevine repo of http://go/wvgerrit/42020

This CL fixes the OEMCrypto unit tests for refresh license.

Test: ran unit tests

bug: 64851667
bug: 72497813
Change-Id: Ice1661fd832793358b725be9016d85465f6b8d14
---
 libwvdrmengine/cdm/core/src/license.cpp                | 3 ---
 libwvdrmengine/cdm/core/src/sublicense_key_session.cpp | 4 ++--
 libwvdrmengine/cdm/test/request_license_test.cpp       | 2 +-
 libwvdrmengine/cdm/test/unit-test.mk                   | 2 --
 libwvdrmengine/oemcrypto/test/oec_session_util.cpp     | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libwvdrmengine/cdm/core/src/license.cpp b/libwvdrmengine/cdm/core/src/license.cpp
index ea8623b4..a9f1fdc1 100644
--- a/libwvdrmengine/cdm/core/src/license.cpp
+++ b/libwvdrmengine/cdm/core/src/license.cpp
@@ -1183,7 +1183,6 @@ CdmResponseType CdmLicense::HandleEntitlementKeyResponse(
     entitled_license.set_license_start_time(license.license_start_time());
     for (size_t i = 0; i < wrapped_keys_.size(); ++i) {
       for (int x = 0; x < entitled_license.key().size(); ++x) {
-        LOGE("Test for %s", wrapped_keys_[i].wrapping_key_id().c_str());
         if (entitled_license.key(x).id() ==
             wrapped_keys_[i].wrapping_key_id()) {
           video_widevine::License::KeyContainer* kc =
@@ -1191,11 +1190,9 @@ CdmResponseType CdmLicense::HandleEntitlementKeyResponse(
           kc->set_type(video_widevine::License::KeyContainer::CONTENT);
           kc->set_key(wrapped_keys_[i].wrapped_key());
           kc->set_id(wrapped_keys_[i].key_id());
-          LOGE("Add %s", wrapped_keys_[i].wrapping_key_id().c_str());
         }
       }
     }
-    LOGE("%d license keys", entitled_license.key_size());
     policy_engine_->SetLicense(entitled_license);
   }
   return resp;
diff --git a/libwvdrmengine/cdm/core/src/sublicense_key_session.cpp b/libwvdrmengine/cdm/core/src/sublicense_key_session.cpp
index f67c6eab..57357d05 100644
--- a/libwvdrmengine/cdm/core/src/sublicense_key_session.cpp
+++ b/libwvdrmengine/cdm/core/src/sublicense_key_session.cpp
@@ -295,7 +295,7 @@ OEMCryptoResult SubLicenseKeySession::DoSubLicenseLoadKeys(
 
   OEMCryptoResult sts;
   const std::string& sub_session_key = keys_[key_index].sub_session_key();
-  LOGE("ssksize = %d", sub_session_key.size());
+  LOGV("ssksize = %d", sub_session_key.size());
 
   M_TIME(
       sts = OEMCrypto_DeriveKeysFromSessionKey(
@@ -348,4 +348,4 @@ OEMCryptoResult SubLicenseKeySession::DoSubLicenseLoadKeys(
   return sts;
 }
 
-}  // namespace wvcdm
\ No newline at end of file
+}  // namespace wvcdm
diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp
index f7b38594..5590a431 100644
--- a/libwvdrmengine/cdm/test/request_license_test.cpp
+++ b/libwvdrmengine/cdm/test/request_license_test.cpp
@@ -1112,7 +1112,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
     if (kHttpOk != http_status_code) {
       LogResponseError(message, http_status_code);
     }
-    EXPECT_EQ(kHttpOk, http_status_code);
+    EXPECT_EQ(kHttpOk, http_status_code) << message;
 
     std::string drm_msg;
     if (kHttpOk == http_status_code) {
diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index 33c6007d..a3330769 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -56,8 +56,6 @@ LOCAL_PROPRIETARY_MODULE := true
 # When built, explicitly put it in the DATA/bin directory.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin
 
-LOCAL_PROPRIETARY_MODULE := true
-
 ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
 LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
diff --git a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp
index 4fdf78b5..bcfa5330 100644
--- a/libwvdrmengine/oemcrypto/test/oec_session_util.cpp
+++ b/libwvdrmengine/oemcrypto/test/oec_session_util.cpp
@@ -566,7 +566,7 @@ void Session::FillRefreshMessage(size_t key_count, uint32_t control_bits,
            encrypted_license().keys[i].key_id_length);
     if (global_features.api_version == 14) {
       // For version 14, we require OEMCrypto to handle kc14 for all licenses.
-      memcpy(license_.keys[i].control.verification, "kc14", 4);
+      memcpy(encrypted_license().keys[i].control.verification, "kc14", 4);
     } else if (global_features.api_version == 13) {
       // For version 13, we require OEMCrypto to handle kc13 for all licenses.
       memcpy(encrypted_license().keys[i].control.verification, "kc13", 4);