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

Unified Diff: net/udp/udp_socket_unittest.cc

Issue 6658027: UDP sockets implementation for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typo Created 9 years, 9 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_libevent.cc ('k') | net/udp/udp_socket_win.h » ('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 ef437316bc09647b74593ebdd85dc59df06c42a4..23caf22721d4966e14550cce6eb0ae4ac28f665e 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -107,7 +107,7 @@ class UDPSocketTest : public PlatformTest {
return bytes_sent;
}
- private:
+ protected:
static const int kMaxRead = 1024;
scoped_refptr<IOBufferWithSize> buffer_;
IPEndPoint recv_from_address_;
@@ -223,7 +223,7 @@ TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) {
struct TestData {
std::string remote_address;
std::string local_address;
- bool is_ipv6;
+ bool may_fail;
} tests[] = {
{ "127.0.00.1", "127.0.0.1", false },
{ "192.168.1.1", "127.0.0.1", false },
@@ -231,6 +231,9 @@ TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) {
{ "2001:db8:0::42", "::1", true },
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); i++) {
+ SCOPED_TRACE(std::string("Connecting from ") + tests[i].local_address +
+ std::string(" to ") + tests[i].remote_address);
+
net::IPAddressNumber ip_number;
net::ParseIPLiteralToNumber(tests[i].remote_address, &ip_number);
net::IPEndPoint remote_address(ip_number, 80);
@@ -239,6 +242,12 @@ TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) {
UDPClientSocket client(NULL, NetLog::Source());
int rv = client.Connect(remote_address);
+ if (tests[i].may_fail && rv == ERR_ADDRESS_UNREACHABLE) {
+ // Connect() may return ERR_ADDRESS_UNREACHABLE for IPv6
+ // addresses if IPv6 is not configured.
+ continue;
+ }
+
EXPECT_LE(ERR_IO_PENDING, rv);
IPEndPoint fetched_local_address;
@@ -260,21 +269,52 @@ TEST_F(UDPSocketTest, ClientGetLocalPeerAddresses) {
}
TEST_F(UDPSocketTest, ServerGetLocalAddress) {
- // TODO(mbelshe): implement me
+ IPEndPoint bind_address;
+ CreateUDPAddress("127.0.0.1", 0, &bind_address);
+ UDPServerSocket server(NULL, NetLog::Source());
+ int rv = server.Listen(bind_address);
+ EXPECT_EQ(OK, rv);
+
+ IPEndPoint local_address;
+ rv = server.GetLocalAddress(&local_address);
+ EXPECT_EQ(rv, 0);
+
+ // Verify that port was allocated.
+ EXPECT_GE(local_address.port(), 0);
+ EXPECT_EQ(local_address.address(), bind_address.address());
}
TEST_F(UDPSocketTest, ServerGetPeerAddress) {
- // TODO(mbelshe): implement me
+ IPEndPoint bind_address;
+ CreateUDPAddress("127.0.0.1", 0, &bind_address);
+ UDPServerSocket server(NULL, NetLog::Source());
+ int rv = server.Listen(bind_address);
+ EXPECT_EQ(OK, rv);
+
+ IPEndPoint peer_address;
+ rv = server.GetPeerAddress(&peer_address);
+ EXPECT_EQ(rv, ERR_SOCKET_NOT_CONNECTED);
}
-} // namespace
+// Close the socket while read is pending.
+TEST_F(UDPSocketTest, CloseWithPendingRead) {
+ IPEndPoint bind_address;
+ CreateUDPAddress("127.0.0.1", 0, &bind_address);
+ UDPServerSocket server(NULL, NetLog::Source());
+ int rv = server.Listen(bind_address);
+ EXPECT_EQ(OK, rv);
-} // namespace net
+ TestCompletionCallback callback;
+ IPEndPoint from;
+ rv = server.RecvFrom(buffer_, kMaxRead, &from, &callback);
+ EXPECT_EQ(rv, ERR_IO_PENDING);
-int main(int argc, char** argv) {
- // Record histograms, so we can get histograms data in tests.
- base::StatisticsRecorder recorder;
- NetTestSuite test_suite(argc, argv);
+ server.Close();
- return test_suite.Run();
+ EXPECT_TRUE(callback.have_result());
+ EXPECT_EQ(callback.GetResult(rv), ERR_ABORTED);
}
+
+} // namespace
+
+} // namespace net
« no previous file with comments | « net/udp/udp_socket_libevent.cc ('k') | net/udp/udp_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698