Fix offline test failures

GPlay offline tests were failing due to additional query parameters that were
introduced with b12789275. Additional changes caused offline failures,
as the content pointed to by the test vectors was HD only and did not
allow for offline playback.

This addresses the problem by switching request license tests to point to UAT.
UAT is now the default license server destination for request license tests.
Test vectors for GPlay will be added back as a secondary option when they
are available.

b/13909635

Merge of https://widevine-internal-review.googlesource.com/#/c/10261/
from the widevine cdm repo.

Change-Id: I5e5a2b477b6d591747123e8eeb3cd00b7f762090

libwvdrmengine/cdm/core/test/config_test_env.cpp

@@ -3,14 +3,23 @@
 #include "config_test_env.h"
 
 namespace {
+const std::string kWidevineKeySystem = "com.widevine.alpha";
+
 // Youtube Content Protection license server data
 const std::string kYtCpLicenseServer =
     "http://wv-ref-eme-player.appspot.com/proxy";
 const std::string kYtCpClientAuth = "";
 const std::string kYtCpKeyId =
-    "000000347073736800000000"                   // blob size and pssh
-    "EDEF8BA979D64ACEA3C827DCD51D21ED00000014"   // Widevine system id
-    "0801121030313233343536373839616263646566";  // pssh data
+    "000000427073736800000000"                  // blob size and pssh
+    "EDEF8BA979D64ACEA3C827DCD51D21ED00000022"  // Widevine system id
+    "08011a0d7769646576696e655f7465737422"      // pssh data (streaming)
+    "0f73747265616d696e675f636c697031";
+
+const std::string kYtCpOfflineKeyId =
+    "000000407073736800000000"                  // blob size and pssh
+    "EDEF8BA979D64ACEA3C827DCD51D21ED00000020"  // Widevine system id
+    "08011a0d7769646576696e655f7465737422"      //pssh data (offline)
+    "0d6f66666c696e655f636c697031";
 
 // Youtube license server data
 const std::string kYtLicenseServer =
@@ -33,6 +42,13 @@ const std::string kGpLicenseServer =
 const std::string kGpClientAuth =
     "?source=YOUTUBE&video_id=EGHC6OHNbOo&oauth=ya.gtsqawidevine";
 
+const std::string kGpClientOfflineQueryParameters =
+    "&offline=true";
+const std::string kGpClientOfflineRenewalQueryParameters =
+    "&offline=true&renewal=true";
+const std::string kGpClientOfflineReleaseQueryParameters =
+    "&offline=true&release=true";
+
 const std::string kGpKeyId =
     "000000347073736800000000"                   // blob size and pssh
     "edef8ba979d64acea3c827dcd51d21ed00000014"   // Widevine system id
@@ -55,24 +71,54 @@ const std::string kServerSdkLicenseServer =
 
 const wvcdm::ConfigTestEnv::LicenseServerConfiguration license_servers[] = {
   { wvcdm::kGooglePlayServer, kGpLicenseServer, kGpClientAuth, kGpKeyId,
-    kDefaultHttpsPort, true, true },
+    kGpKeyId, kDefaultHttpsPort, true, true },
   { wvcdm::kYouTubeContentProtectionServer, kYtCpLicenseServer,
-    kYtCpClientAuth, kYtCpKeyId, kDefaultHttpPort, false, false }
+    kYtCpClientAuth, kYtCpKeyId, kYtCpOfflineKeyId, kDefaultHttpPort,
+    false, false }
 };
 }  // namespace
 
 namespace wvcdm {
 
-ConfigTestEnv::ConfigTestEnv(LicenseServerId server_id)
-    : client_auth_(license_servers[server_id].client_tag),
-      key_id_(license_servers[server_id].key_id),
-      key_system_("com.widevine.alpha"),
-      license_server_(license_servers[server_id].url),
-      port_(license_servers[server_id].port),
-      provisioning_server_url_(kProductionProvisioningServerUrl),
-      server_sdk_license_server_(kServerSdkLicenseServer),
-      use_chunked_transfer_(license_servers[server_id].use_chunked_transfer),
-      use_secure_transfer_(license_servers[server_id].use_secure_transfer),
-      wrong_key_id_(kWrongKeyId) {}
+ConfigTestEnv::ConfigTestEnv(LicenseServerId server_id) {
+  Init(server_id);
+}
+
+ConfigTestEnv::ConfigTestEnv(LicenseServerId server_id, bool streaming) {
+  Init(server_id);
+  if (!streaming)
+    key_id_ = license_servers[server_id].offline_key_id;
+}
+
+ConfigTestEnv::ConfigTestEnv(LicenseServerId server_id, bool streaming,
+                             bool renew, bool release) {
+  Init(server_id);
+  if (!streaming) {
+    key_id_ = license_servers[server_id].offline_key_id;
+
+    if (wvcdm::kGooglePlayServer == server_id) {
+      if (renew) {
+        client_auth_.append(kGpClientOfflineRenewalQueryParameters);
+      } else if (release) {
+        client_auth_.append(kGpClientOfflineReleaseQueryParameters);
+      } else {
+        client_auth_.append(kGpClientOfflineQueryParameters);
+      }
+    }
+  }
+}
+
+void ConfigTestEnv::Init(LicenseServerId server_id) {
+  client_auth_ = license_servers[server_id].client_tag;
+  key_id_ = license_servers[server_id].key_id;
+  key_system_ = kWidevineKeySystem;
+  license_server_ = license_servers[server_id].url;
+  port_ = license_servers[server_id].port;
+  provisioning_server_url_ = kProductionProvisioningServerUrl;
+  server_sdk_license_server_ = kServerSdkLicenseServer;
+  use_chunked_transfer_ = license_servers[server_id].use_chunked_transfer;
+  use_secure_transfer_ = license_servers[server_id].use_secure_transfer;
+  wrong_key_id_= kWrongKeyId;
+}
 
 }  // namespace wvcdm

