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

Correct OpenSessions_1_1 test failure am: 3df8bc5133 am: 086aa7b283 am: 37606c6956 am: cf8f897be3

Browse Source 
Change-Id: I056d3400ab1050dd215573e52ea98e75b6a542be
This commit is contained in:
Rahul Frias
2020-04-25 00:05:33 +00:00
committed by Automerger Merge Worker
parent bebedce81f cf8f897be3
commit be2e4e280b
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp
View File

@@ -165,6 +165,9 @@ class MockCDM : public WvContentDecryptionModule {
const std::string&,
std::string*));
MOCK_METHOD2(QuerySessionStatus, CdmResponseType(const CdmSessionId&,
CdmQueryMap*));
MOCK_METHOD2(QueryKeyStatus, CdmResponseType(const CdmSessionId&,
CdmQueryMap*));
@@ -384,6 +387,14 @@ TEST_F(WVDrmPluginTest, OpensSessions_1_1) {
.WillOnce(DoAll(SetArgPointee<2>(QUERY_VALUE_SECURITY_LEVEL_L3),
testing::Return(wvcdm::NO_ERROR)));
CdmQueryMap securityLevelQueryMap;
securityLevelQueryMap[wvcdm::QUERY_KEY_SECURITY_LEVEL] =
wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3;
EXPECT_CALL(*cdm, QuerySessionStatus(_, NotNull()))
.WillOnce(DoAll(SetArgPointee<1>(securityLevelQueryMap),
testing::Return(wvcdm::NO_ERROR)));
EXPECT_CALL(*cdm, OpenSession(_, _, _, _, _))
.WillRepeatedly(DoAll(SetArgPointee<4>(cdmSessionId),
SaveArg<1>(&propertySet),
@@ -402,7 +413,7 @@ TEST_F(WVDrmPluginTest, OpensSessions_1_1) {
plugin.openSession_1_1(android::hardware::drm::V1_1::SecurityLevel::SW_SECURE_CRYPTO,
[&](Status status, hidl_vec<uint8_t> hSessionId) {
ASSERT_EQ(Status::ERROR_DRM_INVALID_STATE, status);
ASSERT_EQ(Status::OK, status);
sessionId.clear();
sessionId.assign(hSessionId.data(), hSessionId.data() + hSessionId.size());
});