From 02c7062349cecaf7058e35824730622bb29cf91b Mon Sep 17 00:00:00 2001 From: Alex Dale Date: Tue, 21 Jun 2022 15:40:21 -0700 Subject: [PATCH] Fix crypto session metrics test for provision 4.0 [ Merge of http://go/wvgerrit/151311 ] Missing a check for provision 4.0. Note: This CL is merged out of sequence with the CDM repo, resulting in a slightly different CL. [ Conflicting CL http://ag/18244016 ] Test: Native test crypto_session_unittest Bug: 180530495 Bug: 236317198 Change-Id: I79f753ba43098e1a3422c39b9903f57e5df03af2 --- libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp b/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp index a49a39e1..3e67165b 100644 --- a/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp @@ -96,6 +96,9 @@ TEST_F(CryptoSessionMetricsTest, OpenSessionValidMetrics) { } else if (token_type == kClientTokenDrmCert) { // TODO(blueeyes): Add support for getting the system id from a // pre-installed DRM certificate.. + } else if (token_type == kClientTokenBootCertChain) { + EXPECT_EQ(OEMCrypto_BootCertificateChain, + metrics_proto.oemcrypto_provisioning_method().int_value()); } else { FAIL() << "Unexpected token type: " << token_type; } @@ -134,9 +137,9 @@ TEST_F(CryptoSessionMetricsTest, GetProvisioningTokenValidMetrics) { ASSERT_GE(metrics_proto.oemcrypto_get_oem_public_certificate().size(), 1); EXPECT_THAT(metrics_proto.oemcrypto_get_oem_public_certificate(0).count(), AllOf(Ge(1), Le(2))); - - ASSERT_GE(metrics_proto.crypto_session_get_token().size(), 1); - EXPECT_GE(metrics_proto.crypto_session_get_token(0).count(), 1); + } else if (token_type == kClientTokenBootCertChain) { + EXPECT_EQ(OEMCrypto_BootCertificateChain, + metrics_proto.oemcrypto_provisioning_method().int_value()); } else { ASSERT_EQ(0, metrics_proto.crypto_session_get_token().size()); }