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

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

Issue 2384033002: reflow comments in web/tests (Closed)
Patch Set: comments (heh!) Created 4 years, 2 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) 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 EXPECT_FALSE(webPrerender.isNull()); 274 EXPECT_FALSE(webPrerender.isNull());
275 275
276 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender)); 276 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender));
277 EXPECT_EQ(1u, prerenderingSupport()->totalCount()); 277 EXPECT_EQ(1u, prerenderingSupport()->totalCount());
278 278
279 navigateAway(); 279 navigateAway();
280 280
281 EXPECT_EQ(1u, prerenderingSupport()->abandonCount(webPrerender)); 281 EXPECT_EQ(1u, prerenderingSupport()->abandonCount(webPrerender));
282 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 282 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
283 283
284 // Check that the prerender does not emit an extra cancel when garbage-collect ing everything. 284 // Check that the prerender does not emit an extra cancel when
285 // garbage-collecting everything.
285 close(); 286 close();
286 287
287 EXPECT_EQ(2u, prerenderingSupport()->totalCount()); 288 EXPECT_EQ(2u, prerenderingSupport()->totalCount());
288 } 289 }
289 290
290 TEST_F(PrerenderingTest, ExtraData) { 291 TEST_F(PrerenderingTest, ExtraData) {
291 class TestExtraData : public WebPrerender::ExtraData { 292 class TestExtraData : public WebPrerender::ExtraData {
292 public: 293 public:
293 explicit TestExtraData(bool* alive) : m_alive(alive) { *alive = true; } 294 explicit TestExtraData(bool* alive) : m_alive(alive) { *alive = true; }
294 295
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 395
395 TEST_F(PrerenderingTest, FastRemoveElement) { 396 TEST_F(PrerenderingTest, FastRemoveElement) {
396 initialize("http://www.foo.com/", "prerender/single_prerender.html"); 397 initialize("http://www.foo.com/", "prerender/single_prerender.html");
397 398
398 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender(); 399 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender();
399 EXPECT_FALSE(webPrerender.isNull()); 400 EXPECT_FALSE(webPrerender.isNull());
400 401
401 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender)); 402 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender));
402 EXPECT_EQ(1u, prerenderingSupport()->totalCount()); 403 EXPECT_EQ(1u, prerenderingSupport()->totalCount());
403 404
404 // Race removing & starting the prerender against each other, as if the elemen t was removed very quickly. 405 // Race removing & starting the prerender against each other, as if the
406 // element was removed very quickly.
405 executeScript("removePrerender()"); 407 executeScript("removePrerender()");
406 EXPECT_FALSE(webPrerender.isNull()); 408 EXPECT_FALSE(webPrerender.isNull());
407 webPrerender.didStartPrerender(); 409 webPrerender.didStartPrerender();
408 410
409 // The page should be totally disconnected from the Prerender at this point, s o the console should not have updated. 411 // The page should be totally disconnected from the Prerender at this point,
412 // so the console should not have updated.
410 EXPECT_EQ(0u, consoleLength()); 413 EXPECT_EQ(0u, consoleLength());
411 } 414 }
412 415
413 TEST_F(PrerenderingTest, MutateTarget) { 416 TEST_F(PrerenderingTest, MutateTarget) {
414 initialize("http://www.foo.com/", "prerender/single_prerender.html"); 417 initialize("http://www.foo.com/", "prerender/single_prerender.html");
415 418
416 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender(); 419 WebPrerender webPrerender = prerendererClient()->releaseWebPrerender();
417 EXPECT_FALSE(webPrerender.isNull()); 420 EXPECT_FALSE(webPrerender.isNull());
418 EXPECT_EQ(toWebURL("http://prerender.com/"), webPrerender.url()); 421 EXPECT_EQ(toWebURL("http://prerender.com/"), webPrerender.url());
419 422
420 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender)); 423 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender));
421 EXPECT_EQ(0u, prerenderingSupport()->cancelCount(webPrerender)); 424 EXPECT_EQ(0u, prerenderingSupport()->cancelCount(webPrerender));
422 EXPECT_EQ(1u, prerenderingSupport()->totalCount()); 425 EXPECT_EQ(1u, prerenderingSupport()->totalCount());
423 426
424 // Change the href of this prerender, make sure this is treated as a remove an d add. 427 // Change the href of this prerender, make sure this is treated as a remove
428 // and add.
425 executeScript("mutateTarget()"); 429 executeScript("mutateTarget()");
426 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(webPrerender)); 430 EXPECT_EQ(1u, prerenderingSupport()->cancelCount(webPrerender));
427 431
428 WebPrerender mutatedPrerender = prerendererClient()->releaseWebPrerender(); 432 WebPrerender mutatedPrerender = prerendererClient()->releaseWebPrerender();
429 EXPECT_EQ(toWebURL("http://mutated.com/"), mutatedPrerender.url()); 433 EXPECT_EQ(toWebURL("http://mutated.com/"), mutatedPrerender.url());
430 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender)); 434 EXPECT_EQ(1u, prerenderingSupport()->addCount(webPrerender));
431 EXPECT_EQ(1u, prerenderingSupport()->addCount(mutatedPrerender)); 435 EXPECT_EQ(1u, prerenderingSupport()->addCount(mutatedPrerender));
432 EXPECT_EQ(3u, prerenderingSupport()->totalCount()); 436 EXPECT_EQ(3u, prerenderingSupport()->totalCount());
433 } 437 }
434 438
(...skipping 23 matching lines...) Expand all
458 462
459 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender(); 463 WebPrerender relNextAndPrerender = prerendererClient()->releaseWebPrerender();
460 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"), 464 EXPECT_EQ(toWebURL("http://rel-next-and-prerender.com/"),
461 relNextAndPrerender.url()); 465 relNextAndPrerender.url());
462 EXPECT_EQ( 466 EXPECT_EQ(
463 static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender), 467 static_cast<unsigned>(PrerenderRelTypeNext | PrerenderRelTypePrerender),
464 relNextAndPrerender.relTypes()); 468 relNextAndPrerender.relTypes());
465 } 469 }
466 470
467 } // namespace 471 } // namespace
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/MHTMLTest.cpp ('k') | third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698