RTCTransportStats.dtlsState replaces .activeConnection

webrtc/api/rtcstatscollector_unittest.cc

 /*
  *  Copyright 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1848 matching lines @@
 
   cricket::ConnectionInfo rtp_connection_info;
   rtp_connection_info.best_connection = false;
   rtp_connection_info.local_candidate = *rtp_local_candidate.get();
   rtp_connection_info.remote_candidate = *rtp_remote_candidate.get();
   rtp_connection_info.sent_total_bytes = 42;
   rtp_connection_info.recv_total_bytes = 1337;
   cricket::TransportChannelStats rtp_transport_channel_stats;
   rtp_transport_channel_stats.component = cricket::ICE_CANDIDATE_COMPONENT_RTP;
   rtp_transport_channel_stats.connection_infos.push_back(rtp_connection_info);
+  rtp_transport_channel_stats.dtls_state = cricket::DTLS_TRANSPORT_NEW;
   session_stats.transport_stats["transport"].channel_stats.push_back(
       rtp_transport_channel_stats);
 
 
   // Mock the session to return the desired candidates.
   EXPECT_CALL(test_->session(), GetStats(_)).WillRepeatedly(Invoke(
       [&session_stats](const ChannelNamePairs&) {
         return std::unique_ptr<SessionStats>(new SessionStats(session_stats));
       }));
 
   // Get stats without RTCP, an active connection or certificates.
   rtc::scoped_refptr<const RTCStatsReport> report = GetStatsReport();
 
   RTCTransportStats expected_rtp_transport(
       "RTCTransport_transport_" +
           rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTP),
       report->timestamp_us());
   expected_rtp_transport.bytes_sent = 42;
   expected_rtp_transport.bytes_received = 1337;
-  expected_rtp_transport.active_connection = false;
+  expected_rtp_transport.dtls_state = RTCDtlsTransportState::kNew;
 
   ASSERT_TRUE(report->Get(expected_rtp_transport.id()));
   EXPECT_EQ(
       expected_rtp_transport,
       report->Get(expected_rtp_transport.id())->cast_to<RTCTransportStats>());
 
   cricket::ConnectionInfo rtcp_connection_info;
   rtcp_connection_info.best_connection = false;
   rtcp_connection_info.local_candidate = *rtcp_local_candidate.get();
   rtcp_connection_info.remote_candidate = *rtcp_remote_candidate.get();
   rtcp_connection_info.sent_total_bytes = 1337;
   rtcp_connection_info.recv_total_bytes = 42;
   cricket::TransportChannelStats rtcp_transport_channel_stats;
   rtcp_transport_channel_stats.component =
       cricket::ICE_CANDIDATE_COMPONENT_RTCP;
   rtcp_transport_channel_stats.connection_infos.push_back(rtcp_connection_info);
+  rtcp_transport_channel_stats.dtls_state = cricket::DTLS_TRANSPORT_CONNECTING;
   session_stats.transport_stats["transport"].channel_stats.push_back(
       rtcp_transport_channel_stats);
 
   collector_->ClearCachedStatsReport();
   // Get stats with RTCP and without an active connection or certificates.
   report = GetStatsReport();
 
   RTCTransportStats expected_rtcp_transport(
       "RTCTransport_transport_" +
           rtc::ToString<>(cricket::ICE_CANDIDATE_COMPONENT_RTCP),
       report->timestamp_us());
   expected_rtcp_transport.bytes_sent = 1337;
   expected_rtcp_transport.bytes_received = 42;
-  expected_rtcp_transport.active_connection = false;
+  expected_rtcp_transport.dtls_state = RTCDtlsTransportState::kConnecting;
 
   expected_rtp_transport.rtcp_transport_stats_id = expected_rtcp_transport.id();
 
   ASSERT_TRUE(report->Get(expected_rtp_transport.id()));
   EXPECT_EQ(
       expected_rtp_transport,
       report->Get(expected_rtp_transport.id())->cast_to<RTCTransportStats>());
   ASSERT_TRUE(report->Get(expected_rtcp_transport.id()));
   EXPECT_EQ(
       expected_rtcp_transport,
       report->Get(expected_rtcp_transport.id())->cast_to<RTCTransportStats>());
 
-  // Get stats with an active connection.
+  // Get stats with an active connection (selected candidate pair).
   session_stats.transport_stats["transport"]
       .channel_stats[1]
       .connection_infos[0]
       .best_connection = true;
 
   collector_->ClearCachedStatsReport();
   report = GetStatsReport();
 
-  expected_rtcp_transport.active_connection = true;
   expected_rtcp_transport.selected_candidate_pair_id =
       "RTCIceCandidatePair_" + rtcp_local_candidate->id() + "_" +
       rtcp_remote_candidate->id();
 
   ASSERT_TRUE(report->Get(expected_rtp_transport.id()));
   EXPECT_EQ(
       expected_rtp_transport,
       report->Get(expected_rtp_transport.id())->cast_to<RTCTransportStats>());
   ASSERT_TRUE(report->Get(expected_rtcp_transport.id()));
   EXPECT_EQ(
@@ skipping 60 matching lines @@
   rtc::scoped_refptr<FakeRTCStatsCollector> collector_;
 };
 
 TEST_F(RTCStatsCollectorTestWithFakeCollector, ThreadUsageAndResultsMerging) {
   collector_->VerifyThreadUsageAndResultsMerging();
 }
 
 }  // namespace
 
 }  // namespace webrtc