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

Side by Side Diff: Source/web/tests/PrerenderingTest.cpp

Issue 20300002: Fix trailing whitespace in .cpp, .h, and .idl files (ex. Source/core) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/IDBBindingUtilitiesTest.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 m_extraData = adoptPtr(extraData); 74 m_extraData = adoptPtr(extraData);
75 } 75 }
76 76
77 WebPrerender releaseWebPrerender() 77 WebPrerender releaseWebPrerender()
78 { 78 {
79 ASSERT(!m_webPrerenders.empty()); 79 ASSERT(!m_webPrerenders.empty());
80 WebPrerender retval(m_webPrerenders.front()); 80 WebPrerender retval(m_webPrerenders.front());
81 m_webPrerenders.pop_front(); 81 m_webPrerenders.pop_front();
82 return retval; 82 return retval;
83 } 83 }
84 84
85 bool empty() const 85 bool empty() const
86 { 86 {
87 return m_webPrerenders.empty(); 87 return m_webPrerenders.empty();
88 } 88 }
89 89
90 void clear() 90 void clear()
91 { 91 {
92 m_webPrerenders.clear(); 92 m_webPrerenders.clear();
93 } 93 }
94 94
(...skipping 27 matching lines...) Expand all
122 { 122 {
123 m_addedPrerenders.clear(); 123 m_addedPrerenders.clear();
124 m_canceledPrerenders.clear(); 124 m_canceledPrerenders.clear();
125 m_abandonedPrerenders.clear(); 125 m_abandonedPrerenders.clear();
126 } 126 }
127 127
128 size_t totalCount() const 128 size_t totalCount() const
129 { 129 {
130 return m_addedPrerenders.size() + m_canceledPrerenders.size() + m_abando nedPrerenders.size(); 130 return m_addedPrerenders.size() + m_canceledPrerenders.size() + m_abando nedPrerenders.size();
131 } 131 }
132 132
133 size_t addCount(const WebPrerender& prerender) const 133 size_t addCount(const WebPrerender& prerender) const
134 { 134 {
135 return std::count_if(m_addedPrerenders.begin(), m_addedPrerenders.end(), std::bind1st(WebPrerenderEqual(), prerender)); 135 return std::count_if(m_addedPrerenders.begin(), m_addedPrerenders.end(), std::bind1st(WebPrerenderEqual(), prerender));
136 } 136 }
137 137
138 size_t cancelCount(const WebPrerender& prerender) const 138 size_t cancelCount(const WebPrerender& prerender) const
139 { 139 {
140 return std::count_if(m_canceledPrerenders.begin(), m_canceledPrerenders. end(), std::bind1st(WebPrerenderEqual(), prerender)); 140 return std::count_if(m_canceledPrerenders.begin(), m_canceledPrerenders. end(), std::bind1st(WebPrerenderEqual(), prerender));
141 } 141 }
142 142
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 PrerenderingTest() : m_webView(0) 180 PrerenderingTest() : m_webView(0)
181 { 181 {
182 } 182 }
183 183
184 ~PrerenderingTest() 184 ~PrerenderingTest()
185 { 185 {
186 Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); 186 Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
187 if (m_webView) 187 if (m_webView)
188 close(); 188 close();
189 } 189 }
190 190
191 void initialize(const char* baseURL, const char* fileName) 191 void initialize(const char* baseURL, const char* fileName)
192 { 192 {
193 ASSERT(!m_webView); 193 ASSERT(!m_webView);
194 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL ), WebString::fromUTF8(fileName)); 194 URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL ), WebString::fromUTF8(fileName));
195 const bool RunJavascript = true; 195 const bool RunJavascript = true;
196 m_webView = FrameTestHelpers::createWebView(RunJavascript); 196 m_webView = FrameTestHelpers::createWebView(RunJavascript);
197 m_webView->setPrerendererClient(&m_prerendererClient); 197 m_webView->setPrerendererClient(&m_prerendererClient);
198 198
199 FrameTestHelpers::loadFrame(m_webView->mainFrame(), std::string(baseURL) + fileName); 199 FrameTestHelpers::loadFrame(m_webView->mainFrame(), std::string(baseURL) + fileName);
200 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests( ); 200 Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests( );
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 std::string consoleAt(unsigned i) 232 std::string consoleAt(unsigned i)
233 { 233 {
234 ASSERT(consoleLength() > i); 234 ASSERT(consoleLength() > i);
235 235
236 WebNode consoleListItem = console().childNodes().item(1 + i); 236 WebNode consoleListItem = console().childNodes().item(1 + i);
237 ASSERT(consoleListItem.nodeName() == "LI"); 237 ASSERT(consoleListItem.nodeName() == "LI");
238 ASSERT(consoleListItem.hasChildNodes()); 238 ASSERT(consoleListItem.hasChildNodes());
239 239
240 WebNode textNode = consoleListItem.firstChild(); 240 WebNode textNode = consoleListItem.firstChild();
241 ASSERT(textNode.nodeName() == "#text"); 241 ASSERT(textNode.nodeName() == "#text");
242 242
243 return textNode.nodeValue().utf8().data(); 243 return textNode.nodeValue().utf8().data();
244 } 244 }
245 245
246 void executeScript(const char* code) 246 void executeScript(const char* code)
247 { 247 {
248 m_webView->mainFrame()->executeScript(WebScriptSource(WebString::fromUTF 8(code))); 248 m_webView->mainFrame()->executeScript(WebScriptSource(WebString::fromUTF 8(code)));
249 } 249 }
250 250
251 TestPrerenderingSupport* prerenderingSupport() 251 TestPrerenderingSupport* prerenderingSupport()
252 { 252 {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 { 297 {
298 initialize("http://www.foo.com/", "prerender/single_prerender.html"); 298 initialize("http://www.foo.com/", "prerender/single_prerender.html");
299 299
300 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender(); 300 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender();
301 EXPECT_FALSE(webPrerender.isNull()); 301 EXPECT_FALSE(webPrerender.isNull());
302 302
303 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender)); 303 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender));
304 EXPECT_EQ(1u, prerenderingSupport()->totalCount()); 304 EXPECT_EQ(1u, prerenderingSupport()->totalCount());
305 305
306 executeScript("removePrerender()"); 306 executeScript("removePrerender()");
307 307
308 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(webPrerender)); 308 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(webPrerender));
309 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 309 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
310 } 310 }
311 311
312 TEST_F(PrerenderingTest, AbandonPrerender) 312 TEST_F(PrerenderingTest, AbandonPrerender)
313 { 313 {
314 initialize("http://www.foo.com/", "prerender/single_prerender.html"); 314 initialize("http://www.foo.com/", "prerender/single_prerender.html");
315 315
316 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender(); 316 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender();
317 EXPECT_FALSE(webPrerender.isNull()); 317 EXPECT_FALSE(webPrerender.isNull());
318 318
319 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender)); 319 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender));
320 EXPECT_EQ(1u, prerenderingSupport()->totalCount()); 320 EXPECT_EQ(1u, prerenderingSupport()->totalCount());
321 321
322 navigateAway(); 322 navigateAway();
323 323
324 EXPECT_EQ(1u, prerenderingSupport()->abandonCount(webPrerender)); 324 EXPECT_EQ(1u, prerenderingSupport()->abandonCount(webPrerender));
325 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 325 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
326 } 326 }
327 327
328 TEST_F(PrerenderingTest, ExtraData) 328 TEST_F(PrerenderingTest, ExtraData)
329 { 329 {
330 class TestExtraData : public WebPrerender::ExtraData { 330 class TestExtraData : public WebPrerender::ExtraData {
331 public: 331 public:
332 explicit TestExtraData(bool* alive) : m_alive(alive) 332 explicit TestExtraData(bool* alive) : m_alive(alive)
333 { 333 {
(...skipping 17 matching lines...) Expand all
351 executeScript("removePrerender()"); 351 executeScript("removePrerender()");
352 close(); 352 close();
353 prerenderingSupport()->clear(); 353 prerenderingSupport()->clear();
354 } 354 }
355 EXPECT_FALSE(alive); 355 EXPECT_FALSE(alive);
356 } 356 }
357 357
358 TEST_F(PrerenderingTest, TwoPrerenders) 358 TEST_F(PrerenderingTest, TwoPrerenders)
359 { 359 {
360 initialize("http://www.foo.com/", "prerender/multiple_prerenders.html"); 360 initialize("http://www.foo.com/", "prerender/multiple_prerenders.html");
361 361
362 WebPrerender firstPrerender = prerendererClient()->releaseWebPrerender(); 362 WebPrerender firstPrerender = prerendererClient()->releaseWebPrerender();
363 EXPECT_FALSE(firstPrerender.isNull()); 363 EXPECT_FALSE(firstPrerender.isNull());
364 EXPECT_EQ(toWebURL("http://first-prerender.com/"), firstPrerender.url()); 364 EXPECT_EQ(toWebURL("http://first-prerender.com/"), firstPrerender.url());
365 365
366 WebPrerender secondPrerender = prerendererClient()->releaseWebPrerender(); 366 WebPrerender secondPrerender = prerendererClient()->releaseWebPrerender();
367 EXPECT_FALSE(firstPrerender.isNull()); 367 EXPECT_FALSE(firstPrerender.isNull());
368 EXPECT_EQ(toWebURL("http://second-prerender.com/"), secondPrerender.url()); 368 EXPECT_EQ(toWebURL("http://second-prerender.com/"), secondPrerender.url());
369 369
370 EXPECT_EQ(1u, prerenderingSupport()->addCount(firstPrerender)); 370 EXPECT_EQ(1u, prerenderingSupport()->addCount(firstPrerender));
371 EXPECT_EQ(1u, prerenderingSupport()->addCount(secondPrerender)); 371 EXPECT_EQ(1u, prerenderingSupport()->addCount(secondPrerender));
372 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 372 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
373 373
374 firstPrerender.didStartPrerender(); 374 firstPrerender.didStartPrerender();
375 EXPECT_EQ(1u, consoleLength()); 375 EXPECT_EQ(1u, consoleLength());
376 EXPECT_EQ("first_webkitprerenderstart", consoleAt(0)); 376 EXPECT_EQ("first_webkitprerenderstart", consoleAt(0));
377 377
378 secondPrerender.didStartPrerender(); 378 secondPrerender.didStartPrerender();
379 EXPECT_EQ(2u, consoleLength()); 379 EXPECT_EQ(2u, consoleLength());
380 EXPECT_EQ("second_webkitprerenderstart", consoleAt(1)); 380 EXPECT_EQ("second_webkitprerenderstart", consoleAt(1));
381 } 381 }
382 382
383 TEST_F(PrerenderingTest, TwoPrerendersRemovingFirstThenNavigating) 383 TEST_F(PrerenderingTest, TwoPrerendersRemovingFirstThenNavigating)
384 { 384 {
385 initialize("http://www.foo.com/", "prerender/multiple_prerenders.html"); 385 initialize("http://www.foo.com/", "prerender/multiple_prerenders.html");
386 386
387 WebPrerender firstPrerender = prerendererClient()->releaseWebPrerender(); 387 WebPrerender firstPrerender = prerendererClient()->releaseWebPrerender();
388 WebPrerender secondPrerender = prerendererClient()->releaseWebPrerender(); 388 WebPrerender secondPrerender = prerendererClient()->releaseWebPrerender();
389 389
390 EXPECT_EQ(1u, prerenderingSupport()->addCount(firstPrerender)); 390 EXPECT_EQ(1u, prerenderingSupport()->addCount(firstPrerender));
391 EXPECT_EQ(1u, prerenderingSupport()->addCount(secondPrerender)); 391 EXPECT_EQ(1u, prerenderingSupport()->addCount(secondPrerender));
392 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 392 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
393 393
394 executeScript("removeFirstPrerender()"); 394 executeScript("removeFirstPrerender()");
395 395
396 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(firstPrerender)); 396 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(firstPrerender));
397 EXPECT_EQ(3u, prerenderingSupport()->totalCount()); 397 EXPECT_EQ(3u, prerenderingSupport()->totalCount());
398 398
399 navigateAway(); 399 navigateAway();
400 400
401 EXPECT_EQ(1u, prerenderingSupport()->abandonCount(secondPrerender)); 401 EXPECT_EQ(1u, prerenderingSupport()->abandonCount(secondPrerender));
402 402
403 // FIXME: After we fix prerenders such that they don't send redundant events , assert that totalCount() == 4u. 403 // FIXME: After we fix prerenders such that they don't send redundant events , assert that totalCount() == 4u.
404 } 404 }
405 405
406 TEST_F(PrerenderingTest, TwoPrerendersAddingThird) 406 TEST_F(PrerenderingTest, TwoPrerendersAddingThird)
407 { 407 {
408 initialize("http://www.foo.com/", "prerender/multiple_prerenders.html"); 408 initialize("http://www.foo.com/", "prerender/multiple_prerenders.html");
409 409
410 WebPrerender firstPrerender = prerendererClient()->releaseWebPrerender(); 410 WebPrerender firstPrerender = prerendererClient()->releaseWebPrerender();
411 WebPrerender secondPrerender = prerendererClient()->releaseWebPrerender(); 411 WebPrerender secondPrerender = prerendererClient()->releaseWebPrerender();
412 412
413 EXPECT_EQ(1u, prerenderingSupport()->addCount(firstPrerender)); 413 EXPECT_EQ(1u, prerenderingSupport()->addCount(firstPrerender));
414 EXPECT_EQ(1u, prerenderingSupport()->addCount(secondPrerender)); 414 EXPECT_EQ(1u, prerenderingSupport()->addCount(secondPrerender));
415 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 415 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
416 416
417 executeScript("addThirdPrerender()"); 417 executeScript("addThirdPrerender()");
418 418
419 WebPrerender thirdPrerender = prerendererClient()->releaseWebPrerender(); 419 WebPrerender thirdPrerender = prerendererClient()->releaseWebPrerender();
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 EXPECT_EQ(0u, prerenderingSupport()->cancelCount(webPrerender)); 492 EXPECT_EQ(0u, prerenderingSupport()->cancelCount(webPrerender));
493 EXPECT_EQ(1u, prerenderingSupport()->totalCount()); 493 EXPECT_EQ(1u, prerenderingSupport()->totalCount());
494 494
495 // Change the rel of this prerender, make sure this is treated as a remove. 495 // Change the rel of this prerender, make sure this is treated as a remove.
496 executeScript("mutateRel()"); 496 executeScript("mutateRel()");
497 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(webPrerender)); 497 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(webPrerender));
498 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 498 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
499 } 499 }
500 500
501 } // namespace 501 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/IDBBindingUtilitiesTest.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698