Move ready to send logic from BaseChannel to RtpTransport.

webrtc/pc/rtptransport_unittest.cc

Index: webrtc/pc/rtptransport_unittest.cc
diff --git a/webrtc/pc/rtptransport_unittest.cc b/webrtc/pc/rtptransport_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2cbfe5602e4777498b381a65ee7df2cd287f8288
--- /dev/null
+++ b/webrtc/pc/rtptransport_unittest.cc
@@ -0,0 +1,94 @@
+/*
+ *  Copyright 2017 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.
+ */
+
+#include <string>
+
+#include "webrtc/base/gunit.h"
+#include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/pc/rtptransport.h"
+
+namespace webrtc {
+
+class RtpTransportTest : public testing::Test {};
+
+TEST_F(RtpTransportTest, SetRtcpParametersCantDisableRtcpMux) {
+  RtpTransport transport(false);

[Taylor Brandstetter, 2017/04/19 05:56:33]

nit: Would be nice to have a way to know what the bool param means. Such as:

constexpr bool kMuxDisabled = false;
constexpr bool kMuxEnabled = true;
// ...
RtpTransport transport(kMuxDisabled);

Or:

RtpTransport transport(/*rtcp_mux_enabled=*/false);

[Zach Stein, 2017/04/20 19:59:11]

Done.

+  RtcpParameters params;
+  transport.SetRtcpParameters(params);
+  params.mux = false;
+  EXPECT_FALSE(transport.SetRtcpParameters(params).ok());
+}
+
+TEST_F(RtpTransportTest, SetRtcpParametersEmptyCnameUsesExisting) {
+  static const char kName[] = "name";
+  RtpTransport transport(false);
+  RtcpParameters params_with_name;
+  params_with_name.cname = kName;
+  transport.SetRtcpParameters(params_with_name);
+  EXPECT_EQ(transport.GetRtcpParameters().cname, kName);
+
+  RtcpParameters params_without_name;
+  transport.SetRtcpParameters(params_without_name);
+  EXPECT_EQ(transport.GetRtcpParameters().cname, kName);
+}
+
+class SignalObserver : public sigslot::has_slots<> {
+ public:
+  void OnReadyToSend(bool ready) { ready_ = ready; }
+  bool ready_ = false;
+};
+
+TEST_F(RtpTransportTest, SettingRtcpAndRtpSignalsReady) {
+  RtpTransport transport(false);
+  SignalObserver observer;

[Taylor Brandstetter, 2017/04/19 05:56:33]

nit: SignalObserver could take a pointer to the transport in its constructor and
hook up the signal there, just to make the test cases a little cleaner.

[Zach Stein, 2017/04/20 19:59:11]

Done.

+  transport.SignalReadyToSend.connect(&observer,
+                                      &SignalObserver::OnReadyToSend);
+  rtc::FakePacketTransport fake_rtcp("fake_rtcp");
+  fake_rtcp.SetWritable(true);
+  rtc::FakePacketTransport fake_rtp("fake_rtp");
+  fake_rtp.SetWritable(true);
+
+  transport.SetRtcpPacketTransport(&fake_rtcp);  // rtcp ready
+  EXPECT_FALSE(observer.ready_);
+  transport.SetRtpPacketTransport(&fake_rtp);  // rtp ready
+  EXPECT_TRUE(observer.ready_);
+}
+
+TEST_F(RtpTransportTest, SettingRtpAndRtcpSignalsReady) {
+  RtpTransport transport(false);
+  SignalObserver observer;
+  transport.SignalReadyToSend.connect(&observer,
+                                      &SignalObserver::OnReadyToSend);
+  rtc::FakePacketTransport fake_rtcp("fake_rtcp");
+  fake_rtcp.SetWritable(true);
+  rtc::FakePacketTransport fake_rtp("fake_rtp");
+  fake_rtp.SetWritable(true);
+
+  transport.SetRtpPacketTransport(&fake_rtp);  // rtp ready
+  EXPECT_FALSE(observer.ready_);
+  transport.SetRtcpPacketTransport(&fake_rtcp);  // rtcp ready
+  EXPECT_TRUE(observer.ready_);
+}
+
+TEST_F(RtpTransportTest, SettingRtpWithRtcpMuxEnabledSignalsReady) {
+  RtpTransport transport(true);
+  SignalObserver observer;
+  transport.SignalReadyToSend.connect(&observer,
+                                      &SignalObserver::OnReadyToSend);
+  rtc::FakePacketTransport fake_rtp("fake_rtp");
+  fake_rtp.SetWritable(true);
+
+  transport.SetRtpPacketTransport(&fake_rtp);  // rtp ready
+  EXPECT_TRUE(observer.ready_);
+
+  // TODO(zstein): disabling mux should signal not ready?

[Taylor Brandstetter, 2017/04/19 05:56:33]

Disabling mux when the RTCP transport is unset isn't something we support, or
need to support (to my knowledge).

[Zach Stein, 2017/04/20 19:59:11]

Acknowledged.

+}
+
+}  // namespace webrtc