widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added HDCP V2.3 to known supported values in GTS.

Browse Source 
[ Merge of http://go/wvgerrit/92546 ]

The integration test for L1 and L3 HDCP levels was missing an
acceptable value of QUERY_VALUE_HDCP_V2_3.

Bug: 147396294
Test: Android integration test
Change-Id: I66f7164b7b6a6d63f81fdcfffff0d2d891fd5699
This commit is contained in:
Alex Dale
2020-01-13 11:44:49 -08:00
parent 7e2619e379
commit d5bee31c24
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -4851,20 +4851,20 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatus) {
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus( decryptor_->QueryStatus(
kLevelDefault, wvcdm::QUERY_KEY_CURRENT_HDCP_LEVEL, &value)); kLevelDefault, wvcdm::QUERY_KEY_CURRENT_HDCP_LEVEL, &value));
EXPECT_TRUE(value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 || EXPECT_TRUE(
value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
value == QUERY_VALUE_HDCP_V2_1 || value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_3 ||
value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT); value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus(kLevelDefault, decryptor_->QueryStatus(kLevelDefault,
wvcdm::QUERY_KEY_MAX_HDCP_LEVEL, &value)); wvcdm::QUERY_KEY_MAX_HDCP_LEVEL, &value));
EXPECT_TRUE(value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 || EXPECT_TRUE(
value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
value == QUERY_VALUE_HDCP_V2_1 || value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_3 ||
value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT); value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus(kLevelDefault, decryptor_->QueryStatus(kLevelDefault,
@@ -4989,20 +4989,20 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatusL3) {
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus( decryptor_->QueryStatus(
kLevel3, wvcdm::QUERY_KEY_CURRENT_HDCP_LEVEL, &value)); kLevel3, wvcdm::QUERY_KEY_CURRENT_HDCP_LEVEL, &value));
EXPECT_TRUE(value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 || EXPECT_TRUE(
value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
value == QUERY_VALUE_HDCP_V2_1 || value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_3 ||
value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT); value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus(kLevel3, wvcdm::QUERY_KEY_MAX_HDCP_LEVEL, decryptor_->QueryStatus(kLevel3, wvcdm::QUERY_KEY_MAX_HDCP_LEVEL,
&value)); &value));
EXPECT_TRUE(value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 || EXPECT_TRUE(
value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_NONE || value == QUERY_VALUE_HDCP_V1 ||
value == QUERY_VALUE_HDCP_V2_1 || value == QUERY_VALUE_HDCP_V2_0 || value == QUERY_VALUE_HDCP_V2_1 ||
value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_2 || value == QUERY_VALUE_HDCP_V2_3 ||
value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT); value == QUERY_VALUE_HDCP_NO_DIGITAL_OUTPUT);
EXPECT_EQ( EXPECT_EQ(
wvcdm::NO_ERROR, wvcdm::NO_ERROR,