diff options
author | Suresh Sivaraman <suresh.sivaraman@ittiam.com> | 2017-10-04 14:37:36 +0530 |
---|---|---|
committer | Chong Zhang <chz@google.com> | 2017-10-09 12:38:13 -0700 |
commit | 6d176aa77d6ad36174de843f9de4e979807566ce (patch) | |
tree | e83cb26c16df15bfa73c964f93b420a96c66e8b7 | |
parent | 3021f1fafbfb1a4b464effa543aee381f42d8080 (diff) | |
download | android_hardware_interfaces-6d176aa77d6ad36174de843f9de4e979807566ce.tar.gz android_hardware_interfaces-6d176aa77d6ad36174de843f9de4e979807566ce.tar.bz2 android_hardware_interfaces-6d176aa77d6ad36174de843f9de4e979807566ce.zip |
Added VTS tests for requiresSecureDecoderComponent and release API
Bug: 63914034
Bug: 65593293
Test:
Build & test vts:
> make vts -j64
> vts-tradefed run vts -m VtsHalCasV1_0Target
Change-Id: I465735768239f2d53427a18e5ad1fa0069f6e35c
-rw-r--r-- | cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp b/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp index 062ee2038..8a19e2c08 100644 --- a/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp +++ b/cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp @@ -456,6 +456,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); @@ -474,6 +476,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) { @@ -584,6 +594,12 @@ TEST_F(MediaCasHidlTest, TestClearKeyErrors) { ASSERT_TRUE(descrambleTestInputBuffer(descrambler, &descrambleStatus, &hidlInMemory)); 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 |