Merge "Added VTS tests for requiresSecureDecoderComponent and release API" into oc-mr1-dev am: 2528c405f3

am: 7c932db240

Change-Id: If5ff8a90992432ee08eb7ed10eb3b2918e86c9dd
This commit is contained in:
Suresh Sivaraman
2017-10-11 18:42:14 +00:00
committed by android-build-merger

View File

@@ -468,6 +468,8 @@ TEST_F(MediaCasHidlTest, TestClearKeyApis) {
EXPECT_TRUE(returnStatus.isOk());
EXPECT_EQ(Status::OK, returnStatus);
EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent("video/avc"));
sp<IDescrambler> descrambler;
descrambler = IDescrambler::castFrom(mDescramblerBase);
ASSERT_NE(descrambler, nullptr);
@@ -485,6 +487,14 @@ TEST_F(MediaCasHidlTest, TestClearKeyApis) {
memcmp(static_cast<const void*>(opBuffer), static_cast<const void*>(kOutRefBinaryBuffer),
sizeof(kOutRefBinaryBuffer));
EXPECT_EQ(0, compareResult);
returnStatus = mDescramblerBase->release();
EXPECT_TRUE(returnStatus.isOk());
EXPECT_EQ(Status::OK, returnStatus);
returnStatus = mMediaCas->release();
EXPECT_TRUE(returnStatus.isOk());
EXPECT_EQ(Status::OK, returnStatus);
}
TEST_F(MediaCasHidlTest, TestClearKeySessionClosedAfterRelease) {
@@ -595,6 +605,12 @@ TEST_F(MediaCasHidlTest, TestClearKeyErrors) {
ASSERT_TRUE(descrambleTestInputBuffer(descrambler, &descrambleStatus, &dataMemory));
EXPECT_EQ(Status::ERROR_CAS_DECRYPT, descrambleStatus);
// Verify that requiresSecureDecoderComponent handles empty mime
EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent(""));
// Verify that requiresSecureDecoderComponent handles invalid mime
EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent("bad"));
}
} // anonymous namespace