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

Merge "Modify QueryStatusL3 test to allow for L3 devices" into nyc-dev

Browse Source 
am: ecfd61e

* commit 'ecfd61e803f64e42d32eb000daf136e510f18a2e':
  Modify QueryStatusL3 test to allow for L3 devices

Change-Id: I38e8d9dba45baf91a3ce4886308ad9d01a3bd6e8
This commit is contained in:
Rahul Frias
2016-04-15 23:22:19 +00:00
committed by android-build-merger
parent e495647635 ecfd61e803
commit 850cf0e08e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2605,6 +2605,12 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatusL3) {
ASSERT_FALSE(ss.fail());
EXPECT_TRUE(ss.eof());
std::string default_security_level;
EXPECT_EQ(
wvcdm::NO_ERROR,
decryptor_.QueryStatus(kLevelDefault, wvcdm::QUERY_KEY_SECURITY_LEVEL,
&default_security_level));
EXPECT_EQ(wvcdm::NO_ERROR, decryptor_.QueryStatus(
kLevel3, wvcdm::QUERY_KEY_SYSTEM_ID, &value));
ss.clear();
@@ -2613,7 +2619,9 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatusL3) {
ss >> system_id;
ASSERT_FALSE(ss.fail());
EXPECT_TRUE(ss.eof());
EXPECT_NE(default_system_id, system_id);
if (default_security_level != wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3) {
EXPECT_NE(default_system_id, system_id);
}
EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_.QueryStatus(kLevel3, wvcdm::QUERY_KEY_PROVISIONING_ID,