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/rtc_base/async_tcp_socket_unittest.cc b/rtc_base/async_tcp_socket_unittest.cc
index 69b5392..4fa9d92 100644
--- a/rtc_base/async_tcp_socket_unittest.cc
+++ b/rtc_base/async_tcp_socket_unittest.cc
@@ -17,7 +17,7 @@
namespace rtc {
-class AsyncTCPSocketTest : public testing::Test, public sigslot::has_slots<> {
+class AsyncTCPSocketTest : public ::testing::Test, public sigslot::has_slots<> {
public:
AsyncTCPSocketTest()
: vss_(new rtc::VirtualSocketServer()),
diff --git a/rtc_base/async_udp_socket_unittest.cc b/rtc_base/async_udp_socket_unittest.cc
index 0484c3a..7ef7c86 100644
--- a/rtc_base/async_udp_socket_unittest.cc
+++ b/rtc_base/async_udp_socket_unittest.cc
@@ -18,7 +18,7 @@
namespace rtc {
-class AsyncUdpSocketTest : public testing::Test, public sigslot::has_slots<> {
+class AsyncUdpSocketTest : public ::testing::Test, public sigslot::has_slots<> {
public:
AsyncUdpSocketTest()
: pss_(new rtc::PhysicalSocketServer),
diff --git a/rtc_base/helpers_unittest.cc b/rtc_base/helpers_unittest.cc
index 1feb9de..8d8f900 100644
--- a/rtc_base/helpers_unittest.cc
+++ b/rtc_base/helpers_unittest.cc
@@ -17,7 +17,7 @@
namespace rtc {
-class RandomTest : public testing::Test {};
+class RandomTest : public ::testing::Test {};
TEST_F(RandomTest, TestCreateRandomId) {
CreateRandomId();
diff --git a/rtc_base/message_queue_unittest.cc b/rtc_base/message_queue_unittest.cc
index 657949c..b7c32e3 100644
--- a/rtc_base/message_queue_unittest.cc
+++ b/rtc_base/message_queue_unittest.cc
@@ -26,7 +26,7 @@
namespace rtc {
namespace {
-class MessageQueueTest : public testing::Test, public MessageQueue {
+class MessageQueueTest : public ::testing::Test, public MessageQueue {
public:
MessageQueueTest() : MessageQueue(SocketServer::CreateDefault(), true) {}
bool IsLocked_Worker() {
diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc
index 7a0761e..79f6ea2 100644
--- a/rtc_base/nat_unittest.cc
+++ b/rtc_base/nat_unittest.cc
@@ -321,7 +321,7 @@
}
}
-class NatTcpTest : public testing::Test, public sigslot::has_slots<> {
+class NatTcpTest : public ::testing::Test, public sigslot::has_slots<> {
public:
NatTcpTest()
: int_addr_("192.168.0.1", 0),
diff --git a/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc
index 08ffb6e..b35b9f4 100644
--- a/rtc_base/network_unittest.cc
+++ b/rtc_base/network_unittest.cc
@@ -81,7 +81,7 @@
} // namespace
-class NetworkTest : public testing::Test, public sigslot::has_slots<> {
+class NetworkTest : public ::testing::Test, public sigslot::has_slots<> {
public:
NetworkTest() : callback_called_(false) {}
diff --git a/rtc_base/null_socket_server_unittest.cc b/rtc_base/null_socket_server_unittest.cc
index 8268911..961ab6a 100644
--- a/rtc_base/null_socket_server_unittest.cc
+++ b/rtc_base/null_socket_server_unittest.cc
@@ -25,7 +25,7 @@
static const uint32_t kTimeout = 5000U;
-class NullSocketServerTest : public testing::Test, public MessageHandler {
+class NullSocketServerTest : public ::testing::Test, public MessageHandler {
protected:
void OnMessage(Message* message) override { ss_.WakeUp(); }
diff --git a/rtc_base/numerics/sample_counter_unittest.cc b/rtc_base/numerics/sample_counter_unittest.cc
index e87c809..14b0573 100644
--- a/rtc_base/numerics/sample_counter_unittest.cc
+++ b/rtc_base/numerics/sample_counter_unittest.cc
@@ -15,7 +15,7 @@
#include "test/gmock.h"
#include "test/gtest.h"
-using testing::Eq;
+using ::testing::Eq;
namespace rtc {
diff --git a/rtc_base/physical_socket_server_unittest.cc b/rtc_base/physical_socket_server_unittest.cc
index aed8bf3..611fb18 100644
--- a/rtc_base/physical_socket_server_unittest.cc
+++ b/rtc_base/physical_socket_server_unittest.cc
@@ -499,7 +499,7 @@
server_->set_network_binder(nullptr);
}
-class PosixSignalDeliveryTest : public testing::Test {
+class PosixSignalDeliveryTest : public ::testing::Test {
public:
static void RecordSignal(int signum) {
signals_received_.push_back(signum);
diff --git a/rtc_base/proxy_unittest.cc b/rtc_base/proxy_unittest.cc
index 229891d..59d637a 100644
--- a/rtc_base/proxy_unittest.cc
+++ b/rtc_base/proxy_unittest.cc
@@ -25,7 +25,7 @@
static const SocketAddress kBogusProxyIntAddr("1.2.3.4", 999);
// Sets up a virtual socket server and a SOCKS5 proxy server.
-class ProxyTest : public testing::Test {
+class ProxyTest : public ::testing::Test {
public:
ProxyTest() : ss_(new rtc::VirtualSocketServer()), thread_(ss_.get()) {
socks_.reset(new rtc::SocksProxyServer(ss_.get(), kSocksProxyIntAddr,
diff --git a/rtc_base/rtc_certificate_generator_unittest.cc b/rtc_base/rtc_certificate_generator_unittest.cc
index 69c8597..959e65a 100644
--- a/rtc_base/rtc_certificate_generator_unittest.cc
+++ b/rtc_base/rtc_certificate_generator_unittest.cc
@@ -67,7 +67,7 @@
bool generate_async_completed_;
};
-class RTCCertificateGeneratorTest : public testing::Test {
+class RTCCertificateGeneratorTest : public ::testing::Test {
public:
RTCCertificateGeneratorTest()
: fixture_(new RefCountedObject<RTCCertificateGeneratorFixture>()) {}
diff --git a/rtc_base/rtc_certificate_unittest.cc b/rtc_base/rtc_certificate_unittest.cc
index ab242bb..62e9e2c 100644
--- a/rtc_base/rtc_certificate_unittest.cc
+++ b/rtc_base/rtc_certificate_unittest.cc
@@ -27,7 +27,7 @@
} // namespace
-class RTCCertificateTest : public testing::Test {
+class RTCCertificateTest : public ::testing::Test {
protected:
scoped_refptr<RTCCertificate> GenerateECDSA() {
std::unique_ptr<SSLIdentity> identity(
diff --git a/rtc_base/signal_thread_unittest.cc b/rtc_base/signal_thread_unittest.cc
index 2bc0dda..c333ff7 100644
--- a/rtc_base/signal_thread_unittest.cc
+++ b/rtc_base/signal_thread_unittest.cc
@@ -23,7 +23,7 @@
// 10 seconds.
static const int kTimeout = 10000;
-class SignalThreadTest : public testing::Test, public sigslot::has_slots<> {
+class SignalThreadTest : public ::testing::Test, public sigslot::has_slots<> {
public:
class SlowSignalThread : public SignalThread {
public:
diff --git a/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc
index 8edab7c..317cd62 100644
--- a/rtc_base/sigslot_unittest.cc
+++ b/rtc_base/sigslot_unittest.cc
@@ -24,7 +24,7 @@
return true;
}
-class SigslotDefault : public testing::Test, public sigslot::has_slots<> {
+class SigslotDefault : public ::testing::Test, public sigslot::has_slots<> {
protected:
sigslot::signal0<> signal_;
};
@@ -64,7 +64,7 @@
template <class slot_policy = sigslot::single_threaded,
class mt_signal_policy = sigslot::multi_threaded_local>
-class SigslotSlotTest : public testing::Test {
+class SigslotSlotTest : public ::testing::Test {
protected:
SigslotSlotTest() {
mt_signal_policy mt_policy;
diff --git a/rtc_base/socket_unittest.h b/rtc_base/socket_unittest.h
index db226c4..5197ccd 100644
--- a/rtc_base/socket_unittest.h
+++ b/rtc_base/socket_unittest.h
@@ -19,7 +19,7 @@
// 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 {
+class SocketTest : public ::testing::Test {
protected:
SocketTest()
: kIPv4Loopback(INADDR_LOOPBACK),
diff --git a/rtc_base/ssl_adapter_unittest.cc b/rtc_base/ssl_adapter_unittest.cc
index b459496..d723bf1 100644
--- a/rtc_base/ssl_adapter_unittest.cc
+++ b/rtc_base/ssl_adapter_unittest.cc
@@ -293,7 +293,7 @@
std::string data_;
};
-class SSLAdapterTestBase : public testing::Test, public sigslot::has_slots<> {
+class SSLAdapterTestBase : public ::testing::Test, public sigslot::has_slots<> {
public:
explicit SSLAdapterTestBase(const rtc::SSLMode& ssl_mode,
const rtc::KeyParams& key_params)
diff --git a/rtc_base/ssl_identity_unittest.cc b/rtc_base/ssl_identity_unittest.cc
index 748041e..8e4d02d 100644
--- a/rtc_base/ssl_identity_unittest.cc
+++ b/rtc_base/ssl_identity_unittest.cc
@@ -191,7 +191,7 @@
return info;
}
-class SSLIdentityTest : public testing::Test {
+class SSLIdentityTest : public ::testing::Test {
public:
void SetUp() override {
identity_rsa1_.reset(SSLIdentity::Generate("test1", rtc::KT_RSA));
@@ -476,7 +476,7 @@
}
}
-class SSLIdentityExpirationTest : public testing::Test {
+class SSLIdentityExpirationTest : public ::testing::Test {
public:
SSLIdentityExpirationTest() {
// Set use of the test RNG to get deterministic expiration timestamp.
diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc
index 7319c01..d9cfe1b 100644
--- a/rtc_base/ssl_stream_adapter_unittest.cc
+++ b/rtc_base/ssl_stream_adapter_unittest.cc
@@ -277,7 +277,7 @@
static const int kBufferCapacity = 1;
static const size_t kDefaultBufferSize = 2048;
-class SSLStreamAdapterTestBase : public testing::Test,
+class SSLStreamAdapterTestBase : public ::testing::Test,
public sigslot::has_slots<> {
public:
SSLStreamAdapterTestBase(
diff --git a/rtc_base/string_encode_unittest.cc b/rtc_base/string_encode_unittest.cc
index cc72e43..d4fe2c5 100644
--- a/rtc_base/string_encode_unittest.cc
+++ b/rtc_base/string_encode_unittest.cc
@@ -17,7 +17,7 @@
namespace rtc {
-class HexEncodeTest : public testing::Test {
+class HexEncodeTest : public ::testing::Test {
public:
HexEncodeTest() : enc_res_(0), dec_res_(0) {
for (size_t i = 0; i < sizeof(data_); ++i) {
diff --git a/rtc_base/strings/string_builder_unittest.cc b/rtc_base/strings/string_builder_unittest.cc
index 6d8b9f2..84717ad 100644
--- a/rtc_base/strings/string_builder_unittest.cc
+++ b/rtc_base/strings/string_builder_unittest.cc
@@ -67,7 +67,7 @@
EXPECT_DEATH(sb << msg, "");
#else
sb << msg;
- EXPECT_THAT(sb.str(), testing::StrEq("Thi"));
+ EXPECT_THAT(sb.str(), ::testing::StrEq("Thi"));
#endif
}
@@ -80,7 +80,7 @@
EXPECT_DEATH(sb << msg, "");
#else
sb << msg;
- EXPECT_THAT(sb.str(), testing::StrEq("12A"));
+ EXPECT_THAT(sb.str(), ::testing::StrEq("12A"));
#endif
}
@@ -96,7 +96,7 @@
// the append has no effect or that it's truncated at the point where the
// buffer ends.
EXPECT_THAT(sb.str(),
- testing::AnyOf(testing::StrEq(""), testing::StrEq("-12")));
+ ::testing::AnyOf(::testing::StrEq(""), ::testing::StrEq("-12")));
#endif
}
@@ -109,7 +109,7 @@
#else
sb << num;
EXPECT_THAT(sb.str(),
- testing::AnyOf(testing::StrEq(""), testing::StrEq("123.")));
+ ::testing::AnyOf(::testing::StrEq(""), ::testing::StrEq("123.")));
#endif
}
@@ -122,7 +122,7 @@
EXPECT_DEATH(sb << msg, "");
#else
sb << msg;
- EXPECT_THAT(sb.str(), testing::StrEq("123"));
+ EXPECT_THAT(sb.str(), ::testing::StrEq("123"));
#endif
}
@@ -135,7 +135,7 @@
EXPECT_DEATH(sb << num, "");
#else
sb << num;
- EXPECT_THAT(sb.str(), testing::StrEq("xyz"));
+ EXPECT_THAT(sb.str(), ::testing::StrEq("xyz"));
#endif
}
@@ -157,7 +157,7 @@
sb << 1 << ":" << 2.1 << ":" << 2.2f << ":" << 78187493520ll << ":"
<< 78187493520ul;
EXPECT_THAT(sb.str(),
- testing::MatchesRegex("1:2.10*:2.20*:78187493520:78187493520"));
+ ::testing::MatchesRegex("1:2.10*:2.20*:78187493520:78187493520"));
}
TEST(StringBuilder, Format) {
diff --git a/rtc_base/synchronization/yield_policy_unittest.cc b/rtc_base/synchronization/yield_policy_unittest.cc
index d7e352b..1220808 100644
--- a/rtc_base/synchronization/yield_policy_unittest.cc
+++ b/rtc_base/synchronization/yield_policy_unittest.cc
@@ -23,7 +23,7 @@
};
} // namespace
TEST(YieldPolicyTest, HandlerReceivesYieldSignalWhenSet) {
- testing::StrictMock<MockYieldHandler> handler;
+ ::testing::StrictMock<MockYieldHandler> handler;
{
Event event;
EXPECT_CALL(handler, YieldExecution()).Times(1);
@@ -42,7 +42,7 @@
TEST(YieldPolicyTest, IsThreadLocal) {
Event events[3];
std::thread other_thread([&]() {
- testing::StrictMock<MockYieldHandler> local_handler;
+ ::testing::StrictMock<MockYieldHandler> local_handler;
// The local handler is never called as we never Wait on this thread.
EXPECT_CALL(local_handler, YieldExecution()).Times(0);
ScopedYieldPolicy policy(&local_handler);
@@ -58,7 +58,7 @@
events[1].Wait(Event::kForever);
// We can set a policy that's active on this thread independently.
- testing::StrictMock<MockYieldHandler> main_handler;
+ ::testing::StrictMock<MockYieldHandler> main_handler;
EXPECT_CALL(main_handler, YieldExecution()).Times(1);
ScopedYieldPolicy policy(&main_handler);
events[2].Wait(Event::kForever);
diff --git a/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc
index 63edcf8..800f1b1 100644
--- a/rtc_base/thread_unittest.cc
+++ b/rtc_base/thread_unittest.cc
@@ -425,7 +425,7 @@
delete thread2;
}
-class AsyncInvokeTest : public testing::Test {
+class AsyncInvokeTest : public ::testing::Test {
public:
void IntCallback(int value) {
EXPECT_EQ(expected_thread_, Thread::Current());
@@ -572,7 +572,7 @@
EXPECT_TRUE(flag2.get());
}
-class GuardedAsyncInvokeTest : public testing::Test {
+class GuardedAsyncInvokeTest : public ::testing::Test {
public:
void IntCallback(int value) {
EXPECT_EQ(expected_thread_, Thread::Current());
diff --git a/rtc_base/time_utils_unittest.cc b/rtc_base/time_utils_unittest.cc
index b4cefb7..b736ad8 100644
--- a/rtc_base/time_utils_unittest.cc
+++ b/rtc_base/time_utils_unittest.cc
@@ -64,7 +64,7 @@
EXPECT_EQ(-ts_diff, rtc::TimeDiff(ts_earlier, ts_later));
}
-class TimestampWrapAroundHandlerTest : public testing::Test {
+class TimestampWrapAroundHandlerTest : public ::testing::Test {
public:
TimestampWrapAroundHandlerTest() {}
@@ -117,7 +117,7 @@
wraparound_handler_.Unwrap(static_cast<uint32_t>(ts & 0xffffffff)));
}
-class TmToSeconds : public testing::Test {
+class TmToSeconds : public ::testing::Test {
public:
TmToSeconds() {
// Set use of the test RNG to get deterministic expiration timestamp.
diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc
index def0104..fe3e9e4 100644
--- a/rtc_base/unittest_main.cc
+++ b/rtc_base/unittest_main.cc
@@ -74,7 +74,7 @@
#endif // WEBRTC_WIN
int main(int argc, char* argv[]) {
- testing::InitGoogleTest(&argc, argv);
+ ::testing::InitGoogleTest(&argc, argv);
rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, false);
if (FLAG_help) {
rtc::FlagList::Print(nullptr, false);
diff --git a/rtc_base/virtual_socket_unittest.cc b/rtc_base/virtual_socket_unittest.cc
index ac0af08..94def0d 100644
--- a/rtc_base/virtual_socket_unittest.cc
+++ b/rtc_base/virtual_socket_unittest.cc
@@ -162,7 +162,7 @@
};
// Note: This test uses a fake clock in addition to a virtual network.
-class VirtualSocketServerTest : public testing::Test {
+class VirtualSocketServerTest : public ::testing::Test {
public:
VirtualSocketServerTest()
: ss_(&fake_clock_),
diff --git a/rtc_base/win32_unittest.cc b/rtc_base/win32_unittest.cc
index 913aa01..0e2abaa 100644
--- a/rtc_base/win32_unittest.cc
+++ b/rtc_base/win32_unittest.cc
@@ -20,7 +20,7 @@
namespace rtc {
-class Win32Test : public testing::Test {
+class Win32Test : public ::testing::Test {
public:
Win32Test() {}
};