Move webrtc/{base => rtc_base}
This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
This commit is contained in:
@ -11,90 +11,9 @@
|
||||
#ifndef WEBRTC_BASE_SOCKET_UNITTEST_H_
|
||||
#define WEBRTC_BASE_SOCKET_UNITTEST_H_
|
||||
|
||||
#include "webrtc/base/gunit.h"
|
||||
#include "webrtc/base/thread.h"
|
||||
|
||||
namespace rtc {
|
||||
|
||||
// Generic socket tests, to be used when testing individual socketservers.
|
||||
// Derive your specific test class from SocketTest, install your
|
||||
// socketserver, and call the SocketTest test methods.
|
||||
class SocketTest : public testing::Test {
|
||||
protected:
|
||||
SocketTest() : kIPv4Loopback(INADDR_LOOPBACK),
|
||||
kIPv6Loopback(in6addr_loopback),
|
||||
ss_(nullptr) {}
|
||||
virtual void SetUp() { ss_ = Thread::Current()->socketserver(); }
|
||||
void TestConnectIPv4();
|
||||
void TestConnectIPv6();
|
||||
void TestConnectWithDnsLookupIPv4();
|
||||
void TestConnectWithDnsLookupIPv6();
|
||||
void TestConnectFailIPv4();
|
||||
void TestConnectFailIPv6();
|
||||
void TestConnectWithDnsLookupFailIPv4();
|
||||
void TestConnectWithDnsLookupFailIPv6();
|
||||
void TestConnectWithClosedSocketIPv4();
|
||||
void TestConnectWithClosedSocketIPv6();
|
||||
void TestConnectWhileNotClosedIPv4();
|
||||
void TestConnectWhileNotClosedIPv6();
|
||||
void TestServerCloseDuringConnectIPv4();
|
||||
void TestServerCloseDuringConnectIPv6();
|
||||
void TestClientCloseDuringConnectIPv4();
|
||||
void TestClientCloseDuringConnectIPv6();
|
||||
void TestServerCloseIPv4();
|
||||
void TestServerCloseIPv6();
|
||||
void TestCloseInClosedCallbackIPv4();
|
||||
void TestCloseInClosedCallbackIPv6();
|
||||
void TestSocketServerWaitIPv4();
|
||||
void TestSocketServerWaitIPv6();
|
||||
void TestTcpIPv4();
|
||||
void TestTcpIPv6();
|
||||
void TestSingleFlowControlCallbackIPv4();
|
||||
void TestSingleFlowControlCallbackIPv6();
|
||||
void TestUdpIPv4();
|
||||
void TestUdpIPv6();
|
||||
void TestUdpReadyToSendIPv4();
|
||||
void TestUdpReadyToSendIPv6();
|
||||
void TestGetSetOptionsIPv4();
|
||||
void TestGetSetOptionsIPv6();
|
||||
void TestSocketRecvTimestampIPv4();
|
||||
void TestSocketRecvTimestampIPv6();
|
||||
|
||||
static const int kTimeout = 5000; // ms
|
||||
const IPAddress kIPv4Loopback;
|
||||
const IPAddress kIPv6Loopback;
|
||||
|
||||
protected:
|
||||
void TcpInternal(const IPAddress& loopback, size_t data_size,
|
||||
ptrdiff_t max_send_size);
|
||||
|
||||
private:
|
||||
void ConnectInternal(const IPAddress& loopback);
|
||||
void ConnectWithDnsLookupInternal(const IPAddress& loopback,
|
||||
const std::string& host);
|
||||
void ConnectFailInternal(const IPAddress& loopback);
|
||||
|
||||
void ConnectWithDnsLookupFailInternal(const IPAddress& loopback);
|
||||
void ConnectWithClosedSocketInternal(const IPAddress& loopback);
|
||||
void ConnectWhileNotClosedInternal(const IPAddress& loopback);
|
||||
void ServerCloseDuringConnectInternal(const IPAddress& loopback);
|
||||
void ClientCloseDuringConnectInternal(const IPAddress& loopback);
|
||||
void ServerCloseInternal(const IPAddress& loopback);
|
||||
void CloseInClosedCallbackInternal(const IPAddress& loopback);
|
||||
void SocketServerWaitInternal(const IPAddress& loopback);
|
||||
void SingleFlowControlCallbackInternal(const IPAddress& loopback);
|
||||
void UdpInternal(const IPAddress& loopback);
|
||||
void UdpReadyToSend(const IPAddress& loopback);
|
||||
void GetSetOptionsInternal(const IPAddress& loopback);
|
||||
void SocketRecvTimestamp(const IPAddress& loopback);
|
||||
|
||||
SocketServer* ss_;
|
||||
};
|
||||
|
||||
// For unbound sockets, GetLocalAddress / GetRemoteAddress return AF_UNSPEC
|
||||
// values on Windows, but an empty address of the same family on Linux/MacOS X.
|
||||
bool IsUnspecOrEmptyIP(const IPAddress& address);
|
||||
|
||||
} // namespace rtc
|
||||
// This header is deprecated and is just left here temporarily during
|
||||
// refactoring. See https://bugs.webrtc.org/7634 for more details.
|
||||
#include "webrtc/rtc_base/socket_unittest.h"
|
||||
|
||||
#endif // WEBRTC_BASE_SOCKET_UNITTEST_H_
|
||||
|
||||
Reference in New Issue
Block a user