summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuresh Sivaraman2017-10-04 04:07:36 -0500
committerChong Zhang2017-10-09 14:38:13 -0500
commit6d176aa77d6ad36174de843f9de4e979807566ce (patch)
treee83cb26c16df15bfa73c964f93b420a96c66e8b7
parent3021f1fafbfb1a4b464effa543aee381f42d8080 (diff)
downloadplatform-hardware-interfaces-6d176aa77d6ad36174de843f9de4e979807566ce.tar.gz
platform-hardware-interfaces-6d176aa77d6ad36174de843f9de4e979807566ce.tar.xz
platform-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.cpp16
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 062ee203..8a19e2c0 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) {
456 EXPECT_TRUE(returnStatus.isOk()); 456 EXPECT_TRUE(returnStatus.isOk());
457 EXPECT_EQ(Status::OK, returnStatus); 457 EXPECT_EQ(Status::OK, returnStatus);
458 458
459 EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent("video/avc"));
460
459 sp<IDescrambler> descrambler; 461 sp<IDescrambler> descrambler;
460 descrambler = IDescrambler::castFrom(mDescramblerBase); 462 descrambler = IDescrambler::castFrom(mDescramblerBase);
461 ASSERT_NE(descrambler, nullptr); 463 ASSERT_NE(descrambler, nullptr);
@@ -474,6 +476,14 @@ TEST_F(MediaCasHidlTest, TestClearKeyApis) {
474 memcmp(static_cast<const void*>(opBuffer), static_cast<const void*>(kOutRefBinaryBuffer), 476 memcmp(static_cast<const void*>(opBuffer), static_cast<const void*>(kOutRefBinaryBuffer),
475 sizeof(kOutRefBinaryBuffer)); 477 sizeof(kOutRefBinaryBuffer));
476 EXPECT_EQ(0, compareResult); 478 EXPECT_EQ(0, compareResult);
479
480 returnStatus = mDescramblerBase->release();
481 EXPECT_TRUE(returnStatus.isOk());
482 EXPECT_EQ(Status::OK, returnStatus);
483
484 returnStatus = mMediaCas->release();
485 EXPECT_TRUE(returnStatus.isOk());
486 EXPECT_EQ(Status::OK, returnStatus);
477} 487}
478 488
479TEST_F(MediaCasHidlTest, TestClearKeySessionClosedAfterRelease) { 489TEST_F(MediaCasHidlTest, TestClearKeySessionClosedAfterRelease) {
@@ -584,6 +594,12 @@ TEST_F(MediaCasHidlTest, TestClearKeyErrors) {
584 594
585 ASSERT_TRUE(descrambleTestInputBuffer(descrambler, &descrambleStatus, &hidlInMemory)); 595 ASSERT_TRUE(descrambleTestInputBuffer(descrambler, &descrambleStatus, &hidlInMemory));
586 EXPECT_EQ(Status::ERROR_CAS_DECRYPT, descrambleStatus); 596 EXPECT_EQ(Status::ERROR_CAS_DECRYPT, descrambleStatus);
597
598 // Verify that requiresSecureDecoderComponent handles empty mime
599 EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent(""));
600
601 // Verify that requiresSecureDecoderComponent handles invalid mime
602 EXPECT_FALSE(mDescramblerBase->requiresSecureDecoderComponent("bad"));
587} 603}
588 604
589} // anonymous namespace 605} // anonymous namespace