RTCStatsCollectorTest: ExpectReportContainsCertificateInfo /w EXPECT_EQ

webrtc/api/rtcstatscollector_unittest.cc

Index: webrtc/api/rtcstatscollector_unittest.cc
diff --git a/webrtc/api/rtcstatscollector_unittest.cc b/webrtc/api/rtcstatscollector_unittest.cc
index 4be7491724010ec0ae85d396f57698f2fed42039..8b1cd8f96aa50ddeba8b3fcee73537127722ebe0 100644
--- a/webrtc/api/rtcstatscollector_unittest.cc
+++ b/webrtc/api/rtcstatscollector_unittest.cc
@@ -518,27 +518,6 @@ class RTCStatsCollectorTest : public testing::Test {
     return candidate_stats;
   }
 
-  void ExpectReportContainsCertificateInfo(
-      const rtc::scoped_refptr<const RTCStatsReport>& report,
-      const CertificateInfo& cert_info) {
-    for (size_t i = 0; i < cert_info.fingerprints.size(); ++i) {
-      const RTCStats* stats = report->Get(
-          "RTCCertificate_" + cert_info.fingerprints[i]);
-      ASSERT_TRUE(stats);
-      const RTCCertificateStats& cert_stats =
-          stats->cast_to<const RTCCertificateStats>();
-      EXPECT_EQ(*cert_stats.fingerprint, cert_info.fingerprints[i]);
-      EXPECT_EQ(*cert_stats.fingerprint_algorithm, "sha-1");
-      EXPECT_EQ(*cert_stats.base64_certificate, cert_info.pems[i]);
-      if (i + 1 < cert_info.fingerprints.size()) {
-        EXPECT_EQ(*cert_stats.issuer_certificate_id,
-                  "RTCCertificate_" + cert_info.fingerprints[i + 1]);
-      } else {
-        EXPECT_FALSE(cert_stats.issuer_certificate_id.is_defined());
-      }
-    }
-  }
-
   void ExpectReportContainsDataChannel(
       const rtc::scoped_refptr<const RTCStatsReport>& report,
       const DataChannel& data_channel) {
@@ -652,8 +631,28 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsSingle) {
       }));
 
   rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
-  ExpectReportContainsCertificateInfo(report, *local_certinfo.get());
-  ExpectReportContainsCertificateInfo(report, *remote_certinfo.get());
+
+  RTCCertificateStats expected_local_certificate(
+      "RTCCertificate_" + local_certinfo->fingerprints[0],
+      report->timestamp_us());
+  expected_local_certificate.fingerprint = local_certinfo->fingerprints[0];
+  expected_local_certificate.fingerprint_algorithm = "sha-1";
+  expected_local_certificate.base64_certificate = local_certinfo->pems[0];
+  ASSERT(report->Get(expected_local_certificate.id()));

[Taylor Brandstetter, 2016/12/20 19:49:49]

Should this use ASSERT_TRUE, so it's a gtest assert?

[hbos, 2016/12/21 09:59:11]

Ah, yes!

+  EXPECT_EQ(expected_local_certificate,
+            report->Get(expected_local_certificate.id())->cast_to<
+                  RTCCertificateStats>());

[Taylor Brandstetter, 2016/12/20 19:49:49]

Each of these blocks of code is effectively the same as
ExpectReportContainsCertificateInfo, but uses EXPECT_EQ. So I think it would
make more sense to keep ExpectReportContainsCertificateInfo around and just
change it to use EXPECT_EQ.

[hbos, 2016/12/21 09:59:11]

Yeah that makes sense :) Done.

+
+  RTCCertificateStats expected_remote_certificate(
+      "RTCCertificate_" + remote_certinfo->fingerprints[0],
+      report->timestamp_us());
+  expected_remote_certificate.fingerprint = remote_certinfo->fingerprints[0];
+  expected_remote_certificate.fingerprint_algorithm = "sha-1";
+  expected_remote_certificate.base64_certificate = remote_certinfo->pems[0];
+  ASSERT(report->Get(expected_remote_certificate.id()));
+  EXPECT_EQ(expected_remote_certificate,
+            report->Get(expected_remote_certificate.id())->cast_to<
+                  RTCCertificateStats>());
 }
 
 TEST_F(RTCStatsCollectorTest, CollectRTCCodecStats) {
@@ -831,10 +830,58 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsMultiple) {
       }));
 
   rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
