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

Fix policy engine unittest issues from clang-tidy

Browse Source 
Merged from https://widevine-internal-review.googlesource.com/177661

Bug: 290112507
Change-Id: Iddf6889640a335d2f6bb7af78790f4a36baaab03
This commit is contained in:
Ian Benz
2023-06-26 11:41:09 +00:00
committed by Robert Shih
parent e9b0196a23
commit 85357db81b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
View File

@@ -131,7 +131,6 @@ using video_widevine::STREAMING;
// gmock methods // gmock methods
using ::testing::_; using ::testing::_;
using ::testing::InSequence; using ::testing::InSequence;
using ::testing::Invoke;
using ::testing::MockFunction; using ::testing::MockFunction;
using ::testing::Pair; using ::testing::Pair;
using ::testing::Return; using ::testing::Return;
@@ -250,7 +249,7 @@ class PolicyEngineTestV16 : public PolicyEngineTest {
protected: protected:
void SetUp() override { void SetUp() override {
EXPECT_CALL(*crypto_session_, GetApiVersion(_)) EXPECT_CALL(*crypto_session_, GetApiVersion(_))
.WillOnce(DoAll(SetArgPointee<0>(kOemCryptoV16), Return(true))); .WillRepeatedly(DoAll(SetArgPointee<0>(kOemCryptoV16), Return(true)));
PolicyEngineTest::SetUp(); PolicyEngineTest::SetUp();
} }
}; };
@@ -1045,7 +1044,7 @@ TEST_F(PolicyEngineKeyAllowedUsageTest, AllowedUsageGeneric) {
class PolicyEngineQueryTest : public PolicyEngineTestV16 { class PolicyEngineQueryTest : public PolicyEngineTestV16 {
protected: protected:
void SetUp() override { void SetUp() override {
PolicyEngineTest::SetUp(); PolicyEngineTestV16::SetUp();
policy_engine_.reset( policy_engine_.reset(
new PolicyEngine(kSessionId, nullptr, crypto_session_.get())); new PolicyEngine(kSessionId, nullptr, crypto_session_.get()));
InjectMockClock(); InjectMockClock();