commit 82ebe02491d066697717ae386f886b752729e013
author hbos <hbos@webrtc.org> Mon Nov 14 09:41:09 2016
committer Commit bot <commit-bot@chromium.org> Mon Nov 14 09:41:56 2016
tree c1895b305c549bc4bb388bd38c2eb9806285012c
parent 6f0b9fda5343ec31bcc6aba67fb3e8d5f3c4e0e2

Correct stats for RTCPeerConnectionStats.dataChannels[Opened/Closed].

DataChannel.SignalOpened and unittests added.
PeerConnection.SignalDataChannelCreated added and wired up to
RTCStatsCollector.OnDataChannelCreated on RTCStatsCollector
construction.
RTCStatsCollector.OnSignalOpened/Closed added and wired up on
OnDataChannelCreated.
rtcstatscollector_unittest.cc updated, faking that channels are opened
and closed.

I did not want to use DataChannelObserver because it is used for more
than state changes and there can only be one observer (unless code is
updated). Since DataChannel already had a SignalClosed it made sense to
add a SignalOpened.

Having OnSignalBlah in RTCStatsCollector is new in this CL but will
likely be needed to correctly handle RTPMediaStreamTracks being added
and detached independently of getStats. This CL establishes this
pattern.

(An integration test will be needed for this and all the other stats to
make sure everything is wired up correctly and test outside of a
mock/fake environment, but this is not news.)

BUG=chromium:636818, chromium:627816

Review-Url: https://codereview.webrtc.org/2472113002
Cr-Commit-Position: refs/heads/master@{#15059}

webrtc/api/datachannel_unittest.cc

diff --git a/webrtc/api/datachannel_unittest.cc b/webrtc/api/datachannel_unittest.cc
index 773e752..a8c8361 100644
--- a/webrtc/api/datachannel_unittest.cc
+++ b/webrtc/api/datachannel_unittest.cc
@@ -94,6 +94,24 @@
   rtc::scoped_refptr<DataChannel> webrtc_data_channel_;
 };
 
+class StateSignalsListener : public sigslot::has_slots<> {
+ public:
+  int opened_count() const { return opened_count_; }
+  int closed_count() const { return closed_count_; }
+
+  void OnSignalOpened(DataChannel* data_channel) {
+    ++opened_count_;
+  }
+
+  void OnSignalClosed(DataChannel* data_channel) {
+    ++closed_count_;
+  }
+
+ private:
+  int opened_count_ = 0;
+  int closed_count_ = 0;
+};
+
 // Verifies that the data channel is connected to the transport after creation.
 TEST_F(SctpDataChannelTest, ConnectedToTransportOnCreated) {
   provider_->set_transport_available(true);
@@ -122,14 +140,25 @@
 
 // Tests the state of the data channel.
 TEST_F(SctpDataChannelTest, StateTransition) {
+  StateSignalsListener state_signals_listener;
+  webrtc_data_channel_->SignalOpened.connect(
+      &state_signals_listener, &StateSignalsListener::OnSignalOpened);
+  webrtc_data_channel_->SignalClosed.connect(
+      &state_signals_listener, &StateSignalsListener::OnSignalClosed);
   EXPECT_EQ(webrtc::DataChannelInterface::kConnecting,
             webrtc_data_channel_->state());
+  EXPECT_EQ(state_signals_listener.opened_count(), 0);
+  EXPECT_EQ(state_signals_listener.closed_count(), 0);
   SetChannelReady();
 
   EXPECT_EQ(webrtc::DataChannelInterface::kOpen, webrtc_data_channel_->state());
+  EXPECT_EQ(state_signals_listener.opened_count(), 1);
+  EXPECT_EQ(state_signals_listener.closed_count(), 0);
   webrtc_data_channel_->Close();
   EXPECT_EQ(webrtc::DataChannelInterface::kClosed,
             webrtc_data_channel_->state());
+  EXPECT_EQ(state_signals_listener.opened_count(), 1);
+  EXPECT_EQ(state_signals_listener.closed_count(), 1);
   // Verifies that it's disconnected from the transport.
   EXPECT_FALSE(provider_->IsConnected(webrtc_data_channel_.get()));
 }