OSDN Git Service

Merge "Added VTS tests for requiresSecureDecoderComponent and release API" into oc...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 11 Oct 2017 18:33:25 +0000 (18:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Oct 2017 18:33:25 +0000 (18:33 +0000)
1  2 
cas/1.0/vts/functional/VtsHalCasV1_0TargetTest.cpp

@@@ -593,8 -592,14 +603,14 @@@ TEST_F(MediaCasHidlTest, TestClearKeyEr
      EXPECT_TRUE(returnStatus.isOk());
      EXPECT_EQ(Status::OK, returnStatus);
  
 -    ASSERT_TRUE(descrambleTestInputBuffer(descrambler, &descrambleStatus, &hidlInMemory));
 +    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