Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/api/rtcstatscollector_unittest.cc

Issue 2597433002: RTCStatsCollectorTest: Remove ExpectReportContainsDataChannel. (Closed)
Patch Set: Moved expected stats for clarity (timestamp 0 instead of report->timestamp_us(), ignored in EXPECT_… Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/api/test/mock_datachannel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/rtcstatscollector_unittest.cc
diff --git a/webrtc/api/rtcstatscollector_unittest.cc b/webrtc/api/rtcstatscollector_unittest.cc
index 4be7491724010ec0ae85d396f57698f2fed42039..3d01d0035a1a3c71793589f51a96df2315e629d0 100644
--- a/webrtc/api/rtcstatscollector_unittest.cc
+++ b/webrtc/api/rtcstatscollector_unittest.cc
@@ -539,27 +539,6 @@ class RTCStatsCollectorTest : public testing::Test {
}
}
- void ExpectReportContainsDataChannel(
- const rtc::scoped_refptr<const RTCStatsReport>& report,
- const DataChannel& data_channel) {
- const RTCStats* stats = report->Get("RTCDataChannel_" +
- rtc::ToString<>(data_channel.id()));
- EXPECT_TRUE(stats);
- const RTCDataChannelStats& data_channel_stats =
- stats->cast_to<const RTCDataChannelStats>();
- EXPECT_EQ(*data_channel_stats.label, data_channel.label());
- EXPECT_EQ(*data_channel_stats.protocol, data_channel.protocol());
- EXPECT_EQ(*data_channel_stats.datachannelid, data_channel.id());
- EXPECT_EQ(*data_channel_stats.state,
- DataStateToRTCDataChannelStateForTesting(data_channel.state()));
- EXPECT_EQ(*data_channel_stats.messages_sent, data_channel.messages_sent());
- EXPECT_EQ(*data_channel_stats.bytes_sent, data_channel.bytes_sent());
- EXPECT_EQ(*data_channel_stats.messages_received,
- data_channel.messages_received());
- EXPECT_EQ(*data_channel_stats.bytes_received,
- data_channel.bytes_received());
- }
-
protected:
rtc::scoped_refptr<RTCStatsCollectorTestHelper> test_;
rtc::scoped_refptr<RTCStatsCollector> collector_;
@@ -884,40 +863,78 @@ TEST_F(RTCStatsCollectorTest, CollectRTCCertificateStatsChain) {
TEST_F(RTCStatsCollectorTest, CollectRTCDataChannelStats) {
test_->data_channels().push_back(
- new MockDataChannel(0, DataChannelInterface::kConnecting));
- test_->data_channels().push_back(
- new MockDataChannel(1, DataChannelInterface::kOpen));
- test_->data_channels().push_back(
- new MockDataChannel(2, DataChannelInterface::kClosing));
- test_->data_channels().push_back(
- new MockDataChannel(3, DataChannelInterface::kClosed));
+ new MockDataChannel(
+ 0, "MockDataChannel0", DataChannelInterface::kConnecting, "udp",
+ 1, 2, 3, 4));
+ RTCDataChannelStats expected_data_channel0("RTCDataChannel_0", 0);
+ expected_data_channel0.label = "MockDataChannel0";
+ expected_data_channel0.protocol = "udp";
+ expected_data_channel0.datachannelid = 0;
+ expected_data_channel0.state = "connecting";
+ expected_data_channel0.messages_sent = 1;
+ expected_data_channel0.bytes_sent = 2;
+ expected_data_channel0.messages_received = 3;
+ expected_data_channel0.bytes_received = 4;
- rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
- ExpectReportContainsDataChannel(report, *test_->data_channels()[0]);
- ExpectReportContainsDataChannel(report, *test_->data_channels()[1]);
- ExpectReportContainsDataChannel(report, *test_->data_channels()[2]);
- ExpectReportContainsDataChannel(report, *test_->data_channels()[3]);
-
- test_->data_channels().clear();
- test_->data_channels().push_back(
- new MockDataChannel(0, DataChannelInterface::kConnecting,
- 1, 2, 3, 4));
test_->data_channels().push_back(
- new MockDataChannel(1, DataChannelInterface::kOpen,
- 5, 6, 7, 8));
+ new MockDataChannel(
+ 1, "MockDataChannel1", DataChannelInterface::kOpen, "tcp",
+ 5, 6, 7, 8));
+ RTCDataChannelStats expected_data_channel1("RTCDataChannel_1", 0);
+ expected_data_channel1.label = "MockDataChannel1";
+ expected_data_channel1.protocol = "tcp";
+ expected_data_channel1.datachannelid = 1;
+ expected_data_channel1.state = "open";
+ expected_data_channel1.messages_sent = 5;
+ expected_data_channel1.bytes_sent = 6;
+ expected_data_channel1.messages_received = 7;
+ expected_data_channel1.bytes_received = 8;
+
test_->data_channels().push_back(
- new MockDataChannel(2, DataChannelInterface::kClosing,
- 9, 10, 11, 12));
+ new MockDataChannel(
+ 2, "MockDataChannel2", DataChannelInterface::kClosing, "udp",
+ 9, 10, 11, 12));
+ RTCDataChannelStats expected_data_channel2("RTCDataChannel_2", 0);
+ expected_data_channel2.label = "MockDataChannel2";
+ expected_data_channel2.protocol = "udp";
+ expected_data_channel2.datachannelid = 2;
+ expected_data_channel2.state = "closing";
+ expected_data_channel2.messages_sent = 9;
+ expected_data_channel2.bytes_sent = 10;
+ expected_data_channel2.messages_received = 11;
+ expected_data_channel2.bytes_received = 12;
+
test_->data_channels().push_back(
- new MockDataChannel(3, DataChannelInterface::kClosed,
- 13, 14, 15, 16));
+ new MockDataChannel(
+ 3, "MockDataChannel3", DataChannelInterface::kClosed, "tcp",
+ 13, 14, 15, 16));
+ RTCDataChannelStats expected_data_channel3("RTCDataChannel_3", 0);
+ expected_data_channel3.label = "MockDataChannel3";
+ expected_data_channel3.protocol = "tcp";
+ expected_data_channel3.datachannelid = 3;
+ expected_data_channel3.state = "closed";
+ expected_data_channel3.messages_sent = 13;
+ expected_data_channel3.bytes_sent = 14;
+ expected_data_channel3.messages_received = 15;
+ expected_data_channel3.bytes_received = 16;
- collector_->ClearCachedStatsReport();
- report = GetStatsReport();
- ExpectReportContainsDataChannel(report, *test_->data_channels()[0]);
- ExpectReportContainsDataChannel(report, *test_->data_channels()[1]);
- ExpectReportContainsDataChannel(report, *test_->data_channels()[2]);
- ExpectReportContainsDataChannel(report, *test_->data_channels()[3]);
+ rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
+ ASSERT_TRUE(report->Get(expected_data_channel0.id()));
+ EXPECT_EQ(expected_data_channel0,
+ report->Get(expected_data_channel0.id())->cast_to<
+ RTCDataChannelStats>());
+ ASSERT_TRUE(report->Get(expected_data_channel1.id()));
+ EXPECT_EQ(expected_data_channel1,
+ report->Get(expected_data_channel1.id())->cast_to<
+ RTCDataChannelStats>());
+ ASSERT_TRUE(report->Get(expected_data_channel2.id()));
+ EXPECT_EQ(expected_data_channel2,
+ report->Get(expected_data_channel2.id())->cast_to<
+ RTCDataChannelStats>());
+ ASSERT_TRUE(report->Get(expected_data_channel3.id()));
+ EXPECT_EQ(expected_data_channel3,
+ report->Get(expected_data_channel3.id())->cast_to<
+ RTCDataChannelStats>());
}
TEST_F(RTCStatsCollectorTest, CollectRTCIceCandidateStats) {
@@ -1053,14 +1070,14 @@ TEST_F(RTCStatsCollectorTest, CollectRTCIceCandidatePairStats) {
expected_pair.responses_sent = 1000;
expected_pair.consent_requests_sent = (2020 - 2000);
- EXPECT_TRUE(report->Get(expected_pair.id()));
+ ASSERT_TRUE(report->Get(expected_pair.id()));
EXPECT_EQ(
expected_pair,
report->Get(expected_pair.id())->cast_to<RTCIceCandidatePairStats>());
- EXPECT_TRUE(report->Get(*expected_pair.local_candidate_id));
+ ASSERT_TRUE(report->Get(*expected_pair.local_candidate_id));
ExpectReportContainsCandidate(report, connection_info.local_candidate, true);
- EXPECT_TRUE(report->Get(*expected_pair.remote_candidate_id));
+ ASSERT_TRUE(report->Get(*expected_pair.remote_candidate_id));
ExpectReportContainsCandidate(report, connection_info.remote_candidate,
false);
}
@@ -1072,7 +1089,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCPeerConnectionStats) {
report->timestamp_us());
expected.data_channels_opened = 0;
expected.data_channels_closed = 0;
- EXPECT_TRUE(report->Get("RTCPeerConnection"));
+ ASSERT_TRUE(report->Get("RTCPeerConnection"));
EXPECT_EQ(expected,
report->Get("RTCPeerConnection")->cast_to<
RTCPeerConnectionStats>());
@@ -1096,7 +1113,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCPeerConnectionStats) {
report->timestamp_us());
expected.data_channels_opened = 1;
expected.data_channels_closed = 0;
- EXPECT_TRUE(report->Get("RTCPeerConnection"));
+ ASSERT_TRUE(report->Get("RTCPeerConnection"));
EXPECT_EQ(expected,
report->Get("RTCPeerConnection")->cast_to<
RTCPeerConnectionStats>());
@@ -1112,7 +1129,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCPeerConnectionStats) {
report->timestamp_us());
expected.data_channels_opened = 2;
expected.data_channels_closed = 1;
- EXPECT_TRUE(report->Get("RTCPeerConnection"));
+ ASSERT_TRUE(report->Get("RTCPeerConnection"));
EXPECT_EQ(expected,
report->Get("RTCPeerConnection")->cast_to<
RTCPeerConnectionStats>());
@@ -1169,7 +1186,7 @@ TEST_F(RTCStatsCollectorTest,
expected_local_stream.track_ids = std::vector<std::string>();
expected_local_stream.track_ids->push_back(
"RTCMediaStreamTrack_LocalAudioTrackID");
- EXPECT_TRUE(report->Get(expected_local_stream.id()));
+ ASSERT_TRUE(report->Get(expected_local_stream.id()));
EXPECT_EQ(expected_local_stream,
report->Get(expected_local_stream.id())->cast_to<
RTCMediaStreamStats>());
@@ -1180,7 +1197,7 @@ TEST_F(RTCStatsCollectorTest,
expected_remote_stream.track_ids = std::vector<std::string>();
expected_remote_stream.track_ids->push_back(
"RTCMediaStreamTrack_RemoteAudioTrackID");
- EXPECT_TRUE(report->Get(expected_remote_stream.id()));
+ ASSERT_TRUE(report->Get(expected_remote_stream.id()));
EXPECT_EQ(expected_remote_stream,
report->Get(expected_remote_stream.id())->cast_to<
RTCMediaStreamStats>());
@@ -1194,7 +1211,7 @@ TEST_F(RTCStatsCollectorTest,
expected_local_audio_track.audio_level = 1.0;
expected_local_audio_track.echo_return_loss = 42.0;
expected_local_audio_track.echo_return_loss_enhancement = 52.0;
- EXPECT_TRUE(report->Get(expected_local_audio_track.id()));
+ ASSERT_TRUE(report->Get(expected_local_audio_track.id()));
EXPECT_EQ(expected_local_audio_track,
report->Get(expected_local_audio_track.id())->cast_to<
RTCMediaStreamTrackStats>());
@@ -1208,7 +1225,7 @@ TEST_F(RTCStatsCollectorTest,
expected_remote_audio_track.audio_level = 0.0;
expected_remote_audio_track.echo_return_loss = 13.0;
expected_remote_audio_track.echo_return_loss_enhancement = 37.0;
- EXPECT_TRUE(report->Get(expected_remote_audio_track.id()));
+ ASSERT_TRUE(report->Get(expected_remote_audio_track.id()));
EXPECT_EQ(expected_remote_audio_track,
report->Get(expected_remote_audio_track.id())->cast_to<
RTCMediaStreamTrackStats>());
@@ -1248,7 +1265,7 @@ TEST_F(RTCStatsCollectorTest,
expected_local_audio_track.audio_level = 1.0;
// Should be undefined: |expected_local_audio_track.echo_return_loss| and
// |expected_local_audio_track.echo_return_loss_enhancement|.
- EXPECT_TRUE(report->Get(expected_local_audio_track.id()));
+ ASSERT_TRUE(report->Get(expected_local_audio_track.id()));
EXPECT_EQ(expected_local_audio_track,
report->Get(expected_local_audio_track.id())->cast_to<
RTCMediaStreamTrackStats>());
@@ -1306,7 +1323,7 @@ TEST_F(RTCStatsCollectorTest,
expected_local_stream.track_ids = std::vector<std::string>();
expected_local_stream.track_ids->push_back(
"RTCMediaStreamTrack_LocalVideoTrackID");
- EXPECT_TRUE(report->Get(expected_local_stream.id()));
+ ASSERT_TRUE(report->Get(expected_local_stream.id()));
EXPECT_EQ(expected_local_stream,
report->Get(expected_local_stream.id())->cast_to<
RTCMediaStreamStats>());
@@ -1317,7 +1334,7 @@ TEST_F(RTCStatsCollectorTest,
expected_remote_stream.track_ids = std::vector<std::string>();
expected_remote_stream.track_ids->push_back(
"RTCMediaStreamTrack_RemoteVideoTrackID");
- EXPECT_TRUE(report->Get(expected_remote_stream.id()));
+ ASSERT_TRUE(report->Get(expected_remote_stream.id()));
EXPECT_EQ(expected_remote_stream,
report->Get(expected_remote_stream.id())->cast_to<
RTCMediaStreamStats>());
@@ -1330,7 +1347,7 @@ TEST_F(RTCStatsCollectorTest,
expected_local_video_track.detached = false;
expected_local_video_track.frame_width = 1234;
expected_local_video_track.frame_height = 4321;
- EXPECT_TRUE(report->Get(expected_local_video_track.id()));
+ ASSERT_TRUE(report->Get(expected_local_video_track.id()));
EXPECT_EQ(expected_local_video_track,
report->Get(expected_local_video_track.id())->cast_to<
RTCMediaStreamTrackStats>());
@@ -1343,7 +1360,7 @@ TEST_F(RTCStatsCollectorTest,
expected_remote_video_track.detached = false;
expected_remote_video_track.frame_width = 1234;
expected_remote_video_track.frame_height = 4321;
- EXPECT_TRUE(report->Get(expected_remote_video_track.id()));
+ ASSERT_TRUE(report->Get(expected_remote_video_track.id()));
EXPECT_EQ(expected_remote_video_track,
report->Get(expected_remote_video_track.id())->cast_to<
RTCMediaStreamTrackStats>());
@@ -1418,8 +1435,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Audio) {
expected_audio.id())->cast_to<RTCInboundRTPStreamStats>();
EXPECT_EQ(audio, expected_audio);
- EXPECT_TRUE(report->Get(*expected_audio.transport_id));
- EXPECT_TRUE(report->Get(*expected_audio.codec_id));
+ ASSERT_TRUE(report->Get(*expected_audio.transport_id));
+ ASSERT_TRUE(report->Get(*expected_audio.codec_id));
}
TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) {
@@ -1494,8 +1511,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCInboundRTPStreamStats_Video) {
expected_video.id())->cast_to<RTCInboundRTPStreamStats>();
EXPECT_EQ(video, expected_video);
- EXPECT_TRUE(report->Get(*expected_video.transport_id));
- EXPECT_TRUE(report->Get(*video.codec_id));
+ ASSERT_TRUE(report->Get(*expected_video.transport_id));
+ ASSERT_TRUE(report->Get(*video.codec_id));
}
TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
@@ -1562,8 +1579,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
expected_audio.id())->cast_to<RTCOutboundRTPStreamStats>();
EXPECT_EQ(audio, expected_audio);
- EXPECT_TRUE(report->Get(*expected_audio.transport_id));
- EXPECT_TRUE(report->Get(*expected_audio.codec_id));
+ ASSERT_TRUE(report->Get(*expected_audio.transport_id));
+ ASSERT_TRUE(report->Get(*expected_audio.codec_id));
}
TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
@@ -1635,8 +1652,8 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
expected_video.id())->cast_to<RTCOutboundRTPStreamStats>();
EXPECT_EQ(video, expected_video);
- EXPECT_TRUE(report->Get(*expected_video.transport_id));
- EXPECT_TRUE(report->Get(*expected_video.codec_id));
+ ASSERT_TRUE(report->Get(*expected_video.transport_id));
+ ASSERT_TRUE(report->Get(*expected_video.codec_id));
}
TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Default) {
@@ -1783,7 +1800,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
expected_rtp_transport.bytes_received = 1337;
expected_rtp_transport.active_connection = false;
- EXPECT_TRUE(report->Get(expected_rtp_transport.id()));
+ ASSERT_TRUE(report->Get(expected_rtp_transport.id()));
EXPECT_EQ(
expected_rtp_transport,
report->Get(expected_rtp_transport.id())->cast_to<RTCTransportStats>());
@@ -1815,11 +1832,11 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
expected_rtp_transport.rtcp_transport_stats_id = expected_rtcp_transport.id();
- EXPECT_TRUE(report->Get(expected_rtp_transport.id()));
+ ASSERT_TRUE(report->Get(expected_rtp_transport.id()));
EXPECT_EQ(
expected_rtp_transport,
report->Get(expected_rtp_transport.id())->cast_to<RTCTransportStats>());
- EXPECT_TRUE(report->Get(expected_rtcp_transport.id()));
+ ASSERT_TRUE(report->Get(expected_rtcp_transport.id()));
EXPECT_EQ(
expected_rtcp_transport,
report->Get(expected_rtcp_transport.id())->cast_to<RTCTransportStats>());
@@ -1838,11 +1855,11 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
"RTCIceCandidatePair_" + rtcp_local_candidate->id() + "_" +
rtcp_remote_candidate->id();
- EXPECT_TRUE(report->Get(expected_rtp_transport.id()));
+ ASSERT_TRUE(report->Get(expected_rtp_transport.id()));
EXPECT_EQ(
expected_rtp_transport,
report->Get(expected_rtp_transport.id())->cast_to<RTCTransportStats>());
- EXPECT_TRUE(report->Get(expected_rtcp_transport.id()));
+ ASSERT_TRUE(report->Get(expected_rtcp_transport.id()));
EXPECT_EQ(
expected_rtcp_transport,
report->Get(expected_rtcp_transport.id())->cast_to<RTCTransportStats>());
@@ -1884,11 +1901,11 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
expected_rtcp_transport.remote_certificate_id =
*expected_rtp_transport.remote_certificate_id;
- EXPECT_TRUE(report->Get(expected_rtp_transport.id()));
+ ASSERT_TRUE(report->Get(expected_rtp_transport.id()));
EXPECT_EQ(
expected_rtp_transport,
report->Get(expected_rtp_transport.id())->cast_to<RTCTransportStats>());
- EXPECT_TRUE(report->Get(expected_rtcp_transport.id()));
+ ASSERT_TRUE(report->Get(expected_rtcp_transport.id()));
EXPECT_EQ(
expected_rtcp_transport,
report->Get(expected_rtcp_transport.id())->cast_to<RTCTransportStats>());
« no previous file with comments | « no previous file | webrtc/api/test/mock_datachannel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698