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

Unified Diff: webrtc/base/physicalsocketserver_unittest.cc

Issue 2819473004: base/testutils.h: Use namespace webrtc::testing instead of plain testing (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/httpserver_unittest.cc ('k') | webrtc/base/socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/physicalsocketserver_unittest.cc
diff --git a/webrtc/base/physicalsocketserver_unittest.cc b/webrtc/base/physicalsocketserver_unittest.cc
index 0eea1d55c1c8c7477efb0fb342ce30365adc577f..de0d485289a9d11f4b54f88b18a585ea0230af6e 100644
--- a/webrtc/base/physicalsocketserver_unittest.cc
+++ b/webrtc/base/physicalsocketserver_unittest.cc
@@ -185,7 +185,7 @@ TEST_F(PhysicalSocketTest, TestConnectFailIPv4) {
}
void PhysicalSocketTest::ConnectInternalAcceptError(const IPAddress& loopback) {
- testing::StreamSink sink;
+ webrtc::testing::StreamSink sink;
SocketAddress accept_addr;
// Create two clients.
@@ -210,7 +210,7 @@ void PhysicalSocketTest::ConnectInternalAcceptError(const IPAddress& loopback) {
EXPECT_EQ(AsyncSocket::CS_CONNECTING, server->GetState());
// Ensure no pending server connections, since we haven't done anything yet.
- EXPECT_FALSE(sink.Check(server.get(), testing::SSE_READ));
+ EXPECT_FALSE(sink.Check(server.get(), webrtc::testing::SSE_READ));
EXPECT_TRUE(nullptr == server->Accept(&accept_addr));
EXPECT_TRUE(accept_addr.IsNil());
@@ -221,11 +221,12 @@ void PhysicalSocketTest::ConnectInternalAcceptError(const IPAddress& loopback) {
// Client is connecting, outcome not yet determined.
EXPECT_EQ(AsyncSocket::CS_CONNECTING, client1->GetState());
- EXPECT_FALSE(sink.Check(client1.get(), testing::SSE_OPEN));
- EXPECT_FALSE(sink.Check(client1.get(), testing::SSE_CLOSE));
+ EXPECT_FALSE(sink.Check(client1.get(), webrtc::testing::SSE_OPEN));
+ EXPECT_FALSE(sink.Check(client1.get(), webrtc::testing::SSE_CLOSE));
// Server has pending connection, try to accept it (will fail).
- EXPECT_TRUE_WAIT((sink.Check(server.get(), testing::SSE_READ)), kTimeout);
+ EXPECT_TRUE_WAIT((sink.Check(server.get(), webrtc::testing::SSE_READ)),
+ kTimeout);
// Simulate "::accept" returning an error.
SetFailAccept(true);
std::unique_ptr<AsyncSocket> accepted(server->Accept(&accept_addr));
@@ -233,7 +234,7 @@ void PhysicalSocketTest::ConnectInternalAcceptError(const IPAddress& loopback) {
ASSERT_TRUE(accept_addr.IsNil());
// Ensure no more pending server connections.
- EXPECT_FALSE(sink.Check(server.get(), testing::SSE_READ));
+ EXPECT_FALSE(sink.Check(server.get(), webrtc::testing::SSE_READ));
EXPECT_TRUE(nullptr == server->Accept(&accept_addr));
EXPECT_TRUE(accept_addr.IsNil());
@@ -244,11 +245,12 @@ void PhysicalSocketTest::ConnectInternalAcceptError(const IPAddress& loopback) {
// Client is connecting, outcome not yet determined.
EXPECT_EQ(AsyncSocket::CS_CONNECTING, client2->GetState());
- EXPECT_FALSE(sink.Check(client2.get(), testing::SSE_OPEN));
- EXPECT_FALSE(sink.Check(client2.get(), testing::SSE_CLOSE));
+ EXPECT_FALSE(sink.Check(client2.get(), webrtc::testing::SSE_OPEN));
+ EXPECT_FALSE(sink.Check(client2.get(), webrtc::testing::SSE_CLOSE));
// Server has pending connection, try to accept it (will succeed).
- EXPECT_TRUE_WAIT((sink.Check(server.get(), testing::SSE_READ)), kTimeout);
+ EXPECT_TRUE_WAIT((sink.Check(server.get(), webrtc::testing::SSE_READ)),
+ kTimeout);
SetFailAccept(false);
std::unique_ptr<AsyncSocket> accepted2(server->Accept(&accept_addr));
ASSERT_TRUE(accepted2);
« no previous file with comments | « webrtc/base/httpserver_unittest.cc ('k') | webrtc/base/socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698