zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTCStatsCollectorTest: ExpectReportContainsCertificateInfo /w EXPECT_EQ

Browse Source 
Modify ExpectReportContainsCertificateInfo to use EXPECT_EQ checks of
RTCCertificateStats objects.

BUG=chromium:627816

Review-Url: https://codereview.webrtc.org/2594553003
Cr-Commit-Position: refs/heads/master@{#15738}
This commit is contained in:
hbos
2016-12-21 04:29:17 -08:00
committed by Commit bot
parent c42ba32877
commit 23368e1aef
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
webrtc/api/rtcstatscollector_unittest.cc
View File

@ -496,22 +496,22 @@ class RTCStatsCollectorTest : public testing::Test {
void ExpectReportContainsCertificateInfo( void ExpectReportContainsCertificateInfo(
const rtc::scoped_refptr<const RTCStatsReport>& report, const rtc::scoped_refptr<const RTCStatsReport>& report,
const CertificateInfo& cert_info) { const CertificateInfo& certinfo) {
for (size_t i = 0; i < cert_info.fingerprints.size(); ++i) { for (size_t i = 0; i < certinfo.fingerprints.size(); ++i) {
const RTCStats* stats = report->Get( RTCCertificateStats expected_certificate_stats(
"RTCCertificate_" + cert_info.fingerprints[i]); "RTCCertificate_" + certinfo.fingerprints[i],
ASSERT_TRUE(stats); report->timestamp_us());
const RTCCertificateStats& cert_stats = expected_certificate_stats.fingerprint = certinfo.fingerprints[i];
stats->cast_to<const RTCCertificateStats>(); expected_certificate_stats.fingerprint_algorithm = "sha-1";
EXPECT_EQ(*cert_stats.fingerprint, cert_info.fingerprints[i]); expected_certificate_stats.base64_certificate = certinfo.pems[i];
EXPECT_EQ(*cert_stats.fingerprint_algorithm, "sha-1"); if (i + 1 < certinfo.fingerprints.size()) {
EXPECT_EQ(*cert_stats.base64_certificate, cert_info.pems[i]); expected_certificate_stats.issuer_certificate_id =
if (i + 1 < cert_info.fingerprints.size()) { "RTCCertificate_" + certinfo.fingerprints[i + 1];
EXPECT_EQ(*cert_stats.issuer_certificate_id,
"RTCCertificate_" + cert_info.fingerprints[i + 1]);
} else {
EXPECT_FALSE(cert_stats.issuer_certificate_id.is_defined());
} }
ASSERT_TRUE(report->Get(expected_certificate_stats.id()));
EXPECT_EQ(expected_certificate_stats,
report->Get(expected_certificate_stats.id())->cast_to<
RTCCertificateStats>());
} }
} }
@ -607,8 +607,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsSingle) {
})); }));
rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport(); rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
ExpectReportContainsCertificateInfo(report, *local_certinfo.get()); ExpectReportContainsCertificateInfo(report, *local_certinfo);
ExpectReportContainsCertificateInfo(report, *remote_certinfo.get()); ExpectReportContainsCertificateInfo(report, *remote_certinfo);
} }
TEST_F(RTCStatsCollectorTest, CollectRTCCodecStats) { TEST_F(RTCStatsCollectorTest, CollectRTCCodecStats) {
@ -786,10 +786,10 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsMultiple) {
})); }));
rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport(); rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
ExpectReportContainsCertificateInfo(report, *audio_local_certinfo.get()); ExpectReportContainsCertificateInfo(report, *audio_local_certinfo);
ExpectReportContainsCertificateInfo(report, *audio_remote_certinfo.get()); ExpectReportContainsCertificateInfo(report, *audio_remote_certinfo);
ExpectReportContainsCertificateInfo(report, *video_local_certinfo.get()); ExpectReportContainsCertificateInfo(report, *video_local_certinfo);
ExpectReportContainsCertificateInfo(report, *video_remote_certinfo.get()); ExpectReportContainsCertificateInfo(report, *video_remote_certinfo);
} }
TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsChain) { TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsChain) {
@ -833,8 +833,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsChain) {
})); }));
rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport(); rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
ExpectReportContainsCertificateInfo(report, *local_certinfo.get()); ExpectReportContainsCertificateInfo(report, *local_certinfo);
ExpectReportContainsCertificateInfo(report, *remote_certinfo.get()); ExpectReportContainsCertificateInfo(report, *remote_certinfo);
} }
TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) { TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) {