Add more unit tests for net/base/host_resolver.

net/base/host_resolver_unittest.cc

Index: net/base/host_resolver_unittest.cc
diff --git a/net/base/host_resolver_unittest.cc b/net/base/host_resolver_unittest.cc
index 018246d11abc54cb986ebc130929dddada93de2f..2d13734988d77596a9b9fd294cbdabaef4f3db8c 100644
--- a/net/base/host_resolver_unittest.cc
+++ b/net/base/host_resolver_unittest.cc
@@ -11,19 +11,127 @@
 #include <netdb.h>
 #endif
 
+#include <string>
+
+#include "base/compiler_specific.h"
+#include "base/message_loop.h"
+#include "base/ref_counted.h"
 #include "net/base/address_list.h"
+#include "net/base/completion_callback.h"
+#include "net/base/host_resolver_unittest.h"
+#include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using net::RuleBasedHostMapper;
+using net::ScopedHostMapper;
+using net::WaitingHostMapper;
+
 namespace {
 
-TEST(HostResolverTest, NumericAddresses) {
+class HostResolverTest : public testing::Test {
+ public:
+  HostResolverTest()
+      : callback_called_(false),
+        ALLOW_THIS_IN_INITIALIZER_LIST(
+            callback_(this, &HostResolverTest::OnLookupFinished)) {
+  }
+
+ protected:
+  bool callback_called_;
+  int callback_result_;
+  net::CompletionCallbackImpl<HostResolverTest> callback_;
+
+ private:
+  void OnLookupFinished(int result) {
+    callback_called_ = true;
+    callback_result_ = result;
+    MessageLoop::current()->Quit();
+  }
+};
+
+TEST_F(HostResolverTest, SynchronousLookup) {
+  net::HostResolver host_resolver;
+  net::AddressList adrlist;
+  const int kPortnum = 80;
+
+  scoped_refptr<RuleBasedHostMapper> mapper = new RuleBasedHostMapper();
+  mapper->AddRule("just.testing", "192.168.1.42");
+  ScopedHostMapper scoped_mapper(mapper.get());
+
+  int err = host_resolver.Resolve("just.testing", kPortnum, &adrlist, NULL);
+  EXPECT_EQ(net::OK, err);
+
+  const struct addrinfo* ainfo = adrlist.head();
+  EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next);
+  EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen);
+
+  const struct sockaddr* sa = ainfo->ai_addr;
+  const struct sockaddr_in* sa_in = (const struct sockaddr_in*) sa;
+  EXPECT_TRUE(htons(kPortnum) == sa_in->sin_port);
+  EXPECT_TRUE(htonl(0xc0a8012a) == sa_in->sin_addr.s_addr);
+}
+
+TEST_F(HostResolverTest, AsynchronousLookup) {
+  net::HostResolver host_resolver;
+  net::AddressList adrlist;
+  const int kPortnum = 80;
+
+  scoped_refptr<RuleBasedHostMapper> mapper = new RuleBasedHostMapper();
+  mapper->AddRule("just.testing", "192.168.1.42");
+  ScopedHostMapper scoped_mapper(mapper.get());
+
+  int err = host_resolver.Resolve("just.testing", kPortnum, &adrlist,
+                                  &callback_);
+  EXPECT_EQ(net::ERR_IO_PENDING, err);
+
+  MessageLoop::current()->Run();
+
+  ASSERT_TRUE(callback_called_);
+  ASSERT_EQ(net::OK, callback_result_);
+
+  const struct addrinfo* ainfo = adrlist.head();
+  EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next);
+  EXPECT_EQ(sizeof(struct sockaddr_in), ainfo->ai_addrlen);
+
+  const struct sockaddr* sa = ainfo->ai_addr;
+  const struct sockaddr_in* sa_in = (const struct sockaddr_in*) sa;
+  EXPECT_TRUE(htons(kPortnum) == sa_in->sin_port);
+  EXPECT_TRUE(htonl(0xc0a8012a) == sa_in->sin_addr.s_addr);
+}
+
+TEST_F(HostResolverTest, CanceledAsynchronousLookup) {
+  scoped_refptr<WaitingHostMapper> mapper = new WaitingHostMapper();
+  ScopedHostMapper scoped_mapper(mapper.get());
+
+  {
+    net::HostResolver host_resolver;
+    net::AddressList adrlist;
+    const int kPortnum = 80;
+
+    int err = host_resolver.Resolve("just.testing", kPortnum, &adrlist,
+                                    &callback_);
+    EXPECT_EQ(net::ERR_IO_PENDING, err);
+
+    // Make sure we will exit the queue even when callback is not called.
+    MessageLoop::current()->PostDelayedTask(FROM_HERE,
+                                            new MessageLoop::QuitTask(),
+                                            1000);
+    MessageLoop::current()->Run();
+  }
+
+  mapper->Signal();
+
+  EXPECT_FALSE(callback_called_);
+}
+
+TEST_F(HostResolverTest, NumericAddresses) {
   // Stevens says dotted quads with AI_UNSPEC resolve to a single sockaddr_in.
 
   net::HostResolver host_resolver;
   net::AddressList adrlist;
   const int kPortnum = 5555;
   int err = host_resolver.Resolve("127.0.0.1", kPortnum, &adrlist, NULL);
-  EXPECT_EQ(0, err);
+  EXPECT_EQ(net::OK, err);
 
   const struct addrinfo* ainfo = adrlist.head();
   EXPECT_EQ(static_cast<addrinfo*>(NULL), ainfo->ai_next);