Source release 16.4.0
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "crypto_session.h"
|
||||
@@ -12,12 +13,16 @@
|
||||
#include "key_session.h"
|
||||
#include "license_protocol.pb.h"
|
||||
#include "log.h"
|
||||
#include "metrics.pb.h"
|
||||
#include "metrics_collections.h"
|
||||
#include "platform.h"
|
||||
#include "test_base.h"
|
||||
#include "test_printers.h"
|
||||
#include "wv_cdm_types.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
using ::testing::AllOf;
|
||||
using ::testing::Ge;
|
||||
using ::testing::Le;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -296,7 +301,7 @@ TEST_F(CryptoSessionMetricsTest, OpenSessionValidMetrics) {
|
||||
// lite, convert these tests to use Message-based convenience functions.
|
||||
|
||||
// Validate common metrics regardless of provisioning type.
|
||||
EXPECT_EQ(1, metrics_proto.oemcrypto_initialize_time_us().size());
|
||||
ASSERT_EQ(1, metrics_proto.oemcrypto_initialize_time_us().size());
|
||||
EXPECT_TRUE(metrics_proto.oemcrypto_initialize_time_us(0)
|
||||
.attributes()
|
||||
.has_oem_crypto_result());
|
||||
@@ -327,7 +332,8 @@ TEST_F(CryptoSessionMetricsTest, OpenSessionValidMetrics) {
|
||||
EXPECT_EQ(OEMCrypto_OEMCertificate,
|
||||
metrics_proto.oemcrypto_provisioning_method().int_value());
|
||||
ASSERT_EQ(1, metrics_proto.oemcrypto_get_oem_public_certificate().size());
|
||||
EXPECT_EQ(1, metrics_proto.oemcrypto_get_oem_public_certificate(0).count());
|
||||
EXPECT_THAT(metrics_proto.oemcrypto_get_oem_public_certificate(0).count(),
|
||||
AllOf(Ge(1), Le(2)));
|
||||
} else if (token_type == kClientTokenDrmCert) {
|
||||
// TODO(blueeyes): Add support for getting the system id from a
|
||||
// pre-installed DRM certificate..
|
||||
@@ -373,8 +379,9 @@ TEST_F(CryptoSessionMetricsTest, GetProvisioningTokenValidMetrics) {
|
||||
|
||||
EXPECT_EQ(OEMCrypto_OEMCertificate,
|
||||
metrics_proto.oemcrypto_provisioning_method().int_value());
|
||||
EXPECT_EQ(1, metrics_proto.oemcrypto_get_oem_public_certificate().size());
|
||||
EXPECT_EQ(1, metrics_proto.oemcrypto_get_oem_public_certificate(0).count());
|
||||
ASSERT_EQ(1, metrics_proto.oemcrypto_get_oem_public_certificate().size());
|
||||
EXPECT_THAT(metrics_proto.oemcrypto_get_oem_public_certificate(0).count(),
|
||||
AllOf(Ge(1), Le(2)));
|
||||
|
||||
ASSERT_EQ(1, metrics_proto.crypto_session_get_token().size());
|
||||
EXPECT_EQ(1, metrics_proto.crypto_session_get_token(0).count());
|
||||
|
||||
Reference in New Issue
Block a user