Merge "Skip entitlement session tests that are only supported on CAS devices" into udc-widevine-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
aac5b59efd
@@ -443,6 +443,9 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
|
|||||||
*/
|
*/
|
||||||
TEST_P(OEMCryptoEntitlementLicenseTest,
|
TEST_P(OEMCryptoEntitlementLicenseTest,
|
||||||
LoadEntitlementKeysOemcryptoSessionAPI17) {
|
LoadEntitlementKeysOemcryptoSessionAPI17) {
|
||||||
|
if (!global_features.supports_cas) {
|
||||||
|
GTEST_SKIP() << "OEMCrypto does not support CAS";
|
||||||
|
}
|
||||||
LoadEntitlementLicense();
|
LoadEntitlementLicense();
|
||||||
uint32_t key_session_id = 0;
|
uint32_t key_session_id = 0;
|
||||||
ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
|
ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
|
||||||
@@ -724,6 +727,9 @@ TEST_P(OEMCryptoLicenseTest, SelectKeyEntitledKeyNotThereAPI17) {
|
|||||||
* id.
|
* id.
|
||||||
*/
|
*/
|
||||||
TEST_P(OEMCryptoLicenseTest, SelectKeyEntitlementKeyAPI17) {
|
TEST_P(OEMCryptoLicenseTest, SelectKeyEntitlementKeyAPI17) {
|
||||||
|
if (!global_features.supports_cas) {
|
||||||
|
GTEST_SKIP() << "OEMCrypto does not support CAS";
|
||||||
|
}
|
||||||
license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
|
license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
|
||||||
ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest());
|
ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest());
|
||||||
ASSERT_NO_FATAL_FAILURE(license_messages_.CreateDefaultResponse());
|
ASSERT_NO_FATAL_FAILURE(license_messages_.CreateDefaultResponse());
|
||||||
@@ -799,6 +805,9 @@ TEST_P(OEMCryptoLicenseTest,
|
|||||||
// This verifies that multiple entitled key sessions can be created. They can
|
// This verifies that multiple entitled key sessions can be created. They can
|
||||||
// load and select keys independently.
|
// load and select keys independently.
|
||||||
TEST_P(OEMCryptoLicenseTest, EntitledKeySessionMultipleKeySessionsAPI17) {
|
TEST_P(OEMCryptoLicenseTest, EntitledKeySessionMultipleKeySessionsAPI17) {
|
||||||
|
if (!global_features.supports_cas) {
|
||||||
|
GTEST_SKIP() << "OEMCrypto does not support CAS";
|
||||||
|
}
|
||||||
license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
|
license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
|
||||||
ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest());
|
ASSERT_NO_FATAL_FAILURE(license_messages_.SignAndVerifyRequest());
|
||||||
ASSERT_NO_FATAL_FAILURE(license_messages_.CreateDefaultResponse());
|
ASSERT_NO_FATAL_FAILURE(license_messages_.CreateDefaultResponse());
|
||||||
|
|||||||
Reference in New Issue
Block a user