zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat the WebRTC code base

Browse Source 
Running clang-format with chromium's style guide.

The goal is n-fold:
 * providing consistency and readability (that's what code guidelines are for)
 * preventing noise with presubmit checks and git cl format
 * building on the previous point: making it easier to automatically fix format issues
 * you name it

Please consider using git-hyper-blame to ignore this commit.

Bug: webrtc:9340
Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87
Reviewed-on: https://webrtc-review.googlesource.com/81185
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23660}
This commit is contained in:
Yves Gerey
2018-06-19 15:03:05 +02:00
parent b602123a5a
commit 665174fdbb
1569 changed files with 30495 additions and 30309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
rtc_base/network_unittest.cc
View File

@ -19,8 +19,8 @@
#include "rtc_base/nethelpers.h"
#include "rtc_base/networkmonitor.h"
#if defined(WEBRTC_POSIX)
#include <sys/types.h>
#include <net/if.h>
#include <sys/types.h>
#include "rtc_base/ifaddrs_converter.h"
#endif // defined(WEBRTC_POSIX)
#include "rtc_base/gunit.h"
@ -75,13 +75,11 @@ bool SameNameAndPrefix(const rtc::Network& a, const rtc::Network& b) {
} // namespace
class NetworkTest : public testing::Test, public sigslot::has_slots<> {
class NetworkTest : public testing::Test, public sigslot::has_slots<> {
public:
NetworkTest() : callback_called_(false) {}
void OnNetworksChanged() {
callback_called_ = true;
}
void OnNetworksChanged() { callback_called_ = true; }
NetworkManager::Stats MergeNetworkList(
BasicNetworkManager& network_manager,
@ -98,7 +96,8 @@ class NetworkTest : public testing::Test, public sigslot::has_slots<> {
}
NetworkManager::NetworkList GetNetworks(
const BasicNetworkManager& network_manager, bool include_ignored) {
const BasicNetworkManager& network_manager,
bool include_ignored) {
NetworkManager::NetworkList list;
network_manager.CreateNetworks(include_ignored, &list);
return list;
@ -137,8 +136,8 @@ class NetworkTest : public testing::Test, public sigslot::has_slots<> {
struct sockaddr_in6* CreateIpv6Addr(const std::string& ip_string,
uint32_t scope_id) {
struct sockaddr_in6* ipv6_addr = static_cast<struct sockaddr_in6*>(
malloc(sizeof(struct sockaddr_in6)));
struct sockaddr_in6* ipv6_addr =
static_cast<struct sockaddr_in6*>(malloc(sizeof(struct sockaddr_in6)));
memset(ipv6_addr, 0, sizeof(struct sockaddr_in6));
ipv6_addr->sin6_family = AF_INET6;
ipv6_addr->sin6_scope_id = scope_id;
@ -225,10 +224,10 @@ TEST_F(NetworkTest, TestIsIgnoredNetworkIgnoresIPsStartingWith0) {
// TODO(phoglund): Remove when ignore list goes away.
TEST_F(NetworkTest, TestIgnoreList) {
Network ignore_me("ignore_me", "Ignore me please!",
IPAddress(0x12345600U), 24);
Network include_me("include_me", "Include me please!",
IPAddress(0x12345600U), 24);
Network ignore_me("ignore_me", "Ignore me please!", IPAddress(0x12345600U),
24);
Network include_me("include_me", "Include me please!", IPAddress(0x12345600U),
24);
BasicNetworkManager network_manager;
EXPECT_FALSE(IsIgnoredNetwork(network_manager, ignore_me));
EXPECT_FALSE(IsIgnoredNetwork(network_manager, include_me));
@ -245,9 +244,7 @@ TEST_F(NetworkTest, DISABLED_TestCreateNetworks) {
NetworkManager::NetworkList result = GetNetworks(manager, true);
// We should be able to bind to any addresses we find.
NetworkManager::NetworkList::iterator it;
for (it = result.begin();
it != result.end();
++it) {
for (it = result.begin(); it != result.end(); ++it) {
sockaddr_storage storage;
memset(&storage, 0, sizeof(storage));
IPAddress ip = (*it)->GetBestIP();
@ -258,8 +255,7 @@ TEST_F(NetworkTest, DISABLED_TestCreateNetworks) {
if (fd > 0) {
size_t ipsize = bindaddress.ToSockAddrStorage(&storage);
EXPECT_GE(ipsize, 0U);
int success = ::bind(fd,
reinterpret_cast<sockaddr*>(&storage),
int success = ::bind(fd, reinterpret_cast<sockaddr*>(&storage),
static_cast<int>(ipsize));
#if defined(WEBRTC_WIN)
if (success)
@ -280,8 +276,8 @@ TEST_F(NetworkTest, DISABLED_TestCreateNetworks) {
// ALLOWED.
TEST_F(NetworkTest, TestUpdateNetworks) {
BasicNetworkManager manager;
manager.SignalNetworksChanged.connect(
static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
manager.SignalNetworksChanged.connect(static_cast<NetworkTest*>(this),
&NetworkTest::OnNetworksChanged);
EXPECT_EQ(NetworkManager::ENUMERATION_ALLOWED,
manager.enumeration_permission());
manager.StartUpdating();
@ -428,8 +424,8 @@ void SetupNetworks(NetworkManager::NetworkList* list) {
// Test that the basic network merging case works.
TEST_F(NetworkTest, TestIPv6MergeNetworkList) {
BasicNetworkManager manager;
manager.SignalNetworksChanged.connect(
static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
manager.SignalNetworksChanged.connect(static_cast<NetworkTest*>(this),
&NetworkTest::OnNetworksChanged);
NetworkManager::NetworkList original_list;
SetupNetworks(&original_list);
bool changed = false;
@ -453,8 +449,8 @@ TEST_F(NetworkTest, TestIPv6MergeNetworkList) {
// objects remain in the result list.
TEST_F(NetworkTest, TestNoChangeMerge) {
BasicNetworkManager manager;
manager.SignalNetworksChanged.connect(
static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
manager.SignalNetworksChanged.connect(static_cast<NetworkTest*>(this),
&NetworkTest::OnNetworksChanged);
NetworkManager::NetworkList original_list;
SetupNetworks(&original_list);
bool changed = false;
@ -488,17 +484,16 @@ TEST_F(NetworkTest, TestNoChangeMerge) {
// IP changed.
TEST_F(NetworkTest, MergeWithChangedIP) {
BasicNetworkManager manager;
manager.SignalNetworksChanged.connect(
static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
manager.SignalNetworksChanged.connect(static_cast<NetworkTest*>(this),
&NetworkTest::OnNetworksChanged);
NetworkManager::NetworkList original_list;
SetupNetworks(&original_list);
// Make a network that we're going to change.
IPAddress ip;
EXPECT_TRUE(IPFromString("2401:fa01:4:1000:be30:faa:fee:faa", &ip));
IPAddress prefix = TruncateIP(ip, 64);
Network* network_to_change = new Network("test_eth0",
"Test Network Adapter 1",
prefix, 64);
Network* network_to_change =
new Network("test_eth0", "Test Network Adapter 1", prefix, 64);
Network* changed_network = new Network(*network_to_change);
network_to_change->AddIP(ip);
IPAddress changed_ip;
@ -517,8 +512,7 @@ TEST_F(NetworkTest, MergeWithChangedIP) {
manager.GetNetworks(&list);
EXPECT_EQ(original_list.size(), list.size());
// Make sure the original network is still in the merged list.
EXPECT_NE(list.end(),
std::find(list.begin(), list.end(), network_to_change));
EXPECT_NE(list.end(), std::find(list.begin(), list.end(), network_to_change));
EXPECT_EQ(changed_ip, network_to_change->GetIPs().at(0));
}
@ -526,8 +520,8 @@ TEST_F(NetworkTest, MergeWithChangedIP) {
// with additional IPs (not just a replacement).
TEST_F(NetworkTest, TestMultipleIPMergeNetworkList) {
BasicNetworkManager manager;
manager.SignalNetworksChanged.connect(
static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
manager.SignalNetworksChanged.connect(static_cast<NetworkTest*>(this),
&NetworkTest::OnNetworksChanged);
NetworkManager::NetworkList original_list;
SetupNetworks(&original_list);
bool changed = false;
@ -581,8 +575,8 @@ TEST_F(NetworkTest, TestMultipleIPMergeNetworkList) {
// Test that merge correctly distinguishes multiple networks on an interface.
TEST_F(NetworkTest, TestMultiplePublicNetworksOnOneInterfaceMerge) {
BasicNetworkManager manager;
manager.SignalNetworksChanged.connect(
static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
manager.SignalNetworksChanged.connect(static_cast<NetworkTest*>(this),
&NetworkTest::OnNetworksChanged);
NetworkManager::NetworkList original_list;
SetupNetworks(&original_list);
bool changed = false;
@ -1038,8 +1032,8 @@ TEST_F(NetworkTest, TestIPv6Selection) {
ASSERT_TRUE(IPFromString(ipstr, IPV6_ADDRESS_FLAG_DEPRECATED, &ip));
// Create a network with this prefix.
Network ipv6_network(
"test_eth0", "Test NetworkAdapter", TruncateIP(ip, 64), 64);
Network ipv6_network("test_eth0", "Test NetworkAdapter", TruncateIP(ip, 64),
64);
// When there is no address added, it should return an unspecified
// address.