Refactorings surrounding HostResolver:...

net/socket/ssl_client_socket_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/ssl_client_socket.h"
 
 #include "net/base/address_list.h"
 #include "net/base/host_resolver.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/ssl_test_util.h"
 #include "net/socket/tcp_client_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 //-----------------------------------------------------------------------------
 
 const net::SSLConfig kDefaultSSLConfig;
 
 class SSLClientSocketTest : public PlatformTest {
  public:
   SSLClientSocketTest()
-      : socket_factory_(net::ClientSocketFactory::GetDefaultFactory()) {
+    : resolver_(net::CreateSystemHostResolver()),
+        socket_factory_(net::ClientSocketFactory::GetDefaultFactory()) {
   }
 
   void StartOKServer() {
     bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
         server_.kHostName, server_.kOKHTTPSPort,
         FilePath(), server_.GetOKCertPath(), std::wstring());
     ASSERT_TRUE(success);
   }
 
   void StartMismatchedServer() {
     bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
         server_.kMismatchedHostName, server_.kOKHTTPSPort,
         FilePath(), server_.GetOKCertPath(), std::wstring());
     ASSERT_TRUE(success);
   }
 
   void StartExpiredServer() {
     bool success = server_.Start(net::TestServerLauncher::ProtoHTTP,
         server_.kHostName, server_.kBadHTTPSPort,
         FilePath(), server_.GetExpiredCertPath(), std::wstring());
     ASSERT_TRUE(success);
   }
 
  protected:
+  scoped_refptr<net::HostResolver> resolver_;
   net::ClientSocketFactory* socket_factory_;
   net::TestServerLauncher server_;
 };
 
 //-----------------------------------------------------------------------------
 
 #if defined(OS_MACOSX)
 // Status 6/19/09:
 //
 // If these tests are enabled on OSX, we choke at the point
@@ skipping 18 matching lines @@
 #define MAYBE_ConnectMismatched ConnectMismatched
 #define MAYBE_Read Read
 #define MAYBE_Read_SmallChunks Read_SmallChunks
 #define MAYBE_Read_Interrupted Read_Interrupted
 #endif
 
 TEST_F(SSLClientSocketTest, MAYBE_Connect) {
   StartOKServer();
 
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(new net::HostResolver);
   TestCompletionCallback callback;
 
   net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);
-  int rv = resolver->Resolve(info, &addr, NULL, NULL);
+  int rv = resolver_->Resolve(info, &addr, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
   net::ClientSocket *transport = new net::TCPClientSocket(addr);
   rv = transport->Connect(&callback);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
@@ skipping 13 matching lines @@
   EXPECT_TRUE(sock->IsConnected());
 
   sock->Disconnect();
   EXPECT_FALSE(sock->IsConnected());
 }
 
 TEST_F(SSLClientSocketTest, MAYBE_ConnectExpired) {
   StartExpiredServer();
 
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(new net::HostResolver);
   TestCompletionCallback callback;
 
   net::HostResolver::RequestInfo info(server_.kHostName, server_.kBadHTTPSPort);
-  int rv = resolver->Resolve(info, &addr, NULL, NULL);
+  int rv = resolver_->Resolve(info, &addr, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
   net::ClientSocket *transport = new net::TCPClientSocket(addr);
   rv = transport->Connect(&callback);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
@@ skipping 12 matching lines @@
 
   // We cannot test sock->IsConnected(), as the NSS implementation disconnects
   // the socket when it encounters an error, whereas other implementations
   // leave it connected.
 }
 
 TEST_F(SSLClientSocketTest, MAYBE_ConnectMismatched) {
   StartMismatchedServer();
 
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(new net::HostResolver);
   TestCompletionCallback callback;
 
   net::HostResolver::RequestInfo info(server_.kMismatchedHostName,
                                       server_.kOKHTTPSPort);
-  int rv = resolver->Resolve(info, &addr, NULL, NULL);
+  int rv = resolver_->Resolve(info, &addr, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
   net::ClientSocket *transport = new net::TCPClientSocket(addr);
   rv = transport->Connect(&callback);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
@@ skipping 17 matching lines @@
 
 // TODO(wtc): Add unit tests for IsConnectedAndIdle:
 //   - Server closes an SSL connection (with a close_notify alert message).
 //   - Server closes the underlying TCP connection directly.
 //   - Server sends data unexpectedly.
 
 TEST_F(SSLClientSocketTest, MAYBE_Read) {
   StartOKServer();
 
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(new net::HostResolver);
   TestCompletionCallback callback;
 
   net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);
-  int rv = resolver->Resolve(info, &addr, &callback, NULL);
+  int rv = resolver_->Resolve(info, &addr, &callback, NULL);
   EXPECT_EQ(net::ERR_IO_PENDING, rv);
 
   rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
 
   net::ClientSocket *transport = new net::TCPClientSocket(addr);
   rv = transport->Connect(&callback);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
@@ skipping 36 matching lines @@
     EXPECT_GE(rv, 0);
     if (rv <= 0)
       break;
   }
 }
 
 TEST_F(SSLClientSocketTest, MAYBE_Read_SmallChunks) {
   StartOKServer();
 
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(new net::HostResolver);
   TestCompletionCallback callback;
 
   net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);
-  int rv = resolver->Resolve(info, &addr, NULL, NULL);
+  int rv = resolver_->Resolve(info, &addr, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
   net::ClientSocket *transport = new net::TCPClientSocket(addr);
   rv = transport->Connect(&callback);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
@@ skipping 31 matching lines @@
     EXPECT_GE(rv, 0);
     if (rv <= 0)
       break;
   }
 }
 
 TEST_F(SSLClientSocketTest, MAYBE_Read_Interrupted) {
   StartOKServer();
 
   net::AddressList addr;
-  scoped_refptr<net::HostResolver> resolver(new net::HostResolver);
   TestCompletionCallback callback;
 
   net::HostResolver::RequestInfo info(server_.kHostName, server_.kOKHTTPSPort);
-  int rv = resolver->Resolve(info, &addr, NULL, NULL);
+  int rv = resolver_->Resolve(info, &addr, NULL, NULL);
   EXPECT_EQ(net::OK, rv);
 
   net::ClientSocket *transport = new net::TCPClientSocket(addr);
   rv = transport->Connect(&callback);
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
   EXPECT_EQ(net::OK, rv);
 
   scoped_ptr<net::SSLClientSocket> sock(
       socket_factory_->CreateSSLClientSocket(transport,
@@ skipping 23 matching lines @@
   // Do a partial read and then exit.  This test should not crash!
   scoped_refptr<net::IOBuffer> buf = new net::IOBuffer(512);
   rv = sock->Read(buf, 512, &callback);
   EXPECT_TRUE(rv >= 0 || rv == net::ERR_IO_PENDING);
 
   if (rv == net::ERR_IO_PENDING)
     rv = callback.WaitForResult();
 
   EXPECT_NE(rv, 0);
 }