admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix weird socket member naming in AsyncStunTCPSocketTest

Browse Source 
Bug: webrtc:13065
Change-Id: Ifd7af4b283d55cbe0e3a03185b1b8e0bab6d47cc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234322
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35151}
This commit is contained in:
Niels Möller 2021-10-06 09:47:55 +02:00 committed by WebRTC LUCI CQ
parent 04c911c6a5
commit 404cd60ecc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
p2p/base/async_stun_tcp_socket_unittest.cc
View File

@ -17,6 +17,7 @@
#include <memory>
#include <string>
#include "absl/memory/memory.h"
#include "rtc_base/network/sent_packet.h"
#include "rtc_base/socket.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
@ -78,13 +79,13 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
void CreateSockets() {
rtc::Socket* server = vss_->CreateSocket(kServerAddr.family(), SOCK_STREAM);
server->Bind(kServerAddr);
recv_socket_.reset(new AsyncStunServerTCPSocket(server));
recv_socket_->SignalNewConnection.connect(
listen_socket_ = std::make_unique<AsyncStunServerTCPSocket>(server);
listen_socket_->SignalNewConnection.connect(
this, &AsyncStunTCPSocketTest::OnNewConnection);
rtc::Socket* client = vss_->CreateSocket(kClientAddr.family(), SOCK_STREAM);
send_socket_.reset(AsyncStunTCPSocket::Create(
client, kClientAddr, recv_socket_->GetLocalAddress()));
client, kClientAddr, listen_socket_->GetLocalAddress()));
send_socket_->SignalSentPacket.connect(
this, &AsyncStunTCPSocketTest::OnSentPacket);
ASSERT_TRUE(send_socket_.get() != NULL);
@ -106,7 +107,7 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
void OnNewConnection(rtc::AsyncPacketSocket* /*server*/,
rtc::AsyncPacketSocket* new_socket) {
listen_socket_.reset(new_socket);
recv_socket_ = absl::WrapUnique(new_socket);
new_socket->SignalReadPacket.connect(this,
&AsyncStunTCPSocketTest::OnReadPacket);
}
@ -132,8 +133,8 @@ class AsyncStunTCPSocketTest : public ::testing::Test,
std::unique_ptr<rtc::VirtualSocketServer> vss_;
rtc::AutoSocketServerThread thread_;
std::unique_ptr<AsyncStunTCPSocket> send_socket_;
std::unique_ptr<rtc::AsyncPacketSocket> recv_socket_;
std::unique_ptr<rtc::AsyncPacketSocket> listen_socket_;
std::unique_ptr<rtc::AsyncPacketSocket> recv_socket_;
std::list<std::string> recv_packets_;
int sent_packets_ = 0;
};