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

Side by Side Diff: third_party/WebKit/Source/core/fetch/RawResourceTest.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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "public/platform/WebUnitTestSupport.h" 42 #include "public/platform/WebUnitTestSupport.h"
43 #include "testing/gtest/include/gtest/gtest.h" 43 #include "testing/gtest/include/gtest/gtest.h"
44 44
45 namespace blink { 45 namespace blink {
46 46
47 TEST(RawResourceTest, DontIgnoreAcceptForCacheReuse) 47 TEST(RawResourceTest, DontIgnoreAcceptForCacheReuse)
48 { 48 {
49 ResourceRequest jpegRequest; 49 ResourceRequest jpegRequest;
50 jpegRequest.setHTTPAccept("image/jpeg"); 50 jpegRequest.setHTTPAccept("image/jpeg");
51 51
52 RefPtrWillBeRawPtr<RawResource> jpegResource(RawResource::create(jpegRequest , Resource::Raw)); 52 RawPtr<RawResource> jpegResource(RawResource::create(jpegRequest, Resource:: Raw));
53 53
54 ResourceRequest pngRequest; 54 ResourceRequest pngRequest;
55 pngRequest.setHTTPAccept("image/png"); 55 pngRequest.setHTTPAccept("image/png");
56 56
57 ASSERT_FALSE(jpegResource->canReuse(pngRequest)); 57 ASSERT_FALSE(jpegResource->canReuse(pngRequest));
58 } 58 }
59 59
60 class DummyClient final : public RawResourceClient { 60 class DummyClient final : public RawResourceClient {
61 public: 61 public:
62 DummyClient() : m_called(false) {} 62 DummyClient() : m_called(false) {}
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 resource->addClient(m_dummyClient); 100 resource->addClient(m_dummyClient);
101 } 101 }
102 String debugName() const override { return "AddingClient"; } 102 String debugName() const override { return "AddingClient"; }
103 103
104 void removeClient(Timer<AddingClient>* timer) 104 void removeClient(Timer<AddingClient>* timer)
105 { 105 {
106 m_resource->removeClient(m_dummyClient); 106 m_resource->removeClient(m_dummyClient);
107 } 107 }
108 private: 108 private:
109 DummyClient* m_dummyClient; 109 DummyClient* m_dummyClient;
110 RefPtrWillBePersistent<Resource> m_resource; 110 Persistent<Resource> m_resource;
111 Timer<AddingClient> m_removeClientTimer; 111 Timer<AddingClient> m_removeClientTimer;
112 }; 112 };
113 113
114 TEST(RawResourceTest, RevalidationSucceeded) 114 TEST(RawResourceTest, RevalidationSucceeded)
115 { 115 {
116 RefPtrWillBeRawPtr<Resource> resource = RawResource::create(ResourceRequest( "data:text/html,"), Resource::Raw); 116 RawPtr<Resource> resource = RawResource::create(ResourceRequest("data:text/h tml,"), Resource::Raw);
117 ResourceResponse response; 117 ResourceResponse response;
118 response.setHTTPStatusCode(200); 118 response.setHTTPStatusCode(200);
119 resource->responseReceived(response, nullptr); 119 resource->responseReceived(response, nullptr);
120 const char data[5] = "abcd"; 120 const char data[5] = "abcd";
121 resource->appendData(data, 4); 121 resource->appendData(data, 4);
122 resource->finish(); 122 resource->finish();
123 memoryCache()->add(resource.get()); 123 memoryCache()->add(resource.get());
124 124
125 // Simulate a successful revalidation. 125 // Simulate a successful revalidation.
126 resource->setRevalidatingRequest(ResourceRequest("data:text/html,")); 126 resource->setRevalidatingRequest(ResourceRequest("data:text/html,"));
(...skipping 11 matching lines...) Expand all
138 memoryCache()->remove(resource.get()); 138 memoryCache()->remove(resource.get());
139 139
140 resource->removeClient(client.get()); 140 resource->removeClient(client.get());
141 EXPECT_FALSE(resource->hasClients()); 141 EXPECT_FALSE(resource->hasClients());
142 EXPECT_FALSE(client->called()); 142 EXPECT_FALSE(client->called());
143 EXPECT_EQ("abcd", String(client->data().data(), client->data().size())); 143 EXPECT_EQ("abcd", String(client->data().data(), client->data().size()));
144 } 144 }
145 145
146 TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody) 146 TEST(RawResourceTest, RevalidationSucceededForResourceWithoutBody)
147 { 147 {
148 RefPtrWillBeRawPtr<Resource> resource = RawResource::create(ResourceRequest( "data:text/html,"), Resource::Raw); 148 RawPtr<Resource> resource = RawResource::create(ResourceRequest("data:text/h tml,"), Resource::Raw);
149 ResourceResponse response; 149 ResourceResponse response;
150 response.setHTTPStatusCode(200); 150 response.setHTTPStatusCode(200);
151 resource->responseReceived(response, nullptr); 151 resource->responseReceived(response, nullptr);
152 resource->finish(); 152 resource->finish();
153 memoryCache()->add(resource.get()); 153 memoryCache()->add(resource.get());
154 154
155 // Simulate a successful revalidation. 155 // Simulate a successful revalidation.
156 resource->setRevalidatingRequest(ResourceRequest("data:text/html,")); 156 resource->setRevalidatingRequest(ResourceRequest("data:text/html,"));
157 157
158 OwnPtr<DummyClient> client = adoptPtr(new DummyClient); 158 OwnPtr<DummyClient> client = adoptPtr(new DummyClient);
159 resource->addClient(client.get()); 159 resource->addClient(client.get());
160 160
161 ResourceResponse revalidatingResponse; 161 ResourceResponse revalidatingResponse;
162 revalidatingResponse.setHTTPStatusCode(304); 162 revalidatingResponse.setHTTPStatusCode(304);
163 resource->responseReceived(revalidatingResponse, nullptr); 163 resource->responseReceived(revalidatingResponse, nullptr);
164 EXPECT_FALSE(resource->isCacheValidator()); 164 EXPECT_FALSE(resource->isCacheValidator());
165 EXPECT_EQ(200, resource->response().httpStatusCode()); 165 EXPECT_EQ(200, resource->response().httpStatusCode());
166 EXPECT_EQ(nullptr, resource->resourceBuffer()); 166 EXPECT_EQ(nullptr, resource->resourceBuffer());
167 EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/htm l,")), resource.get()); 167 EXPECT_EQ(memoryCache()->resourceForURL(KURL(ParsedURLString, "data:text/htm l,")), resource.get());
168 memoryCache()->remove(resource.get()); 168 memoryCache()->remove(resource.get());
169 169
170 resource->removeClient(client.get()); 170 resource->removeClient(client.get());
171 EXPECT_FALSE(resource->hasClients()); 171 EXPECT_FALSE(resource->hasClients());
172 EXPECT_FALSE(client->called()); 172 EXPECT_FALSE(client->called());
173 EXPECT_EQ(0u, client->data().size()); 173 EXPECT_EQ(0u, client->data().size());
174 } 174 }
175 175
176 TEST(RawResourceTest, AddClientDuringCallback) 176 TEST(RawResourceTest, AddClientDuringCallback)
177 { 177 {
178 RefPtrWillBeRawPtr<Resource> raw = RawResource::create(ResourceRequest("data :text/html,"), Resource::Raw); 178 RawPtr<Resource> raw = RawResource::create(ResourceRequest("data:text/html," ), Resource::Raw);
179 raw->setLoading(false); 179 raw->setLoading(false);
180 180
181 // Create a non-null response. 181 // Create a non-null response.
182 ResourceResponse response = raw->response(); 182 ResourceResponse response = raw->response();
183 response.setURL(KURL(ParsedURLString, "http://600.613/")); 183 response.setURL(KURL(ParsedURLString, "http://600.613/"));
184 raw->setResponse(response); 184 raw->setResponse(response);
185 EXPECT_FALSE(raw->response().isNull()); 185 EXPECT_FALSE(raw->response().isNull());
186 186
187 OwnPtr<DummyClient> dummyClient = adoptPtr(new DummyClient()); 187 OwnPtr<DummyClient> dummyClient = adoptPtr(new DummyClient());
188 OwnPtr<AddingClient> addingClient = adoptPtr(new AddingClient(dummyClient.ge t(), raw.get())); 188 OwnPtr<AddingClient> addingClient = adoptPtr(new AddingClient(dummyClient.ge t(), raw.get()));
(...skipping 18 matching lines...) Expand all
207 resource->removeClient(m_dummyClient); 207 resource->removeClient(m_dummyClient);
208 resource->removeClient(this); 208 resource->removeClient(this);
209 } 209 }
210 String debugName() const override { return "RemovingClient"; } 210 String debugName() const override { return "RemovingClient"; }
211 private: 211 private:
212 DummyClient* m_dummyClient; 212 DummyClient* m_dummyClient;
213 }; 213 };
214 214
215 TEST(RawResourceTest, RemoveClientDuringCallback) 215 TEST(RawResourceTest, RemoveClientDuringCallback)
216 { 216 {
217 RefPtrWillBeRawPtr<Resource> raw = RawResource::create(ResourceRequest("data :text/html,"), Resource::Raw); 217 RawPtr<Resource> raw = RawResource::create(ResourceRequest("data:text/html," ), Resource::Raw);
218 raw->setLoading(false); 218 raw->setLoading(false);
219 219
220 // Create a non-null response. 220 // Create a non-null response.
221 ResourceResponse response = raw->response(); 221 ResourceResponse response = raw->response();
222 response.setURL(KURL(ParsedURLString, "http://600.613/")); 222 response.setURL(KURL(ParsedURLString, "http://600.613/"));
223 raw->setResponse(response); 223 raw->setResponse(response);
224 EXPECT_FALSE(raw->response().isNull()); 224 EXPECT_FALSE(raw->response().isNull());
225 225
226 OwnPtr<DummyClient> dummyClient = adoptPtr(new DummyClient()); 226 OwnPtr<DummyClient> dummyClient = adoptPtr(new DummyClient());
227 OwnPtr<RemovingClient> removingClient = adoptPtr(new RemovingClient(dummyCli ent.get())); 227 OwnPtr<RemovingClient> removingClient = adoptPtr(new RemovingClient(dummyCli ent.get()));
228 raw->addClient(dummyClient.get()); 228 raw->addClient(dummyClient.get());
229 raw->addClient(removingClient.get()); 229 raw->addClient(removingClient.get());
230 testing::runPendingTasks(); 230 testing::runPendingTasks();
231 EXPECT_FALSE(raw->hasClients()); 231 EXPECT_FALSE(raw->hasClients());
232 } 232 }
233 233
234 } // namespace blink 234 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698