First step in providing a UdpTransportChannel.

webrtc/p2p/base/udptransportchannel_unittest.cc

Index: webrtc/p2p/base/udptransportchannel_unittest.cc
diff --git a/webrtc/p2p/base/udptransportchannel_unittest.cc b/webrtc/p2p/base/udptransportchannel_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a40b32be2bbf5e1dc5a050d6ad9824df5a181b49
--- /dev/null
+++ b/webrtc/p2p/base/udptransportchannel_unittest.cc
@@ -0,0 +1,180 @@
+/*
+ *  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.
+ */
+
+#include <algorithm>
+#include <list>
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/thread.h"
+#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/base/socketserver.h"
+#include "webrtc/p2p/base/packettransportinterface.h"
+#include "webrtc/p2p/base/udptransportchannel.h"
+
+namespace cricket {
+
+class UdpTransPortChannelTest : public testing::Test,

[Taylor Brandstetter, 2016/11/04 00:17:41]

nit: remove capital 'P'

[johan, 2016/11/04 17:39:30]

Done.

+                                public sigslot::has_slots<> {
+ public:
+  void SetUp() {
+    // TODO(johan) investigate whether an AutoThread should be instantiated.
+    network_thread_ = rtc::Thread::Current();
+    ASSERT_NE(nullptr, network_thread_);
+    network_thread_->set_socketserver(
+        rtc::SocketServer::CreateDefault().release());

[Taylor Brandstetter, 2016/11/04 00:17:42]

Can you use the VirtualSocketServer (+ SocketServerScope) instead, so the test
doesn't use any real network resources? You could look at other tests for an
example, such as port_unittest.cc.

Also, generally we just put setup code in the constructor. See:
https://github.com/google/googletest/blob/master/googletest/docs/FAQ.md#shoul...

[johan, 2016/11/04 17:39:30]

Done. Tricky to figure out how VirtualSocketServer works with sockets bound to
ipv4 inaddr_any ("0.0.0.0").
Thanks for the text fixture doc link! Removing SetUp, TearDown and obsolete
reset code.

+    ep1_.Init("name1", 1);
+    ep2_.Init("name2", 2);
+  }
+
+  void TearDown() {
+    ep1_.Reset();
+    ep2_.Reset();
+    network_thread_ = nullptr;

[Taylor Brandstetter, 2016/11/04 00:17:41]

This isn't necessary; can just let the destructor run.

[johan, 2016/11/04 17:39:30]

Acknowledged.

+  }
+
+  struct Endpoint : public sigslot::has_slots<> {
+    void Init(std::string tch_name, int component) {
+      ch_.reset(new UdpTransportChannel(std::move(tch_name), component));
+      ch_->SignalReadPacket.connect(this, &Endpoint::OnReadPacket);
+      ch_->SignalSentPacket.connect(this, &Endpoint::OnSentPacket);
+      ch_->SignalReadyToSend.connect(this, &Endpoint::OnReadyToSend);
+      ch_->SignalWritableState.connect(this, &Endpoint::OnWritableState);
+      ResetStats();
+    }
+
+    void Reset() { ch_.reset(); }
+
+    bool CheckData(const char* data, int len) {
+      bool ret = false;
+      if (!ch_packets_.empty()) {
+        std::string packet = ch_packets_.front();
+        ret = (packet == std::string(data, len));
+        ch_packets_.pop_front();
+      }
+      return ret;
+    }
+
+    void ResetStats() {
+      num_received_packets_ = 0;
+      num_sig_sent_packets_ = 0;
+      num_sig_writable_ = 0;
+      num_sig_ready_to_send_ = 0;
+    }
+
+    void OnWritableState(rtc::PacketTransportInterface* transport) {
+      num_sig_writable_++;
+    }
+
+    void OnReadyToSend(rtc::PacketTransportInterface* transport) {
+      num_sig_ready_to_send_++;
+    }
+
+    void OnReadPacket(rtc::PacketTransportInterface* transport,
+                      const char* data,
+                      size_t len,
+                      const rtc::PacketTime& packet_time,
+                      int flags) {
+      num_received_packets_++;
+      LOG(LS_VERBOSE) << "OnReadPacket (unittest)";
+      ch_packets_.push_front(std::string(data, len));
+    }
+
+    void OnSentPacket(rtc::PacketTransportInterface* transport,
+                      const rtc::SentPacket&) {
+      num_sig_sent_packets_++;
+    }
+
+    int SendData(const char* data, size_t len) {
+      rtc::PacketOptions options;
+      return ch_->SendPacket(data, len, options, 0);
+    }
+
+    void GetLocalPort(uint16_t* local_port) {
+      const rtc::SocketAddress& addr = ch_->local_parameters();
+      *local_port = addr.port();
+    }
+
+    std::list<std::string> ch_packets_;
+    std::unique_ptr<UdpTransportChannel> ch_;
+    uint32_t num_received_packets_ = 0;   // Increases on SignalReadPacket.
+    uint32_t num_sig_sent_packets_ = 0;   // Increases on SignalSentPacket.
+    uint32_t num_sig_writable_ = 0;       // Increases on SignalWritable.
+    uint32_t num_sig_ready_to_send_ = 0;  // Increases on SignalReadyToSend.
+  };
+
+  Endpoint ep1_;
+  Endpoint ep2_;
+  rtc::Thread* network_thread_;
+
+  void TestSendRecv() {
+    for (uint32_t i = 0; i < 5; ++i) {
+      static const char* data = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+      int len = static_cast<int>(strlen(data));
+      // local_channel1 <==> remote_chanel1

[Taylor Brandstetter, 2016/11/04 00:17:42]

nit: chanel->channel

[johan, 2016/11/04 17:39:30]

Done.

+      EXPECT_EQ_WAIT(len, ep1_.SendData(data, len), 1000);

[Taylor Brandstetter, 2016/11/04 00:17:41]

Could you use a default timeout of something like 10 seconds, and make it a
constant at the top of the file? If this is a functional test and not a
performance test, I like to use very generous timeouts since it may run in a
slow environment.

[johan, 2016/11/04 17:39:30]

Done.

+      // rtc::Thread::Current()->ProcessMessages(1000);

[Taylor Brandstetter, 2016/11/04 00:17:41]

nit: Can these commented-out lines be removed?

[johan, 2016/11/04 17:39:30]

Done.

+      EXPECT_TRUE_WAIT(ep2_.CheckData(data, len), 1000);
+      EXPECT_EQ_WAIT(i + 1u, ep2_.num_received_packets_, 100);
+      EXPECT_EQ_WAIT(len, ep2_.SendData(data, len), 1000);
+      // rtc::Thread::Current()->ProcessMessages(1000);
+      EXPECT_TRUE_WAIT(ep1_.CheckData(data, len), 1000);
+      EXPECT_EQ_WAIT(i + 1u, ep1_.num_received_packets_, 100);
+    }
+  }
+};
+
+TEST_F(UdpTransPortChannelTest, SendRecvBasic) {
+  ep1_.ch_->CreateSocket();
+  ep2_.ch_->CreateSocket();
+  uint16_t port;
+  ep2_.GetLocalPort(&port);
+  rtc::SocketAddress addr2 = rtc::SocketAddress("127.0.0.1", port);
+  ep1_.ch_->SetRemoteParameters(addr2);
+  ep1_.GetLocalPort(&port);
+  rtc::SocketAddress addr1 = rtc::SocketAddress("127.0.0.1", port);
+  ep2_.ch_->SetRemoteParameters(addr1);
+  TestSendRecv();
+}
+
+TEST_F(UdpTransPortChannelTest, DefaultLocal) {

[Taylor Brandstetter, 2016/11/04 00:17:42]

nit: Rename to DefaultLocalParameters

[johan, 2016/11/04 17:39:30]

Done.

+  EXPECT_TRUE(ep1_.ch_->local_parameters().IsNil());
+}
+
+TEST_F(UdpTransPortChannelTest, CreateSocketTwice) {
+  ep1_.ch_->CreateSocket();
+  EXPECT_EQ(UDPTRANSPORT_STATE_CONNECTING, ep1_.ch_->GetState());
+  ep1_.ch_->CreateSocket();
+  EXPECT_EQ(UDPTRANSPORT_STATE_CONNECTING, ep1_.ch_->GetState());
+}
+
+TEST_F(UdpTransPortChannelTest, StatusAndSignals) {
+  EXPECT_EQ(UDPTRANSPORT_STATE_INIT, ep1_.ch_->GetState());
+  ep1_.ch_->CreateSocket();
+  EXPECT_EQ(UDPTRANSPORT_STATE_CONNECTING, ep1_.ch_->GetState());
+  EXPECT_EQ(0u, ep1_.num_sig_writable_);
+  EXPECT_EQ(0u, ep1_.num_sig_ready_to_send_);
+  // Loopback
+  EXPECT_TRUE(!ep1_.ch_->writable());
+  rtc::SocketAddress addr = ep1_.ch_->local_parameters();
+  // keep port, but explicit set IP.

[Taylor Brandstetter, 2016/11/04 00:17:41]

nit: Capitalize "keep", "explicit"->"explicitly"

[johan, 2016/11/04 17:39:30]

Done.

+  addr.SetIP("127.0.0.1");
+  ep1_.ch_->SetRemoteParameters(addr);
+  EXPECT_TRUE(ep1_.ch_->writable());
+  EXPECT_EQ(1u, ep1_.num_sig_writable_);
+  EXPECT_EQ(1u, ep1_.num_sig_ready_to_send_);
+  const char data[] = "abc";
+  ep1_.SendData(data, sizeof(data));
+  EXPECT_EQ_WAIT(1u, ep1_.ch_packets_.size(), 100);
+  EXPECT_EQ_WAIT(1u, ep1_.num_sig_sent_packets_, 200);
+}
+}  // namespace cricket