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

Unified Diff: net/http/http_cache_unittest.cc

Issue 2763393002: Remove stale-while-revalidate from net (Closed)
Patch Set: fixes Created 3 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/http/http_cache_transaction.cc ('k') | net/http/http_response_headers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_cache_unittest.cc
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc
index 27222a905449abe15cd263149bb25c373a576a89..8a7c97ec24afa34ec7ba1a04a7c361f34ad79983 100644
--- a/net/http/http_cache_unittest.cc
+++ b/net/http/http_cache_unittest.cc
@@ -7944,149 +7944,6 @@ TEST_F(HttpCachePrefetchValidationTest, ValidateOnDelayedSecondPrefetch) {
EXPECT_FALSE(TransactionRequiredNetwork(LOAD_NORMAL));
}
-static void CheckResourceFreshnessHeader(const HttpRequestInfo* request,
- std::string* response_status,
- std::string* response_headers,
- std::string* response_data) {
- std::string value;
- EXPECT_TRUE(request->extra_headers.GetHeader("Resource-Freshness", &value));
- EXPECT_EQ("max-age=3600,stale-while-revalidate=7200,age=10801", value);
-}
-
-// Verify that the Resource-Freshness header is sent on a revalidation if the
-// stale-while-revalidate directive was on the response.
-TEST(HttpCache, ResourceFreshnessHeaderSent) {
- MockHttpCache cache;
-
- ScopedMockTransaction stale_while_revalidate_transaction(
- kSimpleGET_Transaction);
- stale_while_revalidate_transaction.response_headers =
- "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
- "Age: 10801\n"
- "Cache-Control: max-age=3600,stale-while-revalidate=7200\n";
-
- // Write to the cache.
- RunTransactionTest(cache.http_cache(), stale_while_revalidate_transaction);
-
- EXPECT_EQ(1, cache.network_layer()->transaction_count());
-
- // Send the request again and check that Resource-Freshness header is added.
- stale_while_revalidate_transaction.handler = CheckResourceFreshnessHeader;
-
- RunTransactionTest(cache.http_cache(), stale_while_revalidate_transaction);
-
- EXPECT_EQ(2, cache.network_layer()->transaction_count());
-}
-
-static void CheckResourceFreshnessAbsent(const HttpRequestInfo* request,
- std::string* response_status,
- std::string* response_headers,
- std::string* response_data) {
- EXPECT_FALSE(request->extra_headers.HasHeader("Resource-Freshness"));
-}
-
-// Verify that the Resource-Freshness header is not sent when
-// stale-while-revalidate is 0.
-TEST(HttpCache, ResourceFreshnessHeaderNotSent) {
- MockHttpCache cache;
-
- ScopedMockTransaction stale_while_revalidate_transaction(
- kSimpleGET_Transaction);
- stale_while_revalidate_transaction.response_headers =
- "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
- "Age: 10801\n"
- "Cache-Control: max-age=3600,stale-while-revalidate=0\n";
-
- // Write to the cache.
- RunTransactionTest(cache.http_cache(), stale_while_revalidate_transaction);
-
- EXPECT_EQ(1, cache.network_layer()->transaction_count());
-
- // Send the request again and check that Resource-Freshness header is absent.
- stale_while_revalidate_transaction.handler = CheckResourceFreshnessAbsent;
-
- RunTransactionTest(cache.http_cache(), stale_while_revalidate_transaction);
-
- EXPECT_EQ(2, cache.network_layer()->transaction_count());
-}
-
-TEST(HttpCache, StaleContentNotUsedWhenLoadFlagNotSet) {
- MockHttpCache cache;
-
- ScopedMockTransaction stale_while_revalidate_transaction(
- kSimpleGET_Transaction);
-
- stale_while_revalidate_transaction.response_headers =
- "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
- "Age: 10801\n"
- "Cache-Control: max-age=0,stale-while-revalidate=86400\n";
-
- // Write to the cache.
- RunTransactionTest(cache.http_cache(), stale_while_revalidate_transaction);
-
- EXPECT_EQ(1, cache.network_layer()->transaction_count());
-
- // Send the request again and check that it is sent to the network again.
- HttpResponseInfo response_info;
- RunTransactionTestWithResponseInfo(
- cache.http_cache(), stale_while_revalidate_transaction, &response_info);
-
- EXPECT_EQ(2, cache.network_layer()->transaction_count());
- EXPECT_FALSE(response_info.async_revalidation_required);
-}
-
-TEST(HttpCache, StaleContentUsedWhenLoadFlagSetAndUsable) {
- MockHttpCache cache;
-
- ScopedMockTransaction stale_while_revalidate_transaction(
- kSimpleGET_Transaction);
- stale_while_revalidate_transaction.load_flags |=
- LOAD_SUPPORT_ASYNC_REVALIDATION;
- stale_while_revalidate_transaction.response_headers =
- "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
- "Age: 10801\n"
- "Cache-Control: max-age=0,stale-while-revalidate=86400\n";
-
- // Write to the cache.
- RunTransactionTest(cache.http_cache(), stale_while_revalidate_transaction);
-
- EXPECT_EQ(1, cache.network_layer()->transaction_count());
-
- // Send the request again and check that it is not sent to the network again.
- HttpResponseInfo response_info;
- RunTransactionTestWithResponseInfo(
- cache.http_cache(), stale_while_revalidate_transaction, &response_info);
-
- EXPECT_EQ(1, cache.network_layer()->transaction_count());
- EXPECT_TRUE(response_info.async_revalidation_required);
-}
-
-TEST(HttpCache, StaleContentNotUsedWhenUnusable) {
- MockHttpCache cache;
-
- ScopedMockTransaction stale_while_revalidate_transaction(
- kSimpleGET_Transaction);
- stale_while_revalidate_transaction.load_flags |=
- LOAD_SUPPORT_ASYNC_REVALIDATION;
- stale_while_revalidate_transaction.response_headers =
- "Last-Modified: Sat, 18 Apr 2007 01:10:43 GMT\n"
- "Age: 10801\n"
- "Cache-Control: max-age=0,stale-while-revalidate=1800\n";
-
- // Write to the cache.
- RunTransactionTest(cache.http_cache(), stale_while_revalidate_transaction);
-
- EXPECT_EQ(1, cache.network_layer()->transaction_count());
-
- // Send the request again and check that it is sent to the network again.
- HttpResponseInfo response_info;
- RunTransactionTestWithResponseInfo(
- cache.http_cache(), stale_while_revalidate_transaction, &response_info);
-
- EXPECT_EQ(2, cache.network_layer()->transaction_count());
- EXPECT_FALSE(response_info.async_revalidation_required);
-}
-
// Tests that we allow multiple simultaneous, non-overlapping transactions to
// take place on a sparse entry.
TEST(HttpCache, RangeGET_MultipleRequests) {
« no previous file with comments | « net/http/http_cache_transaction.cc ('k') | net/http/http_response_headers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698