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

Unified Diff: net/udp/udp_socket_unittest.cc

Issue 2315613002: Extracted NetLog class's inner enum types into their own enum classes and (Closed)
Patch Set: Ran "git cl format" on code. Much formatting ensued. Created 4 years, 3 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 | « net/udp/udp_socket_posix.cc ('k') | net/udp/udp_socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/udp/udp_socket_unittest.cc
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc
index 07fe05732c517a37bddf762c218184097391e5c4..73d748580777d8ce41e538b1e19592eb52f54cd7 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -20,6 +20,7 @@
#include "net/base/ip_endpoint.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
+#include "net/log/net_log_event_type.h"
#include "net/log/test_net_log.h"
#include "net/log/test_net_log_entry.h"
#include "net/log/test_net_log_util.h"
@@ -231,33 +232,40 @@ void UDPSocketTest::ConnectTest(bool use_nonblocking_io) {
server_log.GetEntries(&server_entries);
EXPECT_EQ(5u, server_entries.size());
EXPECT_TRUE(
- LogContainsBeginEvent(server_entries, 0, NetLog::TYPE_SOCKET_ALIVE));
- EXPECT_TRUE(LogContainsEvent(
- server_entries, 1, NetLog::TYPE_UDP_BYTES_RECEIVED, NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEvent(server_entries, 2, NetLog::TYPE_UDP_BYTES_SENT,
- NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEvent(
- server_entries, 3, NetLog::TYPE_UDP_BYTES_RECEIVED, NetLog::PHASE_NONE));
+ LogContainsBeginEvent(server_entries, 0, NetLogEventType::SOCKET_ALIVE));
+ EXPECT_TRUE(LogContainsEvent(server_entries, 1,
+ NetLogEventType::UDP_BYTES_RECEIVED,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(LogContainsEvent(server_entries, 2,
+ NetLogEventType::UDP_BYTES_SENT,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(LogContainsEvent(server_entries, 3,
+ NetLogEventType::UDP_BYTES_RECEIVED,
+ NetLogEventPhase::NONE));
EXPECT_TRUE(
- LogContainsEndEvent(server_entries, 4, NetLog::TYPE_SOCKET_ALIVE));
+ LogContainsEndEvent(server_entries, 4, NetLogEventType::SOCKET_ALIVE));
// Check the client's log.
TestNetLogEntry::List client_entries;
client_log.GetEntries(&client_entries);
EXPECT_EQ(7u, client_entries.size());
EXPECT_TRUE(
- LogContainsBeginEvent(client_entries, 0, NetLog::TYPE_SOCKET_ALIVE));
+ LogContainsBeginEvent(client_entries, 0, NetLogEventType::SOCKET_ALIVE));
EXPECT_TRUE(
- LogContainsBeginEvent(client_entries, 1, NetLog::TYPE_UDP_CONNECT));
- EXPECT_TRUE(LogContainsEndEvent(client_entries, 2, NetLog::TYPE_UDP_CONNECT));
- EXPECT_TRUE(LogContainsEvent(client_entries, 3, NetLog::TYPE_UDP_BYTES_SENT,
- NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEvent(
- client_entries, 4, NetLog::TYPE_UDP_BYTES_RECEIVED, NetLog::PHASE_NONE));
- EXPECT_TRUE(LogContainsEvent(client_entries, 5, NetLog::TYPE_UDP_BYTES_SENT,
- NetLog::PHASE_NONE));
+ LogContainsBeginEvent(client_entries, 1, NetLogEventType::UDP_CONNECT));
EXPECT_TRUE(
- LogContainsEndEvent(client_entries, 6, NetLog::TYPE_SOCKET_ALIVE));
+ LogContainsEndEvent(client_entries, 2, NetLogEventType::UDP_CONNECT));
+ EXPECT_TRUE(LogContainsEvent(client_entries, 3,
+ NetLogEventType::UDP_BYTES_SENT,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(LogContainsEvent(client_entries, 4,
+ NetLogEventType::UDP_BYTES_RECEIVED,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(LogContainsEvent(client_entries, 5,
+ NetLogEventType::UDP_BYTES_SENT,
+ NetLogEventPhase::NONE));
+ EXPECT_TRUE(
+ LogContainsEndEvent(client_entries, 6, NetLogEventType::SOCKET_ALIVE));
}
TEST_F(UDPSocketTest, Connect) {
« no previous file with comments | « net/udp/udp_socket_posix.cc ('k') | net/udp/udp_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698