-  ExpectReportContainsCertificateInfo(report, *audio_local_certinfo.get());
-  ExpectReportContainsCertificateInfo(report, *audio_remote_certinfo.get());
-  ExpectReportContainsCertificateInfo(report, *video_local_certinfo.get());
-  ExpectReportContainsCertificateInfo(report, *video_remote_certinfo.get());
+
+  RTCCertificateStats expected_local_audio_certificate(
+      "RTCCertificate_" + audio_local_certinfo->fingerprints[0],
+      report->timestamp_us());
+  expected_local_audio_certificate.fingerprint =
+      audio_local_certinfo->fingerprints[0];
+  expected_local_audio_certificate.fingerprint_algorithm = "sha-1";
+  expected_local_audio_certificate.base64_certificate =
+      audio_local_certinfo->pems[0];
+  ASSERT(report->Get(expected_local_audio_certificate.id()));
+  EXPECT_EQ(expected_local_audio_certificate,
+            report->Get(expected_local_audio_certificate.id())->cast_to<
+                  RTCCertificateStats>());
+
+  RTCCertificateStats expected_remote_audio_certificate(
+      "RTCCertificate_" + audio_remote_certinfo->fingerprints[0],
+      report->timestamp_us());
+  expected_remote_audio_certificate.fingerprint =
+      audio_remote_certinfo->fingerprints[0];
+  expected_remote_audio_certificate.fingerprint_algorithm = "sha-1";
+  expected_remote_audio_certificate.base64_certificate =
+      audio_remote_certinfo->pems[0];
+  ASSERT(report->Get(expected_remote_audio_certificate.id()));
+  EXPECT_EQ(expected_remote_audio_certificate,
+            report->Get(expected_remote_audio_certificate.id())->cast_to<
+                  RTCCertificateStats>());
+
+  RTCCertificateStats expected_local_video_certificate(
+      "RTCCertificate_" + video_local_certinfo->fingerprints[0],
+      report->timestamp_us());
+  expected_local_video_certificate.fingerprint =
+      video_local_certinfo->fingerprints[0];
+  expected_local_video_certificate.fingerprint_algorithm = "sha-1";
+  expected_local_video_certificate.base64_certificate =
+      video_local_certinfo->pems[0];
+  ASSERT(report->Get(expected_local_video_certificate.id()));
+  EXPECT_EQ(expected_local_video_certificate,
+            report->Get(expected_local_video_certificate.id())->cast_to<
+                  RTCCertificateStats>());
+
+  RTCCertificateStats expected_remote_video_certificate(
+      "RTCCertificate_" + video_remote_certinfo->fingerprints[0],
+      report->timestamp_us());
+  expected_remote_video_certificate.fingerprint =
+      video_remote_certinfo->fingerprints[0];
+  expected_remote_video_certificate.fingerprint_algorithm = "sha-1";
+  expected_remote_video_certificate.base64_certificate =
+      video_remote_certinfo->pems[0];
+  ASSERT(report->Get(expected_remote_video_certificate.id()));
+  EXPECT_EQ(expected_remote_video_certificate,
+            report->Get(expected_remote_video_certificate.id())->cast_to<
+                  RTCCertificateStats>());
 }
 
 TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsChain) {
@@ -878,8 +925,44 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsChain) {
       }));
 
   rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
-  ExpectReportContainsCertificateInfo(report, *local_certinfo.get());
-  ExpectReportContainsCertificateInfo(report, *remote_certinfo.get());
+
+  for (size_t i = 0; i < local_certinfo->fingerprints.size(); ++i) {
+      RTCCertificateStats expected_local_certificate(
+          "RTCCertificate_" + local_certinfo->fingerprints[i],
+          report->timestamp_us());
+      expected_local_certificate.fingerprint =
+          local_certinfo->fingerprints[i];
+      expected_local_certificate.fingerprint_algorithm = "sha-1";
+      expected_local_certificate.base64_certificate =
+          local_certinfo->pems[i];
+      if (i + 1 < local_certinfo->fingerprints.size()) {
+        expected_local_certificate.issuer_certificate_id =
+          "RTCCertificate_" + local_certinfo->fingerprints[i + 1];
+      }
+      ASSERT(report->Get(expected_local_certificate.id()));
+      EXPECT_EQ(expected_local_certificate,
+                report->Get(expected_local_certificate.id())->cast_to<
+                      RTCCertificateStats>());
+  }
+
+  for (size_t i = 0; i < remote_certinfo->fingerprints.size(); ++i) {
+      RTCCertificateStats expected_remote_certificate(
+          "RTCCertificate_" + remote_certinfo->fingerprints[i],
+          report->timestamp_us());
+      expected_remote_certificate.fingerprint =
+          remote_certinfo->fingerprints[i];
+      expected_remote_certificate.fingerprint_algorithm = "sha-1";
+      expected_remote_certificate.base64_certificate =
+          remote_certinfo->pems[i];
+      if (i + 1 < remote_certinfo->fingerprints.size()) {
+        expected_remote_certificate.issuer_certificate_id =
+          "RTCCertificate_" + remote_certinfo->fingerprints[i + 1];
+      }
+      ASSERT(report->Get(expected_remote_certificate.id()));
+      EXPECT_EQ(expected_remote_certificate,
+                report->Get(expected_remote_certificate.id())->cast_to<
+                      RTCCertificateStats>());
+  }
 }
 
 TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) {