Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab4c6f8f authored by Suresh Sivaraman's avatar Suresh Sivaraman Committed by android-build-merger
Browse files

Merge "Added VTS tests for requiresSecureDecoderComponent and release API"... 

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

Change-Id: If5ff8a90992432ee08eb7ed10eb3b2918e86c9dd
parents 1d7374c5 7c932db2

cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp

+16 −0
Original line number Diff line number Diff line
@@ -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