Merge "Address unit test failures" into sc-dev

libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp

@@ -224,6 +224,8 @@ TEST_F(CdmSessionTest, InitWithBuiltInCertificate) {
   EXPECT_CALL(*license_parser_, Init(false, Eq(kEmptyString),
                                      Eq(crypto_session_), Eq(policy_engine_)))
       .WillOnce(Return(true));
+  EXPECT_CALL(*license_parser_, provider_session_token())
+      .WillRepeatedly(Return("Mock provider session token"));
 
   ASSERT_EQ(NO_ERROR, cdm_session_->Init(nullptr));
 }
@@ -242,6 +244,8 @@ TEST_F(CdmSessionTest, InitWithCertificate) {
   EXPECT_CALL(*license_parser_, Init(false, Eq(kEmptyString),
                                      Eq(crypto_session_), Eq(policy_engine_)))
       .WillOnce(Return(true));
+  EXPECT_CALL(*license_parser_, provider_session_token())
+      .WillRepeatedly(Return("Mock provider session token"));
 
   ASSERT_EQ(NO_ERROR, cdm_session_->Init(nullptr));
 }
@@ -260,6 +264,8 @@ TEST_F(CdmSessionTest, ReInitFail) {
   EXPECT_CALL(*license_parser_, Init(false, Eq(kEmptyString),
                                      Eq(crypto_session_), Eq(policy_engine_)))
       .WillOnce(Return(true));
+  EXPECT_CALL(*license_parser_, provider_session_token())
+      .WillRepeatedly(Return("Mock provider session token"));
 
   ASSERT_EQ(NO_ERROR, cdm_session_->Init(nullptr));
   ASSERT_NE(NO_ERROR, cdm_session_->Init(nullptr));
@@ -268,6 +274,8 @@ TEST_F(CdmSessionTest, ReInitFail) {
 TEST_F(CdmSessionTest, InitFailCryptoError) {
   EXPECT_CALL(*crypto_session_, Open(Eq(kLevelDefault)))
       .WillOnce(Return(UNKNOWN_ERROR));
+  EXPECT_CALL(*license_parser_, provider_session_token())
+      .WillRepeatedly(Return("Mock provider session token"));
 
   ASSERT_EQ(UNKNOWN_ERROR, cdm_session_->Init(nullptr));
 }

libwvdrmengine/cdm/core/test/license_unittest.cpp

@@ -297,6 +297,7 @@ TEST_F(CdmLicenseTest, PrepareKeyRequestValidation) {
   CryptoSession::HdcpCapability current_hdcp_version = HDCP_NO_DIGITAL_OUTPUT;
   CryptoSession::HdcpCapability max_hdcp_version = HDCP_V2_1;
   const uint32_t crypto_session_api_version = 16;
+  const uint32_t resource_rating_tier = RESOURCE_RATING_TIER_LOW;
 
   EXPECT_CALL(*crypto_session_, IsOpen()).WillOnce(Return(true));
   EXPECT_CALL(*crypto_session_, request_id())
@@ -312,6 +313,8 @@ TEST_F(CdmLicenseTest, PrepareKeyRequestValidation) {
   EXPECT_CALL(*crypto_session_, GetApiVersion(NotNull()))
       .WillOnce(
           DoAll(SetArgPointee<0>(crypto_session_api_version), Return(true)));
+  EXPECT_CALL(*crypto_session_, GetResourceRatingTier(NotNull()))
+      .WillOnce(DoAll(SetArgPointee<0>(resource_rating_tier), Return(true)));
   EXPECT_CALL(*clock_, GetCurrentTime()).WillOnce(Return(kLicenseStartTime));
   EXPECT_CALL(*crypto_session_, GenerateNonce(NotNull()))
       .WillOnce(DoAll(SetArgPointee<0>(kNonce), Return(NO_ERROR)));
@@ -386,7 +389,7 @@ TEST_F(CdmLicenseTest, PrepareKeyRequestValidation) {
                                    ClientCapabilities::ECC_SECP256R1,
                                    ClientCapabilities::ECC_SECP384R1,
                                    ClientCapabilities::ECC_SECP521R1));
-  EXPECT_FALSE(client_capabilities.has_resource_rating_tier());
+  EXPECT_TRUE(client_capabilities.has_resource_rating_tier());
 
   // Verify Content Identification
   const LicenseRequest_ContentIdentification& content_id =

libwvdrmengine/cdm/test/wv_cdm_metrics_test.cpp

@@ -120,8 +120,6 @@ TEST_F(WvContentDecryptionModuleMetricsTest, EngineAndSessionMetrics) {
   EXPECT_TRUE(
       metrics.engine_metrics().has_level3_oemcrypto_initialization_error());
   EXPECT_TRUE(metrics.engine_metrics().has_oemcrypto_initialization_mode());
-  EXPECT_TRUE(
-      metrics.engine_metrics().has_previous_oemcrypto_initialization_failure());
   ASSERT_THAT(metrics.engine_metrics().cdm_engine_open_session().size(), Eq(1));
   EXPECT_THAT(metrics.engine_metrics().cdm_engine_open_session(0).count(),
               Eq(1));

libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp

@@ -918,7 +918,7 @@ TEST_F(WVDrmPluginTest, RejectsAtscProvisioningRequests) {
   plugin.getProvisionRequest(
       hidl_string(""), hidl_string(""),
       [&](Status status, hidl_vec<uint8_t> , hidl_string ) {
-    ASSERT_EQ(Status::ERROR_DRM_UNKNOWN, status);
+    ASSERT_EQ(Status::ERROR_DRM_CANNOT_HANDLE, status);
   });
 }
 
@@ -1161,7 +1161,7 @@ TEST_F(WVDrmPluginTest, RejectsAtscUnprovisionDeviceRequests) {
                                            hidl_string("enable"));
 
   status = plugin.unprovisionDevice();
-  ASSERT_EQ(Status::ERROR_DRM_UNKNOWN, status);
+  ASSERT_EQ(Status::ERROR_DRM_CANNOT_HANDLE, status);
 }
 
 TEST_F(WVDrmPluginTest, GetsSecureStops) {