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

Side by Side Diff: third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013, Google Inc. All rights reserved. 2 * Copyright (c) 2013, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 }; 72 };
73 73
74 class ResourceFetcherTest : public ::testing::Test { 74 class ResourceFetcherTest : public ::testing::Test {
75 }; 75 };
76 76
77 class TestResourceFactory : public ResourceFactory { 77 class TestResourceFactory : public ResourceFactory {
78 public: 78 public:
79 TestResourceFactory(Resource::Type type = Resource::Raw) 79 TestResourceFactory(Resource::Type type = Resource::Raw)
80 : ResourceFactory(type) { } 80 : ResourceFactory(type) { }
81 81
82 PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, cons t String& charset) const override 82 RawPtr<Resource> create(const ResourceRequest& request, const String& charse t) const override
83 { 83 {
84 return Resource::create(request, type()); 84 return Resource::create(request, type());
85 } 85 }
86 }; 86 };
87 87
88 TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach) 88 TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach)
89 { 89 {
90 KURL secureURL(ParsedURLString, "https://secureorigin.test/image.png"); 90 KURL secureURL(ParsedURLString, "https://secureorigin.test/image.png");
91 // Try to request a url. The request should fail, no resource should be retu rned, 91 // Try to request a url. The request should fail, no resource should be retu rned,
92 // and no resource should be present in the cache. 92 // and no resource should be present in the cache.
93 ResourceFetcher* fetcher = ResourceFetcher::create(nullptr); 93 ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);
94 FetchRequest fetchRequest = FetchRequest(ResourceRequest(secureURL), FetchIn itiatorInfo()); 94 FetchRequest fetchRequest = FetchRequest(ResourceRequest(secureURL), FetchIn itiatorInfo());
95 RefPtrWillBeRawPtr<Resource> resource = fetcher->requestResource(fetchReques t, TestResourceFactory()); 95 RawPtr<Resource> resource = fetcher->requestResource(fetchRequest, TestResou rceFactory());
96 EXPECT_EQ(resource.get(), static_cast<Resource*>(nullptr)); 96 EXPECT_EQ(resource.get(), static_cast<Resource*>(nullptr));
97 EXPECT_EQ(memoryCache()->resourceForURL(secureURL), static_cast<Resource*>(n ullptr)); 97 EXPECT_EQ(memoryCache()->resourceForURL(secureURL), static_cast<Resource*>(n ullptr));
98 } 98 }
99 99
100 TEST_F(ResourceFetcherTest, UseExistingResource) 100 TEST_F(ResourceFetcherTest, UseExistingResource)
101 { 101 {
102 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create()); 102 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create());
103 103
104 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html"); 104 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
105 RefPtrWillBeRawPtr<Resource> resource = Resource::create(url, Resource::Imag e); 105 RawPtr<Resource> resource = Resource::create(url, Resource::Image);
106 memoryCache()->add(resource.get()); 106 memoryCache()->add(resource.get());
107 ResourceResponse response; 107 ResourceResponse response;
108 response.setURL(url); 108 response.setURL(url);
109 response.setHTTPStatusCode(200); 109 response.setHTTPStatusCode(200);
110 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600"); 110 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
111 resource->responseReceived(response, nullptr); 111 resource->responseReceived(response, nullptr);
112 resource->finish(); 112 resource->finish();
113 113
114 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo()); 114 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
115 RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchReq uest, TestResourceFactory(Resource::Image)); 115 RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestRe sourceFactory(Resource::Image));
116 EXPECT_EQ(resource, newResource); 116 EXPECT_EQ(resource, newResource);
117 memoryCache()->remove(resource.get()); 117 memoryCache()->remove(resource.get());
118 } 118 }
119 119
120 TEST_F(ResourceFetcherTest, Vary) 120 TEST_F(ResourceFetcherTest, Vary)
121 { 121 {
122 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html"); 122 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
123 RefPtrWillBeRawPtr<Resource> resource = Resource::create(url, Resource::Raw) ; 123 RawPtr<Resource> resource = Resource::create(url, Resource::Raw);
124 memoryCache()->add(resource.get()); 124 memoryCache()->add(resource.get());
125 ResourceResponse response; 125 ResourceResponse response;
126 response.setURL(url); 126 response.setURL(url);
127 response.setHTTPStatusCode(200); 127 response.setHTTPStatusCode(200);
128 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600"); 128 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
129 response.setHTTPHeaderField(HTTPNames::Vary, "*"); 129 response.setHTTPHeaderField(HTTPNames::Vary, "*");
130 resource->responseReceived(response, nullptr); 130 resource->responseReceived(response, nullptr);
131 resource->finish(); 131 resource->finish();
132 ASSERT_TRUE(resource->hasVaryHeader()); 132 ASSERT_TRUE(resource->hasVaryHeader());
133 133
134 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create()); 134 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create());
135 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo()); 135 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
136 Platform::current()->unitTestSupport()->registerMockedURL(url, WebURLRespons e(), ""); 136 Platform::current()->unitTestSupport()->registerMockedURL(url, WebURLRespons e(), "");
137 RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchReq uest, TestResourceFactory()); 137 RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestRe sourceFactory());
138 EXPECT_NE(resource, newResource); 138 EXPECT_NE(resource, newResource);
139 newResource->loader()->cancel(); 139 newResource->loader()->cancel();
140 memoryCache()->remove(newResource.get()); 140 memoryCache()->remove(newResource.get());
141 Platform::current()->unitTestSupport()->unregisterMockedURL(url); 141 Platform::current()->unitTestSupport()->unregisterMockedURL(url);
142 142
143 memoryCache()->remove(resource.get()); 143 memoryCache()->remove(resource.get());
144 } 144 }
145 145
146 TEST_F(ResourceFetcherTest, VaryOnBack) 146 TEST_F(ResourceFetcherTest, VaryOnBack)
147 { 147 {
148 ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchC ontext::create(); 148 ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchC ontext::create();
149 context->setCachePolicy(CachePolicyHistoryBuffer); 149 context->setCachePolicy(CachePolicyHistoryBuffer);
150 ResourceFetcher* fetcher = ResourceFetcher::create(context); 150 ResourceFetcher* fetcher = ResourceFetcher::create(context);
151 151
152 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html"); 152 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
153 RefPtrWillBeRawPtr<Resource> resource = Resource::create(url, Resource::Raw) ; 153 RawPtr<Resource> resource = Resource::create(url, Resource::Raw);
154 memoryCache()->add(resource.get()); 154 memoryCache()->add(resource.get());
155 ResourceResponse response; 155 ResourceResponse response;
156 response.setURL(url); 156 response.setURL(url);
157 response.setHTTPStatusCode(200); 157 response.setHTTPStatusCode(200);
158 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600"); 158 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
159 response.setHTTPHeaderField(HTTPNames::Vary, "*"); 159 response.setHTTPHeaderField(HTTPNames::Vary, "*");
160 resource->responseReceived(response, nullptr); 160 resource->responseReceived(response, nullptr);
161 resource->finish(); 161 resource->finish();
162 ASSERT_TRUE(resource->hasVaryHeader()); 162 ASSERT_TRUE(resource->hasVaryHeader());
163 163
164 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo()); 164 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
165 RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchReq uest, TestResourceFactory()); 165 RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestRe sourceFactory());
166 EXPECT_EQ(resource, newResource); 166 EXPECT_EQ(resource, newResource);
167 167
168 memoryCache()->remove(newResource.get()); 168 memoryCache()->remove(newResource.get());
169 } 169 }
170 170
171 TEST_F(ResourceFetcherTest, VaryImage) 171 TEST_F(ResourceFetcherTest, VaryImage)
172 { 172 {
173 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create()); 173 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create());
174 174
175 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html"); 175 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
176 ResourceResponse response; 176 ResourceResponse response;
177 response.setURL(url); 177 response.setURL(url);
178 response.setHTTPStatusCode(200); 178 response.setHTTPStatusCode(200);
179 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600"); 179 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
180 response.setHTTPHeaderField(HTTPNames::Vary, "*"); 180 response.setHTTPHeaderField(HTTPNames::Vary, "*");
181 URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, "white-1x1.png" , WebString::fromUTF8(""), WrappedResourceResponse(response)); 181 URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, "white-1x1.png" , WebString::fromUTF8(""), WrappedResourceResponse(response));
182 182
183 FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo()); 183 FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
184 RefPtrWillBeRawPtr<Resource> resource = fetcher->requestResource(fetchReques tOriginal, TestResourceFactory(Resource::Image)); 184 RawPtr<Resource> resource = fetcher->requestResource(fetchRequestOriginal, T estResourceFactory(Resource::Image));
185 ASSERT_TRUE(resource.get()); 185 ASSERT_TRUE(resource.get());
186 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); 186 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
187 ASSERT_TRUE(resource->hasVaryHeader()); 187 ASSERT_TRUE(resource->hasVaryHeader());
188 188
189 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo()); 189 FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
190 RefPtrWillBeRawPtr<Resource> newResource = fetcher->requestResource(fetchReq uest, TestResourceFactory(Resource::Image)); 190 RawPtr<Resource> newResource = fetcher->requestResource(fetchRequest, TestRe sourceFactory(Resource::Image));
191 EXPECT_EQ(resource, newResource); 191 EXPECT_EQ(resource, newResource);
192 192
193 memoryCache()->remove(newResource.get()); 193 memoryCache()->remove(newResource.get());
194 Platform::current()->unitTestSupport()->unregisterMockedURL(url); 194 Platform::current()->unitTestSupport()->unregisterMockedURL(url);
195 } 195 }
196 196
197 TEST_F(ResourceFetcherTest, RevalidateWhileLoading) 197 TEST_F(ResourceFetcherTest, RevalidateWhileLoading)
198 { 198 {
199 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html"); 199 KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
200 Platform::current()->unitTestSupport()->registerMockedURL(url, WebURLRespons e(), ""); 200 Platform::current()->unitTestSupport()->registerMockedURL(url, WebURLRespons e(), "");
201 201
202 ResourceFetcher* fetcher1 = ResourceFetcher::create(ResourceFetcherTestMockF etchContext::create()); 202 ResourceFetcher* fetcher1 = ResourceFetcher::create(ResourceFetcherTestMockF etchContext::create());
203 ResourceRequest request1(url); 203 ResourceRequest request1(url);
204 request1.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache"); 204 request1.setHTTPHeaderField(HTTPNames::Cache_Control, "no-cache");
205 FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo()); 205 FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
206 RefPtrWillBeRawPtr<Resource> resource1 = fetcher1->requestResource(fetchRequ est1, TestResourceFactory(Resource::Image)); 206 RawPtr<Resource> resource1 = fetcher1->requestResource(fetchRequest1, TestRe sourceFactory(Resource::Image));
207 ResourceResponse response; 207 ResourceResponse response;
208 response.setURL(url); 208 response.setURL(url);
209 response.setHTTPStatusCode(200); 209 response.setHTTPStatusCode(200);
210 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600"); 210 response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
211 response.setHTTPHeaderField(HTTPNames::ETag, "1234567890"); 211 response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
212 resource1->responseReceived(response, nullptr); 212 resource1->responseReceived(response, nullptr);
213 resource1->finish(); 213 resource1->finish();
214 214
215 ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchC ontext::create(); 215 ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchC ontext::create();
216 context->setCachePolicy(CachePolicyRevalidate); 216 context->setCachePolicy(CachePolicyRevalidate);
217 ResourceFetcher* fetcher2 = ResourceFetcher::create(context); 217 ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
218 FetchRequest fetchRequest2(url, FetchInitiatorInfo()); 218 FetchRequest fetchRequest2(url, FetchInitiatorInfo());
219 RefPtrWillBeRawPtr<Resource> resource2 = fetcher2->requestResource(fetchRequ est2, TestResourceFactory(Resource::Image)); 219 RawPtr<Resource> resource2 = fetcher2->requestResource(fetchRequest2, TestRe sourceFactory(Resource::Image));
220 EXPECT_EQ(resource1, resource2); 220 EXPECT_EQ(resource1, resource2);
221 221
222 // Tidily(?) shut down the ResourceLoader. 222 // Tidily(?) shut down the ResourceLoader.
223 resource1->loader()->cancel(); 223 resource1->loader()->cancel();
224 Platform::current()->unitTestSupport()->unregisterMockedURL(url); 224 Platform::current()->unitTestSupport()->unregisterMockedURL(url);
225 } 225 }
226 226
227 TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl) 227 TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl)
228 { 228 {
229 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create()); 229 ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFe tchContext::create());
230 ResourceRequest request(KURL(ParsedURLString, "data:text/html,foo")); 230 ResourceRequest request(KURL(ParsedURLString, "data:text/html,foo"));
231 ResourceLoaderOptions options; 231 ResourceLoaderOptions options;
232 options.dataBufferingPolicy = DoNotBufferData; 232 options.dataBufferingPolicy = DoNotBufferData;
233 FetchRequest fetchRequest = FetchRequest(request, FetchInitiatorTypeNames::i nternal, options); 233 FetchRequest fetchRequest = FetchRequest(request, FetchInitiatorTypeNames::i nternal, options);
234 RefPtrWillBeRawPtr<Resource> resource1 = fetcher->requestResource(fetchReque st, TestResourceFactory(Resource::Media)); 234 RawPtr<Resource> resource1 = fetcher->requestResource(fetchRequest, TestReso urceFactory(Resource::Media));
235 RefPtrWillBeRawPtr<Resource> resource2 = fetcher->requestResource(fetchReque st, TestResourceFactory(Resource::Media)); 235 RawPtr<Resource> resource2 = fetcher->requestResource(fetchRequest, TestReso urceFactory(Resource::Media));
236 EXPECT_NE(resource1.get(), resource2.get()); 236 EXPECT_NE(resource1.get(), resource2.get());
237 memoryCache()->remove(resource2.get()); 237 memoryCache()->remove(resource2.get());
238 } 238 }
239 239
240 } // namespace blink 240 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698