Fully qualify googletest symbols.
Semi-automatically created with:
git grep -l " testing::" | xargs sed -i "s/ testing::/ ::testing::/g"
git grep -l "(testing::" | xargs sed -i "s/(testing::/(::testing::/g"
git cl format
After this, two .cc files failed to compile and I have fixed them
manually.
Bug: webrtc:10523
Change-Id: I4741d3bcedc831b6c5fdc04485678617eb4ce031
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132018
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27526}diff --git a/p2p/base/async_stun_tcp_socket_unittest.cc b/p2p/base/async_stun_tcp_socket_unittest.cc
index 70fddda..5634534 100644
--- a/p2p/base/async_stun_tcp_socket_unittest.cc
+++ b/p2p/base/async_stun_tcp_socket_unittest.cc
@@ -56,7 +56,7 @@
static const rtc::SocketAddress kClientAddr("11.11.11.11", 0);
static const rtc::SocketAddress kServerAddr("22.22.22.22", 0);
-class AsyncStunTCPSocketTest : public testing::Test,
+class AsyncStunTCPSocketTest : public ::testing::Test,
public sigslot::has_slots<> {
protected:
AsyncStunTCPSocketTest()
diff --git a/p2p/base/basic_async_resolver_factory_unittest.cc b/p2p/base/basic_async_resolver_factory_unittest.cc
index 020226f..0c21c68 100644
--- a/p2p/base/basic_async_resolver_factory_unittest.cc
+++ b/p2p/base/basic_async_resolver_factory_unittest.cc
@@ -17,7 +17,7 @@
namespace webrtc {
-class BasicAsyncResolverFactoryTest : public testing::Test,
+class BasicAsyncResolverFactoryTest : public ::testing::Test,
public sigslot::has_slots<> {
public:
void TestCreate() {
diff --git a/p2p/base/dtls_transport_unittest.cc b/p2p/base/dtls_transport_unittest.cc
index f85965d..b71d65e 100644
--- a/p2p/base/dtls_transport_unittest.cc
+++ b/p2p/base/dtls_transport_unittest.cc
@@ -297,7 +297,7 @@
};
// Base class for DtlsTransportTest and DtlsEventOrderingTest, which
-// inherit from different variants of testing::Test.
+// inherit from different variants of ::testing::Test.
//
// Note that this test always uses a FakeClock, due to the |fake_clock_| member
// variable.
diff --git a/p2p/base/mock_ice_transport.h b/p2p/base/mock_ice_transport.h
index 77716b2..6aeb950 100644
--- a/p2p/base/mock_ice_transport.h
+++ b/p2p/base/mock_ice_transport.h
@@ -19,8 +19,8 @@
#include "rtc_base/gunit.h"
#include "test/gmock.h"
-using testing::_;
-using testing::Return;
+using ::testing::_;
+using ::testing::Return;
namespace cricket {
diff --git a/p2p/base/p2p_transport_channel_unittest.cc b/p2p/base/p2p_transport_channel_unittest.cc
index 775545b..f97d631 100644
--- a/p2p/base/p2p_transport_channel_unittest.cc
+++ b/p2p/base/p2p_transport_channel_unittest.cc
@@ -187,7 +187,7 @@
// and that the result is what we expect.
// Note that this class is a base class for use by other tests, who will provide
// specialized test behavior.
-class P2PTransportChannelTestBase : public testing::Test,
+class P2PTransportChannelTestBase : public ::testing::Test,
public rtc::MessageHandler,
public sigslot::has_slots<> {
public:
@@ -3074,7 +3074,7 @@
// A collection of tests which tests a single P2PTransportChannel by sending
// pings.
-class P2PTransportChannelPingTest : public testing::Test,
+class P2PTransportChannelPingTest : public ::testing::Test,
public sigslot::has_slots<> {
public:
P2PTransportChannelPingTest()
diff --git a/p2p/base/port_allocator_unittest.cc b/p2p/base/port_allocator_unittest.cc
index c828102..a9edbec 100644
--- a/p2p/base/port_allocator_unittest.cc
+++ b/p2p/base/port_allocator_unittest.cc
@@ -24,7 +24,7 @@
static const char kTurnUsername[] = "test";
static const char kTurnPassword[] = "test";
-class PortAllocatorTest : public testing::Test, public sigslot::has_slots<> {
+class PortAllocatorTest : public ::testing::Test, public sigslot::has_slots<> {
public:
PortAllocatorTest()
: vss_(new rtc::VirtualSocketServer()), main_(vss_.get()) {
diff --git a/p2p/base/port_unittest.cc b/p2p/base/port_unittest.cc
index 8857a97..fb2b4ef 100644
--- a/p2p/base/port_unittest.cc
+++ b/p2p/base/port_unittest.cc
@@ -397,7 +397,7 @@
bool connection_ready_to_send_ = false;
};
-class PortTest : public testing::Test, public sigslot::has_slots<> {
+class PortTest : public ::testing::Test, public sigslot::has_slots<> {
public:
PortTest()
: ss_(new rtc::VirtualSocketServer()),
diff --git a/p2p/base/pseudo_tcp_unittest.cc b/p2p/base/pseudo_tcp_unittest.cc
index b542911..c0f4a89 100644
--- a/p2p/base/pseudo_tcp_unittest.cc
+++ b/p2p/base/pseudo_tcp_unittest.cc
@@ -42,7 +42,7 @@
void disableWindowScale() { PseudoTcp::disableWindowScale(); }
};
-class PseudoTcpTestBase : public testing::Test,
+class PseudoTcpTestBase : public ::testing::Test,
public rtc::MessageHandler,
public cricket::IPseudoTcpNotify {
public:
diff --git a/p2p/base/regathering_controller_unittest.cc b/p2p/base/regathering_controller_unittest.cc
index db1f1bd..c86aa1a 100644
--- a/p2p/base/regathering_controller_unittest.cc
+++ b/p2p/base/regathering_controller_unittest.cc
@@ -44,7 +44,7 @@
namespace webrtc {
-class RegatheringControllerTest : public testing::Test,
+class RegatheringControllerTest : public ::testing::Test,
public sigslot::has_slots<> {
public:
RegatheringControllerTest()
diff --git a/p2p/base/relay_port_unittest.cc b/p2p/base/relay_port_unittest.cc
index 5f410e6..ce01c15 100644
--- a/p2p/base/relay_port_unittest.cc
+++ b/p2p/base/relay_port_unittest.cc
@@ -41,7 +41,7 @@
// RelayPort and created sockets by listening for signals such as,
// SignalConnectFailure, SignalConnectTimeout, SignalSocketClosed and
// SignalReadPacket.
-class RelayPortTest : public testing::Test, public sigslot::has_slots<> {
+class RelayPortTest : public ::testing::Test, public sigslot::has_slots<> {
public:
RelayPortTest()
: virtual_socket_server_(new rtc::VirtualSocketServer()),
diff --git a/p2p/base/relay_server_unittest.cc b/p2p/base/relay_server_unittest.cc
index a64cf4f..48e750f 100644
--- a/p2p/base/relay_server_unittest.cc
+++ b/p2p/base/relay_server_unittest.cc
@@ -43,7 +43,7 @@
} // namespace
-class RelayServerTest : public testing::Test {
+class RelayServerTest : public ::testing::Test {
public:
RelayServerTest()
: ss_(new rtc::VirtualSocketServer()),
diff --git a/p2p/base/stun_port_unittest.cc b/p2p/base/stun_port_unittest.cc
index 7e7e2de..a23c063 100644
--- a/p2p/base/stun_port_unittest.cc
+++ b/p2p/base/stun_port_unittest.cc
@@ -41,7 +41,7 @@
static const int kHighCostPortKeepaliveLifetimeMs = 2 * 60 * 1000;
// Tests connecting a StunPort to a fake STUN server (cricket::StunServer)
-class StunPortTestBase : public testing::Test, public sigslot::has_slots<> {
+class StunPortTestBase : public ::testing::Test, public sigslot::has_slots<> {
public:
StunPortTestBase()
: ss_(new rtc::VirtualSocketServer()),
@@ -419,17 +419,18 @@
EXPECT_CALL(*socket, SetOption(_, _)).WillRepeatedly(Return(0));
// If DSCP is not set on the socket, stun packets should have no value.
- EXPECT_CALL(*socket, SendTo(_, _, _,
- testing::Field(&rtc::PacketOptions::dscp,
- testing::Eq(rtc::DSCP_NO_CHANGE))))
+ EXPECT_CALL(*socket,
+ SendTo(_, _, _,
+ ::testing::Field(&rtc::PacketOptions::dscp,
+ ::testing::Eq(rtc::DSCP_NO_CHANGE))))
.WillOnce(Return(100));
PrepareAddress();
// Once it is set transport wide, they should inherit that value.
port()->SetOption(rtc::Socket::OPT_DSCP, rtc::DSCP_AF41);
EXPECT_CALL(*socket, SendTo(_, _, _,
- testing::Field(&rtc::PacketOptions::dscp,
- testing::Eq(rtc::DSCP_AF41))))
+ ::testing::Field(&rtc::PacketOptions::dscp,
+ ::testing::Eq(rtc::DSCP_AF41))))
.WillRepeatedly(Return(100));
EXPECT_TRUE_SIMULATED_WAIT(done(), kTimeoutMs, fake_clock);
}
diff --git a/p2p/base/stun_request_unittest.cc b/p2p/base/stun_request_unittest.cc
index e2ac57f..47d2d41 100644
--- a/p2p/base/stun_request_unittest.cc
+++ b/p2p/base/stun_request_unittest.cc
@@ -19,7 +19,7 @@
namespace cricket {
-class StunRequestTest : public testing::Test, public sigslot::has_slots<> {
+class StunRequestTest : public ::testing::Test, public sigslot::has_slots<> {
public:
StunRequestTest()
: manager_(rtc::Thread::Current()),
diff --git a/p2p/base/stun_server_unittest.cc b/p2p/base/stun_server_unittest.cc
index b5cc1df..efc1cd2 100644
--- a/p2p/base/stun_server_unittest.cc
+++ b/p2p/base/stun_server_unittest.cc
@@ -29,7 +29,7 @@
const rtc::SocketAddress client_addr("1.2.3.4", 1234);
} // namespace
-class StunServerTest : public testing::Test {
+class StunServerTest : public ::testing::Test {
public:
StunServerTest() : ss_(new rtc::VirtualSocketServer()), network_(ss_.get()) {}
virtual void SetUp() {
diff --git a/p2p/base/tcp_port_unittest.cc b/p2p/base/tcp_port_unittest.cc
index b5b1f64..4c11470 100644
--- a/p2p/base/tcp_port_unittest.cc
+++ b/p2p/base/tcp_port_unittest.cc
@@ -55,7 +55,7 @@
bool connection_destroyed_ = false;
};
-class TCPPortTest : public testing::Test, public sigslot::has_slots<> {
+class TCPPortTest : public ::testing::Test, public sigslot::has_slots<> {
public:
TCPPortTest()
: ss_(new rtc::VirtualSocketServer()),
diff --git a/p2p/base/transport_description_factory_unittest.cc b/p2p/base/transport_description_factory_unittest.cc
index cf04964..875d140 100644
--- a/p2p/base/transport_description_factory_unittest.cc
+++ b/p2p/base/transport_description_factory_unittest.cc
@@ -30,7 +30,7 @@
using ::testing::Contains;
using ::testing::Not;
-class TransportDescriptionFactoryTest : public testing::Test {
+class TransportDescriptionFactoryTest : public ::testing::Test {
public:
TransportDescriptionFactoryTest()
: ice_credentials_({}),
diff --git a/p2p/base/turn_port_unittest.cc b/p2p/base/turn_port_unittest.cc
index 80af11d..b21a257 100644
--- a/p2p/base/turn_port_unittest.cc
+++ b/p2p/base/turn_port_unittest.cc
@@ -144,7 +144,7 @@
// Note: This test uses a fake clock with a simulated network round trip
// (between local port and TURN server) of kSimulatedRtt.
-class TurnPortTest : public testing::Test,
+class TurnPortTest : public ::testing::Test,
public sigslot::has_slots<>,
public rtc::MessageHandler {
public:
diff --git a/p2p/base/turn_server_unittest.cc b/p2p/base/turn_server_unittest.cc
index 4080cec..f115be1 100644
--- a/p2p/base/turn_server_unittest.cc
+++ b/p2p/base/turn_server_unittest.cc
@@ -19,7 +19,7 @@
namespace cricket {
-class TurnServerConnectionTest : public testing::Test {
+class TurnServerConnectionTest : public ::testing::Test {
public:
TurnServerConnectionTest() : thread_(&vss_) {}
