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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_cache_lookup_manager_unittest.cc

Issue 2503473004: Server push cancellation: add a new class HttpCacheLookupManager which implements ServerPushDelegate (Closed)
Patch Set: address rch's comments Created 4 years, 1 month 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
« net/http/http_cache_lookup_manager.cc ('K') | « net/http/http_cache_lookup_manager.cc ('k') | net/net.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_cache_lookup_manager_unittest.cc
diff --git a/net/http/http_cache_lookup_manager_unittest.cc b/net/http/http_cache_lookup_manager_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9c821eb352ea9be58716783522c274ec0d3f82f0
--- /dev/null
+++ b/net/http/http_cache_lookup_manager_unittest.cc
@@ -0,0 +1,263 @@
+// Copyright (c) 2016 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 <string>
+
+#include "base/run_loop.h"
+#include "net/base/net_errors.h"
+#include "net/base/test_completion_callback.h"
+#include "net/http/http_cache_lookup_manager.h"
+#include "net/http/http_transaction_test_util.h"
+#include "net/http/mock_http_cache.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using net::test::IsOk;
+
+namespace net {
+
+namespace {
+
+class MockServerPushHelper : public ServerPushDelegate::ServerPushHelper {
+ public:
+ explicit MockServerPushHelper(const GURL& url) : request_url_(url) {}
+
+ const GURL& GetURL() override { return request_url_; }
+
+ MOCK_METHOD0(Cancel, void());
+
+ private:
+ const GURL request_url_;
+};
+
+std::unique_ptr<MockTransaction> CreateMockTransaction(const GURL& url) {
+ MockTransaction mock_trans = {
+ url.spec().c_str(), "GET", base::Time(), "", LOAD_NORMAL,
+ "HTTP/1.1 200 OK",
+ "Date: Wed, 28 Nov 2007 09:40:09 GMT\n"
+ "Last-Modified: Wed, 28 Nov 2007 00:40:09 GMT\n",
+ base::Time(), "<html><body>Google Blah Blah</body></html>",
+ TEST_MODE_NORMAL, nullptr, nullptr, nullptr, 0, 0, OK};
+ return base::MakeUnique<MockTransaction>(mock_trans);
+}
+
+void PopulateCacheEntry(HttpCache* cache, const GURL& request_url) {
+ TestCompletionCallback callback;
+
+ std::unique_ptr<MockTransaction> mock_trans =
+ CreateMockTransaction(request_url);
+ AddMockTransaction(mock_trans.get());
+
+ MockHttpRequest request(*(mock_trans.get()));
+
+ std::unique_ptr<HttpTransaction> trans;
+ int rv = cache->CreateTransaction(DEFAULT_PRIORITY, &trans);
+ EXPECT_THAT(rv, IsOk());
+ ASSERT_TRUE(trans.get());
+
+ rv = trans->Start(&request, callback.callback(), NetLogWithSource());
+ base::RunLoop().RunUntilIdle();
+
+ if (rv == ERR_IO_PENDING)
+ rv = callback.WaitForResult();
+
+ ASSERT_EQ(mock_trans->return_code, rv);
+ if (OK != rv)
+ return;
+
+ const HttpResponseInfo* response = trans->GetResponseInfo();
+ ASSERT_TRUE(response);
+
+ std::string content;
+ rv = ReadTransaction(trans.get(), &content);
+
+ EXPECT_THAT(rv, IsOk());
+ std::string expected(mock_trans->data);
+ EXPECT_EQ(expected, content);
+ RemoveMockTransaction(mock_trans.get());
+}
+
+} // namespace
+
+TEST(HttpCacheLookupManagerTest, ServerPushMissCache) {
+ MockHttpCache mock_cache;
+ HttpCacheLookupManager push_delegate(mock_cache.http_cache(),
+ NetLogWithSource());
+ GURL request_url("http://www.example.com/pushed.jpg");
+
+ std::unique_ptr<MockServerPushHelper> push_helper(
jkarlin 2016/11/21 14:40:41 std::unique_ptr<MockServerPushHelper> push_helper
Zhongyi Shi 2016/11/22 00:09:30 Done.
+ new MockServerPushHelper(request_url));
+ MockServerPushHelper* push_helper_ptr = push_helper.get();
+
+ // Receive a server push and should not cancel the push.
+ EXPECT_CALL(*push_helper_ptr, Cancel()).Times(0);
+ push_delegate.OnPush(std::move(push_helper));
+ base::RunLoop().RunUntilIdle();
+
+ // Make sure no network transaction is created.
+ EXPECT_EQ(0, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(0, mock_cache.disk_cache()->open_count());
+ EXPECT_EQ(0, mock_cache.disk_cache()->create_count());
+}
+
+TEST(HttpCacheLookupManagerTest, ServerPushDoNotCreateCacheEntry) {
+ MockHttpCache mock_cache;
+ HttpCacheLookupManager push_delegate(mock_cache.http_cache(),
+ NetLogWithSource());
+ GURL request_url("http://www.example.com/pushed.jpg");
+
+ std::unique_ptr<MockServerPushHelper> push_helper(
+ new MockServerPushHelper(request_url));
+ MockServerPushHelper* push_helper_ptr = push_helper.get();
+
+ // Receive a server push and should not cancel the push.
+ EXPECT_CALL(*push_helper_ptr, Cancel()).Times(0);
+ push_delegate.OnPush(std::move(push_helper));
+ base::RunLoop().RunUntilIdle();
+
+ // Receive another server push for the same url.
+ std::unique_ptr<MockServerPushHelper> push_helper2(
+ new MockServerPushHelper(request_url));
+ MockServerPushHelper* push_helper_ptr2 = push_helper2.get();
+ EXPECT_CALL(*push_helper_ptr2, Cancel()).Times(0);
+ push_delegate.OnPush(std::move(push_helper2));
+ base::RunLoop().RunUntilIdle();
+
+ // Verify no network transaction is created.
+ EXPECT_EQ(0, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(0, mock_cache.disk_cache()->open_count());
+ // Verify no cache entry is created for server push lookup.
+ EXPECT_EQ(0, mock_cache.disk_cache()->create_count());
+}
+
+TEST(HttpCacheLookupManagerTest, ServerPushHitCache) {
+ MockHttpCache mock_cache;
+ HttpCacheLookupManager push_delegate(mock_cache.http_cache(),
+ NetLogWithSource());
+ GURL request_url("http://www.example.com/pushed.jpg");
+
+ // Populate the cache entry so that the cache lookup for server push hits.
+ PopulateCacheEntry(mock_cache.http_cache(), request_url);
+ EXPECT_EQ(1, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(0, mock_cache.disk_cache()->open_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->create_count());
+
+ // Add another mock transaction since the OnPush will create a new cache
+ // transaction.
+ std::unique_ptr<MockTransaction> mock_trans =
+ CreateMockTransaction(request_url);
+ AddMockTransaction(mock_trans.get());
+
+ std::unique_ptr<MockServerPushHelper> push_helper(
+ new MockServerPushHelper(request_url));
+ MockServerPushHelper* push_helper_ptr = push_helper.get();
+
+ // Receive a server push and should cancel the push.
+ EXPECT_CALL(*push_helper_ptr, Cancel()).Times(1);
+ push_delegate.OnPush(std::move(push_helper));
+ base::RunLoop().RunUntilIdle();
+
+ // Make sure no new net layer transaction is created.
+ EXPECT_EQ(1, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->open_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->create_count());
+
+ RemoveMockTransaction(mock_trans.get());
+}
+
+// Test when a server push is received while the HttpCacheLookupManager has a
+// pending lookup transaction for the same URL, the new server push will not
+// send a new lookup transaction and should not be canceled.
+TEST(HttpCacheLookupManagerTest, ServerPushPendingLookup) {
+ MockHttpCache mock_cache;
+ HttpCacheLookupManager push_delegate(mock_cache.http_cache(),
+ NetLogWithSource());
+ GURL request_url("http://www.example.com/pushed.jpg");
+
+ // Populate the cache entry so that the cache lookup for server push hits.
+ PopulateCacheEntry(mock_cache.http_cache(), request_url);
+ EXPECT_EQ(1, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(0, mock_cache.disk_cache()->open_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->create_count());
+
+ // Add another mock transaction since the OnPush will create a new cache
+ // transaction.
+ std::unique_ptr<MockTransaction> mock_trans =
+ CreateMockTransaction(request_url);
+ AddMockTransaction(mock_trans.get());
+
+ std::unique_ptr<MockServerPushHelper> push_helper(
+ new MockServerPushHelper(request_url));
+ MockServerPushHelper* push_helper_ptr = push_helper.get();
+
+ // Receive a server push and should cancel the push eventually.
+ EXPECT_CALL(*push_helper_ptr, Cancel()).Times(1);
+ push_delegate.OnPush(std::move(push_helper));
+
+ std::unique_ptr<MockServerPushHelper> push_helper2(
+ new MockServerPushHelper(request_url));
+ MockServerPushHelper* push_helper_ptr2 = push_helper2.get();
+
+ // Receive another server push and should not cancel the push.
+ EXPECT_CALL(*push_helper_ptr2, Cancel()).Times(0);
+ push_delegate.OnPush(std::move(push_helper2));
+
+ base::RunLoop().RunUntilIdle();
+
+ // Make sure no new net layer transaction is created.
+ EXPECT_EQ(1, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->open_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->create_count());
+
+ RemoveMockTransaction(mock_trans.get());
+}
+
+// Test the server push lookup is base on the full url.
jkarlin 2016/11/21 14:40:41 s/base/based/
Zhongyi Shi 2016/11/22 00:09:30 Done.
+TEST(HttpCacheLookupManagerTest, ServerPushLookupOnUrl) {
+ MockHttpCache mock_cache;
+ HttpCacheLookupManager push_delegate(mock_cache.http_cache(),
+ NetLogWithSource());
+ GURL request_url("http://www.example.com/pushed.jpg?u=0");
+ GURL request_url2("http://www.example.com/pushed.jpg?u=1");
+
+ // Populate the cache entry so that the cache lookup for server push hits.
+ PopulateCacheEntry(mock_cache.http_cache(), request_url);
+ EXPECT_EQ(1, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(0, mock_cache.disk_cache()->open_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->create_count());
+
+ // Add another mock transaction since the OnPush will create a new cache
+ // transaction.
+ std::unique_ptr<MockTransaction> mock_trans =
+ CreateMockTransaction(request_url);
+ AddMockTransaction(mock_trans.get());
+
+ std::unique_ptr<MockServerPushHelper> push_helper(
+ new MockServerPushHelper(request_url));
+ MockServerPushHelper* push_helper_ptr = push_helper.get();
+
+ // Receive a server push and should cancel the push eventually.
+ EXPECT_CALL(*push_helper_ptr, Cancel()).Times(1);
+ push_delegate.OnPush(std::move(push_helper));
+
+ std::unique_ptr<MockServerPushHelper> push_helper2(
+ new MockServerPushHelper(request_url2));
+ MockServerPushHelper* push_helper_ptr2 = push_helper2.get();
+
+ // Receive another server push and should not cancel the push.
jkarlin 2016/11/21 14:40:41 How is this testing the full URL? Even if you used
Zhongyi Shi 2016/11/22 00:09:29 Thanks for catching this, I added RunUntilIdle to
+ EXPECT_CALL(*push_helper_ptr2, Cancel()).Times(0);
+ push_delegate.OnPush(std::move(push_helper2));
+
+ base::RunLoop().RunUntilIdle();
+
+ // Make sure no new net layer transaction is created.
+ EXPECT_EQ(1, mock_cache.network_layer()->transaction_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->open_count());
+ EXPECT_EQ(1, mock_cache.disk_cache()->create_count());
+
+ RemoveMockTransaction(mock_trans.get());
+}
+
+} // namespace net
« net/http/http_cache_lookup_manager.cc ('K') | « net/http/http_cache_lookup_manager.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698