Merge "Expect failure on license load for expired LDL license" into udc-dev am: 6511d44f3c

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/23049483

Change-Id: I1a0993023df32a4976f8472b3f3d7688cf4b3a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libwvdrmengine/cdm/core/test/duration_use_case_test.cpp

@@ -1557,6 +1557,7 @@ TEST_P(CdmUseCase_RenewOnLicenseLoad, Case1S) {
   SleepUntil(start_of_playback_);
   LoadLicense();
   SleepUntilRenewalNeeded();
+  RequestRenewal(kRenewOnLicenseLoad);
   const uint64_t start = 15;  // time of first decrypt
   const uint64_t load_renewal = 20;
   const uint64_t stop = 45;
@@ -1569,6 +1570,7 @@ TEST_P(CdmUseCase_RenewOnLicenseLoad, Case1M) {
   SleepUntil(start_of_playback_);
   LoadLicense();
   SleepUntilRenewalNeeded();
+  RequestRenewal(kRenewOnLicenseLoad);
   const uint64_t start = 20;  // time of first decrypt
   const uint64_t load_renewal = 20;
   const uint64_t stop = 45;  // end of decrypt
@@ -1591,8 +1593,9 @@ TEST_P(CdmUseCase_RenewOnLicenseLoad, Case1L) {
 
 // License loaded after rental duration window and playback should fail.
 TEST_P(CdmUseCase_RenewOnLicenseLoad, Case2) {
-  start_of_playback_ = EndOfRentalWindow() + 1;
-  ForbidPlayback(start_of_playback_);
+  start_of_playback_ = EndOfRentalWindow() + kFudge;
+  SleepUntil(start_of_playback_);
+  license_holder_.FailLoadLicense();
 }
 
 // License loaded within rental duration window but renewal not received.
@@ -1637,6 +1640,7 @@ TEST_P(CdmUseCase_RenewOnLicenseLoad, Case4) {
   SleepUntil(start_of_playback_);
   LoadLicense();
   SleepUntilRenewalNeeded();
+  RequestRenewal(kRenewOnLicenseLoad);
   const uint64_t start = 20;  // time of first decrypt
   const uint64_t load_renewal = 20;
   const uint64_t stop = 45;  // end of decrypt

libwvdrmengine/cdm/core/test/license_holder.cpp

@@ -55,6 +55,13 @@ void LicenseHolder::LoadLicense() {
   }
 }
 
+void LicenseHolder::FailLoadLicense() {
+  CdmLicenseType license_type;
+  ASSERT_NE(KEY_ADDED, cdm_engine_->AddKey(session_id_, key_response_,
+                                           &license_type, &key_set_id_))
+      << "Unexpected success loading license for " << content_id();
+}
+
 void LicenseHolder::ReloadLicense() {
   CdmResponseType status = cdm_engine_->RestoreKey(session_id_, key_set_id_);
   ASSERT_EQ(KEY_ADDED, status)

libwvdrmengine/cdm/core/test/license_holder.h

@@ -59,6 +59,9 @@ class LicenseHolder {
   // Load the license response into the CDM engine. A call to FetchLicense()
   // must be made first.
   void LoadLicense();
+  // Attempt to load the license response into the CDM engine, but expect a
+  // failure.
+  void FailLoadLicense();
   // Reload the license. Call OpenSession() before calling
   // ReloadLicense(). Also, the key_set_id must have been set previously. The
   // key_set_id is set by calling LoadLicense(), or by calling set_key_set_id().