From 344e1d32cd935f06463083521a5299cbc5c592e5 Mon Sep 17 00:00:00 2001 From: "marja@chromium.org" Date: Thu, 15 Nov 2012 07:21:14 +0000 Subject: Automate more Better Session Restore Tests: POST data with passwords. BUG=153260 Review URL: https://chromiumcodereview.appspot.com/11365255 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167881 0039d316-1c4b-4281-b951-d872f2087c98 --- .../sessions/better_session_restore_browsertest.cc | 50 ++++++++++++++++------ 1 file changed, 36 insertions(+), 14 deletions(-) (limited to 'chrome/browser/sessions') diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc index 8f28775..0d176cb 100644 --- a/chrome/browser/sessions/better_session_restore_browsertest.cc +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc @@ -86,6 +86,7 @@ class BetterSessionRestoreTest : public InProcessBrowserTest { test_files.push_back("cookies.html"); test_files.push_back("local_storage.html"); test_files.push_back("post.html"); + test_files.push_back("post_with_password.html"); test_files.push_back("session_cookies.html"); test_files.push_back("session_storage.html"); FilePath test_file_dir; @@ -240,13 +241,6 @@ IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_Post) { browser(), GURL(fake_server_address_ + test_path_ + "post.html")); string16 final_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(title_pass_, final_title); - if (g_last_upload_bytes.Get().find("posted-text") == std::string::npos || - g_last_upload_bytes.Get().find("text-entered") == std::string::npos) { - // For debugging why this test fails. - LOG(ERROR) << "Got uploaded bytes:"; - LOG(ERROR) << g_last_upload_bytes.Get(); - LOG(ERROR) << "Going to fail the test."; - } EXPECT_TRUE(g_last_upload_bytes.Get().find("posted-text") != std::string::npos); EXPECT_TRUE(g_last_upload_bytes.Get().find("text-entered") != @@ -255,15 +249,43 @@ IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_Post) { IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, Post) { CheckReloadedPageRestored(); - if (g_last_upload_bytes.Get().find("posted-text") == std::string::npos || - g_last_upload_bytes.Get().find("text-entered") == std::string::npos) { - // For debugging why this test fails. - LOG(ERROR) << "Got uploaded bytes:"; - LOG(ERROR) << g_last_upload_bytes.Get(); - LOG(ERROR) << "Going to fail the test."; - } EXPECT_TRUE(g_last_upload_bytes.Get().find("posted-text") != std::string::npos); EXPECT_TRUE(g_last_upload_bytes.Get().find("text-entered") != std::string::npos); } + +IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PRE_PostWithPassword) { + SessionStartupPref::SetStartupPref( + browser()->profile(), SessionStartupPref(SessionStartupPref::LAST)); + content::WebContents* web_contents = + chrome::GetActiveWebContents(browser()); + content::TitleWatcher title_watcher(web_contents, title_pass_); + ui_test_utils::NavigateToURL( + browser(), + GURL(fake_server_address_ + test_path_ + + "post_with_password.html")); + string16 final_title = title_watcher.WaitAndGetTitle(); + EXPECT_EQ(title_pass_, final_title); + EXPECT_TRUE(g_last_upload_bytes.Get().find("posted-text") != + std::string::npos); + EXPECT_TRUE(g_last_upload_bytes.Get().find("text-entered") != + std::string::npos); + EXPECT_TRUE(g_last_upload_bytes.Get().find("posted-password") != + std::string::npos); + EXPECT_TRUE(g_last_upload_bytes.Get().find("password-entered") != + std::string::npos); +} + +IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, PostWithPassword) { + CheckReloadedPageRestored(); + // The form data contained passwords, so it's removed completely. + EXPECT_TRUE(g_last_upload_bytes.Get().find("posted-text") == + std::string::npos); + EXPECT_TRUE(g_last_upload_bytes.Get().find("text-entered") == + std::string::npos); + EXPECT_TRUE(g_last_upload_bytes.Get().find("posted-password") == + std::string::npos); + EXPECT_TRUE(g_last_upload_bytes.Get().find("password-entered") == + std::string::npos); +} -- cgit v1.1