libwvdrmengine/cdm/core/test/config_test_env.h

@@ -25,12 +25,16 @@ class ConfigTestEnv {
     std::string url;
     std::string client_tag;
     std::string key_id;
+    std::string offline_key_id;
     std::string port;
     bool use_chunked_transfer;
     bool use_secure_transfer;
   } LicenseServerConfiguration;
 
   explicit ConfigTestEnv(LicenseServerId server_id);
+  ConfigTestEnv(LicenseServerId server_id, bool streaming);
+  ConfigTestEnv(LicenseServerId server_id, bool streaming, bool renew,
+                bool release);
   ~ConfigTestEnv() {};
 
   const std::string& client_auth() const { return client_auth_; }
@@ -58,6 +62,8 @@ class ConfigTestEnv {
   void set_port(std::string& port) { port_.assign(port); }
 
  private:
+  void Init(LicenseServerId server_id);
+
   std::string client_auth_;
   KeyId key_id_;
   CdmKeySystem key_system_;

libwvdrmengine/run_all_unit_tests.sh

@@ -10,9 +10,6 @@ adb root && adb wait-for-device remount
 
 adb shell /system/bin/oemcrypto_test
 adb shell /system/bin/request_license_test
-adb shell /system/bin/request_license_test -icp --gtest_filter=WvCdmRequestLicenseTest.DISABLED_PrivacyModeTest --gtest_also_run_disabled_tests
-adb shell /system/bin/request_license_test -icp --gtest_filter=WvCdmRequestLicenseTest.DISABLED_PrivacyModeWithServiceCertificateTest --gtest_also_run_disabled_tests
-adb shell /system/bin/request_license_test -icp --gtest_filter=WvCdmRequestLicenseTest.DISABLED_DecryptionKeyExpiredTest --gtest_also_run_disabled_tests
 adb shell /system/bin/policy_engine_unittest
 adb shell /system/bin/libwvdrmmediacrypto_test
 adb shell /system/bin/libwvdrmdrmplugin_test