Source release 17.1.0

metrics/test/counter_metric_unittest.cpp

@@ -1,19 +1,19 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // Unit tests for CounterMetric
-
 #include "counter_metric.h"
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include "string_conversions.h"
+#include <gtest/gtest.h>
 
-using drm_metrics::TestMetrics;
-using testing::IsNull;
-using testing::NotNull;
+#include "pow2bucket.h"
+#include "string_conversions.h"
+#include "wv_cdm_types.h"
 
 namespace wvcdm {
 namespace metrics {
+using drm_metrics::TestMetrics;
 
 TEST(CounterMetricTest, NoFieldsEmpty) {
   wvcdm::metrics::CounterMetric<> metric;
@@ -38,12 +38,13 @@ TEST(CounterMetricTest, NoFieldsSuccess) {
   EXPECT_EQ(11, metric_proto.test_counters(0).count());
   EXPECT_FALSE(metric_proto.test_counters(0).has_attributes())
       << std::string("Unexpected attributes value.  Serialized metrics: ")
-      << wvcdm::b2a_hex(serialized_metrics);
+      << wvutil::b2a_hex(serialized_metrics);
 }
 
 TEST(CounterMetricTest, OneFieldSuccess) {
   wvcdm::metrics::CounterMetric<drm_metrics::Attributes::kErrorCodeFieldNumber,
-                                int> metric;
+                                int>
+      metric;
   metric.Increment(7);
   metric.Increment(10, 7);
   metric.Increment(13);
@@ -61,7 +62,8 @@ TEST(CounterMetricTest, OneFieldSuccess) {
 
 TEST(CounterMetricTest, TwoFieldsSuccess) {
   CounterMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int,
-                drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket> metric;
+                drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket>
+      metric;
 
   metric.Increment(7, Pow2Bucket(23));  // Increment by one.
   metric.Increment(2, 7, Pow2Bucket(33));
@@ -93,7 +95,7 @@ TEST(CounterMetricTest, ThreeFieldsSuccess) {
   CounterMetric<drm_metrics::Attributes::kErrorCodeFieldNumber, int,
                 drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket,
                 drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool>
-                    metric;
+      metric;
   metric.Increment(7, Pow2Bucket(13), true);
 
   TestMetrics metric_proto;
@@ -110,7 +112,8 @@ TEST(CounterMetricTest, FourFieldsSuccess) {
                 drm_metrics::Attributes::kLengthFieldNumber, Pow2Bucket,
                 drm_metrics::Attributes::kErrorCodeBoolFieldNumber, bool,
                 drm_metrics::Attributes::kSecurityLevelFieldNumber,
-                SecurityLevel> metric;
+                RequestedSecurityLevel>
+      metric;
   metric.Increment(10LL, 7, Pow2Bucket(13), true, kLevel3);
 
   TestMetrics metric_proto;
@@ -123,6 +126,5 @@ TEST(CounterMetricTest, FourFieldsSuccess) {
   EXPECT_EQ(kLevel3,
             metric_proto.test_counters(0).attributes().security_level());
 }
-
 }  // namespace metrics
 }  // namespace wvcdm