Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: webrtc/base/proxy_unittest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/base/platform_thread.cc ('k') | webrtc/base/proxyserver.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 13 matching lines...) Expand all
24 24
25 static const SocketAddress kSocksProxyIntAddr("1.2.3.4", 1080); 25 static const SocketAddress kSocksProxyIntAddr("1.2.3.4", 1080);
26 static const SocketAddress kSocksProxyExtAddr("1.2.3.5", 0); 26 static const SocketAddress kSocksProxyExtAddr("1.2.3.5", 0);
27 static const SocketAddress kHttpsProxyIntAddr("1.2.3.4", 443); 27 static const SocketAddress kHttpsProxyIntAddr("1.2.3.4", 443);
28 static const SocketAddress kHttpsProxyExtAddr("1.2.3.5", 0); 28 static const SocketAddress kHttpsProxyExtAddr("1.2.3.5", 0);
29 static const SocketAddress kBogusProxyIntAddr("1.2.3.4", 999); 29 static const SocketAddress kBogusProxyIntAddr("1.2.3.4", 999);
30 30
31 // Sets up a virtual socket server and HTTPS/SOCKS5 proxy servers. 31 // Sets up a virtual socket server and HTTPS/SOCKS5 proxy servers.
32 class ProxyTest : public testing::Test { 32 class ProxyTest : public testing::Test {
33 public: 33 public:
34 ProxyTest() : ss_(new rtc::VirtualSocketServer(NULL)) { 34 ProxyTest() : ss_(new rtc::VirtualSocketServer(nullptr)) {
35 Thread::Current()->set_socketserver(ss_.get()); 35 Thread::Current()->set_socketserver(ss_.get());
36 socks_.reset(new rtc::SocksProxyServer( 36 socks_.reset(new rtc::SocksProxyServer(
37 ss_.get(), kSocksProxyIntAddr, ss_.get(), kSocksProxyExtAddr)); 37 ss_.get(), kSocksProxyIntAddr, ss_.get(), kSocksProxyExtAddr));
38 https_.reset(new rtc::HttpListenServer()); 38 https_.reset(new rtc::HttpListenServer());
39 https_->Listen(kHttpsProxyIntAddr); 39 https_->Listen(kHttpsProxyIntAddr);
40 } 40 }
41 ~ProxyTest() { 41 ~ProxyTest() { Thread::Current()->set_socketserver(nullptr); }
42 Thread::Current()->set_socketserver(NULL);
43 }
44 42
45 rtc::SocketServer* ss() { return ss_.get(); } 43 rtc::SocketServer* ss() { return ss_.get(); }
46 44
47 private: 45 private:
48 std::unique_ptr<rtc::SocketServer> ss_; 46 std::unique_ptr<rtc::SocketServer> ss_;
49 std::unique_ptr<rtc::SocksProxyServer> socks_; 47 std::unique_ptr<rtc::SocksProxyServer> socks_;
50 // TODO: Make this a real HTTPS proxy server. 48 // TODO: Make this a real HTTPS proxy server.
51 std::unique_ptr<rtc::HttpListenServer> https_; 49 std::unique_ptr<rtc::HttpListenServer> https_;
52 }; 50 };
53 51
54 // Tests whether we can use a SOCKS5 proxy to connect to a server. 52 // Tests whether we can use a SOCKS5 proxy to connect to a server.
55 TEST_F(ProxyTest, TestSocks5Connect) { 53 TEST_F(ProxyTest, TestSocks5Connect) {
56 rtc::AsyncSocket* socket = 54 rtc::AsyncSocket* socket =
57 ss()->CreateAsyncSocket(kSocksProxyIntAddr.family(), SOCK_STREAM); 55 ss()->CreateAsyncSocket(kSocksProxyIntAddr.family(), SOCK_STREAM);
58 rtc::AsyncSocksProxySocket* proxy_socket = 56 rtc::AsyncSocksProxySocket* proxy_socket =
59 new rtc::AsyncSocksProxySocket(socket, kSocksProxyIntAddr, 57 new rtc::AsyncSocksProxySocket(socket, kSocksProxyIntAddr,
60 "", rtc::CryptString()); 58 "", rtc::CryptString());
61 // TODO: IPv6-ize these tests when proxy supports IPv6. 59 // TODO: IPv6-ize these tests when proxy supports IPv6.
62 60
63 rtc::TestEchoServer server(Thread::Current(), 61 rtc::TestEchoServer server(Thread::Current(),
64 SocketAddress(INADDR_ANY, 0)); 62 SocketAddress(INADDR_ANY, 0));
65 63
66 rtc::AsyncTCPSocket* packet_socket = rtc::AsyncTCPSocket::Create( 64 rtc::AsyncTCPSocket* packet_socket = rtc::AsyncTCPSocket::Create(
67 proxy_socket, SocketAddress(INADDR_ANY, 0), server.address()); 65 proxy_socket, SocketAddress(INADDR_ANY, 0), server.address());
68 EXPECT_TRUE(packet_socket != NULL); 66 EXPECT_TRUE(packet_socket != nullptr);
69 rtc::TestClient client(packet_socket); 67 rtc::TestClient client(packet_socket);
70 68
71 EXPECT_EQ(Socket::CS_CONNECTING, proxy_socket->GetState()); 69 EXPECT_EQ(Socket::CS_CONNECTING, proxy_socket->GetState());
72 EXPECT_TRUE(client.CheckConnected()); 70 EXPECT_TRUE(client.CheckConnected());
73 EXPECT_EQ(Socket::CS_CONNECTED, proxy_socket->GetState()); 71 EXPECT_EQ(Socket::CS_CONNECTED, proxy_socket->GetState());
74 EXPECT_EQ(server.address(), client.remote_address()); 72 EXPECT_EQ(server.address(), client.remote_address());
75 client.Send("foo", 3); 73 client.Send("foo", 3);
76 EXPECT_TRUE(client.CheckNextPacket("foo", 3, NULL)); 74 EXPECT_TRUE(client.CheckNextPacket("foo", 3, nullptr));
77 EXPECT_TRUE(client.CheckNoPacket()); 75 EXPECT_TRUE(client.CheckNoPacket());
78 } 76 }
OLDNEW
« no previous file with comments | « webrtc/base/platform_thread.cc ('k') | webrtc/base/proxyserver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698