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

Unified Diff: net/dns/mojo_host_resolver_impl_unittest.cc

Issue 892393005: Implement browser-side host resolver Mojo service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-interfaces
Patch Set: Address review comments. Created 5 years, 10 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
Index: net/dns/mojo_host_resolver_impl_unittest.cc
diff --git a/net/dns/mojo_host_resolver_impl_unittest.cc b/net/dns/mojo_host_resolver_impl_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ffd7f1c853d2f6f0d6a7cdcbe24472ceea27109a
--- /dev/null
+++ b/net/dns/mojo_host_resolver_impl_unittest.cc
@@ -0,0 +1,263 @@
+// Copyright 2015 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/dns/mojo_host_resolver_impl.h"
+
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
+#include "base/time/time.h"
+#include "net/base/address_list.h"
+#include "net/base/net_errors.h"
+#include "net/base/net_util.h"
+#include "net/dns/mock_host_resolver.h"
+#include "net/dns/type_converters.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
+
+namespace net {
+
+namespace {
+
+class TestRequestClient : public interfaces::HostResolverRequestClient {
+ public:
+ explicit TestRequestClient(interfaces::HostResolverRequestClientPtr* ptr)
+ : done_(false), binding_(this) {
Sam McNally 2015/02/06 07:12:32 binding_(this, ptr)
Anand Mistry (off Chromium) 2015/02/08 23:09:21 Done.
+ binding_.Bind(ptr);
+ }
+
+ void WaitForResult();
+
+ // Overridden from interfaces::HostResolverRequestClient.
+ void ReportResult(int32_t error, interfaces::AddressListPtr results) override;
+
+ int32_t error_;
+ interfaces::AddressListPtr results_;
+
+ private:
+ bool done_;
+ base::Closure run_loop_quit_closure_;
+
+ mojo::Binding<interfaces::HostResolverRequestClient> binding_;
+};
+
+void TestRequestClient::WaitForResult() {
+ if (done_)
+ return;
+
+ base::RunLoop run_loop;
+ run_loop_quit_closure_ = run_loop.QuitClosure();
+ run_loop.Run();
+ ASSERT_TRUE(done_);
+}
+
+void TestRequestClient::ReportResult(int32_t error,
+ interfaces::AddressListPtr results) {
+ ASSERT_FALSE(done_);
+ if (!run_loop_quit_closure_.is_null()) {
+ run_loop_quit_closure_.Run();
Sam McNally 2015/02/06 07:12:32 Before the ASSERT please.
Anand Mistry (off Chromium) 2015/02/08 23:09:21 Done.
+ }
+ error_ = error;
+ results_ = results.Pass();
+ done_ = true;
+}
+
+} // namespace
+
+class MojoHostResolverImplTest : public testing::Test {
+ protected:
+ void SetUp() override {
+ mock_host_resolver_.rules()->AddRule("example.com", "1.2.3.4");
+ mock_host_resolver_.rules()->AddRule("chromium.org", "8.8.8.8");
+ mock_host_resolver_.rules()->AddSimulatedFailure("failure.fail");
+
+ resolver_service_.reset(new MojoHostResolverImpl(&mock_host_resolver_));
+ resolver_service_binding_.reset(
+ new mojo::Binding<interfaces::HostResolver>(resolver_service_.get()));
+ resolver_service_binding_->Bind(&resolver_service_ptr_);
+ }
+
+ interfaces::HostResolverRequestInfoPtr CreateRequest(const std::string& host,
+ uint16_t port,
+ bool is_my_ip_address) {
+ interfaces::HostResolverRequestInfoPtr request =
+ interfaces::HostResolverRequestInfo::New();
+ request->host = host;
+ request->port = port;
+ request->address_family = interfaces::ADDRESS_FAMILY_IPV4;
+ request->is_my_ip_address = is_my_ip_address;
+ return request.Pass();
+ }
+
+ // Wait until the resolver service has received |num| resolve requests.
+ void WaitForRequests(size_t num) {
+ // Neither MojoHostResolverImpl nor MockHostResolver allow us to wait for
+ // a specific number of requests, so just poll. Additionally, we can't just
+ // wait until the message loop is idle and assume that requests have been
+ // made, because Mojo internally ping-pongs between threads. So, the current
+ // message loop may appear idle, but another loop could have callbacks
+ // pending.
+ while (mock_host_resolver_.num_resolve() < num) {
+ base::RunLoop run_loop;
+ base::MessageLoop::current()->PostDelayedTask(
+ FROM_HERE, run_loop.QuitClosure(),
+ base::TimeDelta::FromMilliseconds(10));
+ run_loop.Run();
+ }
+ }
+
+ MockHostResolver mock_host_resolver_;
+ scoped_ptr<MojoHostResolverImpl> resolver_service_;
+
+ scoped_ptr<mojo::Binding<interfaces::HostResolver>> resolver_service_binding_;
+ interfaces::HostResolverPtr resolver_service_ptr_;
+};
+
+TEST_F(MojoHostResolverImplTest, Resolve) {
+ interfaces::HostResolverRequestClientPtr client_ptr;
+ TestRequestClient client(&client_ptr);
+
+ interfaces::HostResolverRequestInfoPtr request =
+ CreateRequest("example.com", 80, false);
+ resolver_service_ptr_->Resolve(request.Pass(), client_ptr.Pass());
+ client.WaitForResult();
+
+ EXPECT_EQ(net::OK, client.error_);
+ AddressList address_list = (*client.results_).To<AddressList>();
+ EXPECT_EQ(1U, address_list.size());
+ EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
+}
+
+TEST_F(MojoHostResolverImplTest, ResolveSynchronous) {
+ interfaces::HostResolverRequestClientPtr client_ptr;
+ TestRequestClient client(&client_ptr);
+
+ mock_host_resolver_.set_synchronous_mode(true);
+
+ interfaces::HostResolverRequestInfoPtr request =
+ CreateRequest("example.com", 80, false);
+ resolver_service_ptr_->Resolve(request.Pass(), client_ptr.Pass());
+ client.WaitForResult();
+
+ EXPECT_EQ(net::OK, client.error_);
+ AddressList address_list = (*client.results_).To<AddressList>();
+ EXPECT_EQ(1U, address_list.size());
+ EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
+}
+
+TEST_F(MojoHostResolverImplTest, ResolveMultiple) {
+ interfaces::HostResolverRequestClientPtr client1_ptr;
+ TestRequestClient client1(&client1_ptr);
+ interfaces::HostResolverRequestClientPtr client2_ptr;
+ TestRequestClient client2(&client2_ptr);
+
+ mock_host_resolver_.set_ondemand_mode(true);
+
+ interfaces::HostResolverRequestInfoPtr request1 =
+ CreateRequest("example.com", 80, false);
+ resolver_service_ptr_->Resolve(request1.Pass(), client1_ptr.Pass());
+ interfaces::HostResolverRequestInfoPtr request2 =
+ CreateRequest("chromium.org", 80, false);
+ resolver_service_ptr_->Resolve(request2.Pass(), client2_ptr.Pass());
+ WaitForRequests(2);
+ mock_host_resolver_.ResolveAllPending();
+
+ client1.WaitForResult();
+ client2.WaitForResult();
+
+ EXPECT_EQ(net::OK, client1.error_);
+ AddressList address_list = (*client1.results_).To<AddressList>();
+ EXPECT_EQ(1U, address_list.size());
+ EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
+ EXPECT_EQ(net::OK, client2.error_);
+ address_list = (*client2.results_).To<AddressList>();
+ EXPECT_EQ(1U, address_list.size());
+ EXPECT_EQ("8.8.8.8:80", address_list[0].ToString());
+}
+
+TEST_F(MojoHostResolverImplTest, ResolveDuplicate) {
+ interfaces::HostResolverRequestClientPtr client1_ptr;
+ TestRequestClient client1(&client1_ptr);
+ interfaces::HostResolverRequestClientPtr client2_ptr;
+ TestRequestClient client2(&client2_ptr);
+
+ mock_host_resolver_.set_ondemand_mode(true);
+
+ interfaces::HostResolverRequestInfoPtr request1 =
+ CreateRequest("example.com", 80, false);
+ resolver_service_ptr_->Resolve(request1.Pass(), client1_ptr.Pass());
+ interfaces::HostResolverRequestInfoPtr request2 =
+ CreateRequest("example.com", 80, false);
+ resolver_service_ptr_->Resolve(request2.Pass(), client2_ptr.Pass());
+ WaitForRequests(2);
+ mock_host_resolver_.ResolveAllPending();
+
+ client1.WaitForResult();
+ client2.WaitForResult();
+
+ EXPECT_EQ(net::OK, client1.error_);
+ AddressList address_list = (*client1.results_).To<AddressList>();
+ EXPECT_EQ(1U, address_list.size());
+ EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
+ EXPECT_EQ(net::OK, client2.error_);
+ address_list = (*client2.results_).To<AddressList>();
+ EXPECT_EQ(1U, address_list.size());
+ EXPECT_EQ("1.2.3.4:80", address_list[0].ToString());
+}
+
+TEST_F(MojoHostResolverImplTest, ResolveFailure) {
+ interfaces::HostResolverRequestClientPtr client_ptr;
+ TestRequestClient client(&client_ptr);
+
+ interfaces::HostResolverRequestInfoPtr request =
+ CreateRequest("failure.fail", 80, false);
+ resolver_service_ptr_->Resolve(request.Pass(), client_ptr.Pass());
+ client.WaitForResult();
+
+ EXPECT_EQ(net::ERR_NAME_NOT_RESOLVED, client.error_);
+ EXPECT_TRUE(client.results_.is_null());
+}
+
+TEST_F(MojoHostResolverImplTest, DestroyClient) {
+ interfaces::HostResolverRequestClientPtr client_ptr;
+ scoped_ptr<TestRequestClient> client(new TestRequestClient(&client_ptr));
+
+ mock_host_resolver_.set_ondemand_mode(true);
+
+ interfaces::HostResolverRequestInfoPtr request =
+ CreateRequest("example.com", 80, false);
+ resolver_service_ptr_->Resolve(request.Pass(), client_ptr.Pass());
+ WaitForRequests(1);
+
+ client.reset();
+ base::RunLoop().RunUntilIdle();
+
+ mock_host_resolver_.ResolveAllPending();
+ base::RunLoop().RunUntilIdle();
+}
+
+TEST_F(MojoHostResolverImplTest, DestroyService) {
+ interfaces::HostResolverRequestClientPtr client_ptr;
+ TestRequestClient client(&client_ptr);
+
+ mock_host_resolver_.set_ondemand_mode(true);
+
+ interfaces::HostResolverRequestInfoPtr request =
+ CreateRequest("example.com", 80, false);
+ resolver_service_ptr_->Resolve(request.Pass(), client_ptr.Pass());
+ WaitForRequests(1);
+
+ resolver_service_binding_.reset();
+ resolver_service_.reset();
+ base::RunLoop().RunUntilIdle();
+
+ mock_host_resolver_.ResolveAllPending();
+ base::RunLoop().RunUntilIdle();
+
+ EXPECT_FALSE(client_ptr);
Sam McNally 2015/02/06 07:12:32 I don't think this is testing what you think it is
Anand Mistry (off Chromium) 2015/02/08 23:09:21 Done.
+}
+
+} // namespace net

Powered by Google App Engine
This is Rietveld 408576698