Skip to content

GitLab

T
tangled
Commit 09d7588d authored by davidben@chromium.org's avatar davidben@chromium.org
Browse files
Options

Better test coverage for prerender sessionStorage merging. 

Actually test that the sessionStorage behaved correctly. Also, add a test for a
conflict case. Ensure the page still loads.

BUG=none
TEST=PrerenderBrowserTest.PrerenderPageNewTab,
     PrerenderBrowserTest.PrerenderSessionStorageConflict

Review URL: https://codereview.chromium.org/129383002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244066 0039d316-1c4b-4281-b951-d872f2087c98
parent 2d453afa
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 14 deletions
chrome/browser/prerender/prerender_browsertest.cc
View file @ 09d7588d
...@@ -892,18 +892,6 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest { ...@@ -892,18 +892,6 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
NavigateToDestURLWithDisposition(CURRENT_TAB, true); NavigateToDestURLWithDisposition(CURRENT_TAB, true);
} }
void NavigateToDestURLInNewTab() const {
// First, open a new tab.
ui_test_utils::NavigateToURLWithDisposition(
current_browser(), GURL(content::kAboutBlankURL),
NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Next, navigate to the destination URL. The swap-in will not succeed,
// due to session storage namespace mismatch. The merge is only kicked off
// asynchronously.
NavigateToDestURLWithDisposition(CURRENT_TAB, false);
}
// Opens the url in a new tab, with no opener. // Opens the url in a new tab, with no opener.
void NavigateToDestURLWithDisposition( void NavigateToDestURLWithDisposition(
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
...@@ -3452,8 +3440,47 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNewNavigationEntry) { ...@@ -3452,8 +3440,47 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNewNavigationEntry) {
// Attempt a swap-in in a new tab, verifying that session storage namespace // Attempt a swap-in in a new tab, verifying that session storage namespace
// merging works. // merging works.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNewTab) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPageNewTab) {
PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); PrerenderTestURL("files/prerender/prerender_session_storage.html",
NavigateToDestURLInNewTab(); FINAL_STATUS_USED, 1);
// Open a new tab to navigate in.
ui_test_utils::NavigateToURLWithDisposition(
current_browser(),
test_server()->GetURL("files/prerender/init_session_storage.html"),
NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Now navigate in the new tab. Set expect_swap_to_succeed to false because
// the swap does not occur synchronously.
//
// TODO(davidben): When all swaps become asynchronous, remove the OpenURL
// return value assertion and let this go through the usual successful-swap
// codepath.
NavigateToDestURLWithDisposition(CURRENT_TAB, false);
// Verify DidDisplayPass manually since the previous call skipped it.
EXPECT_TRUE(DidDisplayPass(
current_browser()->tab_strip_model()->GetActiveWebContents()));
}
// Verify that session storage conflicts don't merge.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSessionStorageConflict) {
PrerenderTestURL("files/prerender/prerender_session_storage_conflict.html",
FINAL_STATUS_APP_TERMINATING, 1);
// Open a new tab to navigate in.
ui_test_utils::NavigateToURLWithDisposition(
current_browser(),
test_server()->GetURL("files/prerender/init_session_storage.html"),
NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
// Now navigate in the new tab.
NavigateToDestURLWithDisposition(CURRENT_TAB, false);
// Verify DidDisplayPass in the new tab.
EXPECT_TRUE(DidDisplayPass(
current_browser()->tab_strip_model()->GetActiveWebContents()));
} }
// Checks that prerenders honor |should_replace_current_entry|. // Checks that prerenders honor |should_replace_current_entry|.
......
chrome/test/data/prerender/init_session_storage.html 0 → 100644
View file @ 09d7588d
<!DOCTYPE html>
<script>
sessionStorage.value = "hello";
</script>
chrome/test/data/prerender/prerender_session_storage.html 0 → 100644
View file @ 09d7588d
<html>
<!--
This test checks to make sure that the prerendered page was loaded with the
correct sessionStorage namespace.
-->
<head>
<title>Prerender Page</title>
<script>
var pageWasPrerendered = false;
function DidPrerenderPass() {
pageWasPrerendered = true;
return true;
}
// Verify the sessionStorage value was set.
function DidDisplayPass() {
return pageWasPrerendered && sessionStorage.value === "hello";
}
</script>
</head>
<body></body>
</html>
chrome/test/data/prerender/prerender_session_storage_conflict.html 0 → 100644
View file @ 09d7588d
<html>
<!--
This is a test of a page whose sessionStorage namespace cannot be merged.
-->
<head>
<title>Prerender Page</title>
<script>
var pageWasPrerendered = false;
// Read sessionStorage.value. This should make the merge invalid.
var sessionStorageValue = sessionStorage.value;
function DidPrerenderPass() {
pageWasPrerendered = true;
return true;
}
// Verify the sessionStorage value didn't change.
function DidDisplayPass() {
return !pageWasPrerendered && sessionStorageValue === sessionStorage.value;
}
</script>
</head>
<body></body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment